X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fjob_master_feature_tests_upgrade_ubuntu.yml;h=a829627bf7d7b259007c86215ee182d99c8ce5bd;hb=0f17f1ca285751d5a554016252b3027b3c98be90;hp=729cab0612fc0073a7a118a833f82ca7d206e2ed;hpb=a11e30729ef68367af80eec3f47534cb70be2800;p=infra%2Fcicd.git

diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 729cab06..a829627b 100644
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@ -61,10 +61,16 @@
         name: CAPI_VERSION
         default: 'v1alpha4'
         description: 'Cluster API version.'
+    - string:
+        name: CAPIRELEASE
+        description: 'Cluster API release tag to upgrade from, e.g. v1.0.0'
     - string:
         name: CAPM3_VERSION
         default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: CAPM3RELEASE
+        description: 'CAPM3 release tag to upgrade from, e.g. v1.0.0'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
@@ -81,10 +87,6 @@
         name: TESTS_FOR
         default: "feature_tests_upgrade"
         description: 'Tests for upgrade.'
-    - string:
-        name: PROMETHEUS_MONITORING
-        default: "true"
-        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
@@ -102,7 +104,7 @@
           url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - '{branch|master}'
+            - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           wipe-workspace: True