INFRA: Switch to tox for JJB verify and merge jobs

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

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
index ad3e0b2d37d99e920d175f06d5232dc48836d63b..f6a5c329d4762ff59545e3efec29679007439a90 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
@@ -49,17 +49,25 @@
         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: 'centos'
         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'
+        default: 'Centos'
         description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
@@ -82,7 +90,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a4-centos-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-centos-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True