Keep test integration trigger to v1a4 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 d5a9a3a0d45d2607ff14d99a0c1283b4b95c0ac7..45e521200a3ddbe059cf7d17d8db3a055347afb7 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@ -27,7 +27,7 @@
 - job-template:
     id: capi_bm_v1a4_integration_tests_ubuntu
     name: '{job_prefix}_{name}_v1a4_integration_test_ubuntu'
-    description: "K8s CAPI baremetal v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "K8s CAPI metal3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False
@@ -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 v1alpha4 or v1alpha5.'
     - 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: '((.|\n)*\s)?/test-v1a4-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -95,8 +99,9 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'release-0.3'
-        status-context: "test-v1a4-integration"
+          - 'release-0.4'
+          - 'release-0.0'
+        status-context: "test-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"