X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fmetal3%2Fjob_metal3_dev_tools_integration_test.yml;h=4175cdef6a4c357f0e36f5b46326dd2a2e3af530;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=9e19186deb250b8dbdf9d04a4a9a2923e284dac7;hpb=de19d0ffc9d5fc5fb42830fcb6b5d87be26b89ac;p=infra%2Fcicd.git

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
index 9e19186d..4175cdef 100644
--- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
@@ -44,7 +44,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -52,27 +52,31 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
         default: '{image_os}'
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
+    - string:
+        name: capm3_release_branch
+        default: 'main'
+        description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
-        description: 'Cluster API version. Can be v1alpha4.'
+        description: 'Cluster API version. E.g. v1beta1.'
     - string:
         name: CAPM3_VERSION
         default: 'v1beta1'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
+        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
     - string:
         name: KUBERNETES_VERSION
-        default: "v1.23.3"
+        default: ""
         description: 'Kubernetes version'
 
     properties:
@@ -99,7 +103,6 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
-          - 'master'
           - 'main'
         status-context: "test-integration-metal3-dev-tools-{image_os}"
         success-status: "Passed"
@@ -112,7 +115,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