Update sdc-sdc-workflow-designer-verify to java 11

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

diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
index 2014a479f6298bc5c31959a2d2a4d22ea8df14cb..dc28bca5128bf7653a369b06150532ff8e7d1bb6 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
@@ -26,8 +26,8 @@
 
 - job-template:
     id: capm3_e2e_upgrade_tests
-    name: '{job_prefix}_{name}_v1b1_e2e_upgrade_test_{image_os}'
-    description: "CAPM3 e2e upgrade tests for {repo[org]}/{repo[name]} on {image_os}."
+    name: '{job_prefix}_{proj}_main_e2e_upgrade_test_{image_os}'
+    description: "CAPM3 e2e upgrade tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -35,11 +35,11 @@
     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
@@ -47,7 +47,7 @@
         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
@@ -57,6 +57,10 @@
         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'
@@ -73,9 +77,9 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - bool:
-        name: UPGRADE_TEST
-        default: True
+    - string:
+        name: GINKGO_FOCUS
+        default: "upgrade"
         description: 'Select the e2e upgrade test'
 
     properties:
@@ -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:
@@ -94,7 +98,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-v1b1-upgrade-e2e(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-upgrade-e2e-main(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -103,7 +107,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'main'
-        status-context: "test-v1b1-upgrade-e2e"
+        status-context: "test-upgrade-e2e-main"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"