set default values for PULL_PULL_SHA and PULL_BASE_REF to

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

diff --git a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
index 3ca02dd2621c5597a16cfa7eb80216c83ceec79c..88ad06b4202d715aacb069d8fc0f3917cf253be9 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: keep_capm3_e2e_clusterctl_upgrade_tests_prow
-    name: '{job_prefix}-keep-e2e-clusterctl-upgrade-{upgrade_from_release}'
+    name: '{job_prefix}-keep-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
     description: "Keep CAPM3 e2e upgrade tests on {image_os}."
     project-type: pipeline
     defaults: global
@@ -50,11 +50,11 @@
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
@@ -66,20 +66,12 @@
         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'
+        default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: bmo_release_branch
-        default: 'main'
+        default: '{bmo_release_branch}'
         description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -96,10 +88,6 @@
         name: GINKGO_FOCUS
         default: "clusterctl-upgrade"
         description: 'Select the e2e upgrade test'
-    - string:
-        name: UPGRADE_FROM_RELEASE
-        default: '{upgrade_from}'
-        description: 'Release to upgrade from'
 
     properties:
     - build-discarder:
@@ -122,5 +110,5 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "jenkins/jobs/prow_integration_tests.pipeline"
+      script-path: "{e2e_feature_test_pipeline}"
       lightweight-checkout: False