INFRA: Switch to tox for JJB verify and merge 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 daff766a233b73b47247bf28bb2dbe84e712a097..35fbff77ba3598ed6658ad85bc62ef8393ae593a 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@ -59,8 +59,12 @@
         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 v1alpha3 or v1alpha4.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
@@ -86,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
@@ -96,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"