Fix periodic and keep upgrade clusterctl jjbs

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

diff --git a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
index 269217e558d4fdb021a4a1b36064e14229dc3f82..7725ad173addf50c14a8311499cdf1b28a066479 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_main_e2e_clusterctl_upgrade_tests_prow
-    name: '{job_prefix}-daily-e2e-clusterctl-upgrade-{upgrade_from_release}'
+    name: '{job_prefix}-daily-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
     description: "CAPM e2e clusterctl upgrade tests on ubuntu."
     project-type: pipeline
     defaults: global
@@ -72,14 +72,6 @@
         name: bmo_release_branch
         default: 'main'
         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
@@ -92,10 +84,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:
@@ -119,5 +107,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