Remove unused PROMETHEUS_METRICS variable from airship jobs

[infra/cicd.git] / jjb / airship / job_master_feature_tests_upgrade_ubuntu.yml

diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 729cab0612fc0073a7a118a833f82ca7d206e2ed..81917136e62be2420c38d7272ae72e99d4559a68 100644 (file)
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
@@ -81,10 +81,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 +98,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