Meridio: Archive all in _output and increase timeout

[infra/cicd.git] / jjb / metal3 / job_feature_tests_upgrade.yml

diff --git a/jjb/metal3/job_feature_tests_upgrade.yml b/jjb/metal3/job_feature_tests_upgrade.yml
index fb44f5b2f3e675dff3009a5573b3117c2a10d274..11a3968f6c25ab19a06b7ea421e649b8add892e1 100644 (file)
--- a/jjb/metal3/job_feature_tests_upgrade.yml
+++ b/jjb/metal3/job_feature_tests_upgrade.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,12 +52,16 @@
         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: 'release-0.5'
+        description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -109,8 +113,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-upgrade-features"