X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fjob_capi_bm_v1a4_integration_tests_ubuntu.yml;h=290aef92a87c15c053c634aacad29935e76f8522;hb=refs%2Fchanges%2F73%2F11873%2F1;hp=5d4ab952ee65f18cb41ebf0bc8a626fb7f16fdeb;hpb=07f5cbc93968a5c363b0b7ca6395938f31db3638;p=infra%2Fcicd.git

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 5d4ab952..290aef92 100644
--- 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
@@ -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 or v1alpha5.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
@@ -65,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -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-v1a4-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -91,7 +99,9 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'release-0.3'
+          - 'main'
+          - 'release-0.4'
+          - 'release-0.0'
         status-context: "test-v1a4-integration"
         success-status: "Passed"
         failure-status: "Failed"
@@ -103,7 +113,7 @@
           url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - '{branch|master}'
+            - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           wipe-workspace: True