X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fjob_feature_tests.yml;h=455d933681a7aea876384d7c7b0295ba58886482;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=a51f5f51ef1b760ce16d930cad98cb51e83bb9e6;hpb=105545dea872c259c716762e2db9f626df7965b0;p=infra%2Fcicd.git

diff --git a/jjb/metal3/job_feature_tests.yml b/jjb/metal3/job_feature_tests.yml
index a51f5f51..455d9336 100644
--- a/jjb/metal3/job_feature_tests.yml
+++ b/jjb/metal3/job_feature_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: feature_tests
-    name: '{job_prefix}_{name}_feature_tests_{image_os}'
+    name: '{job_prefix}_{proj}_feature_tests_{image_os}'
     description: "Inspection, remediation, pivoting, node reuse and repivoting feature tests on {image_os}."
     project-type: pipeline
     defaults: global
@@ -35,28 +35,32 @@
     parameters:
     - string:
         name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
+        default: '{org}'
         description: 'Project github repo org name'
     - string:
         name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
+        default: '{repo}'
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        default: 'https://github.com/{org}/{repo}.git'
         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'
@@ -85,7 +89,7 @@
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
     - github:
-        url: https://github.com/{repo[org]}/{repo[name]}
+        url: https://github.com/{org}/{repo}
 
     triggers:
     - github-pull-request:
@@ -102,8 +106,9 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
-          - 'master'
           - 'main'
+          - 'release-1.2'
+          - 'release-1.1'
           - 'release-0.5'
           - 'release-0.1'
         status-context: "test-features-{image_os}"