Remove v1alpha3 jobs

[infra/cicd.git] / jjb / airship / job_capi_bm_v1a4_integration_tests_ubuntu.yml

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
index 5d4ab952ee65f18cb41ebf0bc8a626fb7f16fdeb..3b185c44c25608d5f7b0fe8c56cc27a4ad3a1769 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@ -49,14 +49,22 @@
         name: ghprbAuthorRepoGitUrl
         default: 'https://github.com/{repo[org]}/{repo[name]}.git'
         description: 'CI Repo URL for triggering manual build'
+    - string:
+        name: ghprbTargetBranch
+        default: 'master'
+        description: 'Target branch of the PR'
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
         description: 'Distribution to use for the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
+        default: 'v1alpha3'
+        description: 'Cluster API version. Can be v1alpha3.'
+    - string:
+        name: CAPM3_VERSION
         default: 'v1alpha4'
-        description: 'Cluster API version. Can be v1alpha1,v1alpha2, v1alpha3 or v1alpha4.'
+        description: 'Cluster API provider Metal3 version. Can be v1alpha4.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
@@ -82,7 +90,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a4-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -92,7 +100,7 @@
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
-        status-context: "test-v1a4-integration"
+        status-context: "test-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"