Remove unused PROMETHEUS_METRICS variable from airship jobs

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

diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml
index 2dab46d44b0123d6b894bbecec33af4f77285e32..da78bf26cca223f9f948cb419dafe34d91405660 100644 (file)
--- a/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_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"
         description: 'Tests for pivoting and remediation.'
-    - string:
-        name: PROMETHEUS_MONITORING
-        default: "true"
-        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
@@ -111,7 +107,9 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'release-0.4'
+          - 'main'
+          - 'release-0.5'
+          - 'release-0.1'
         status-context: "test-features"
         success-status: "Passed"
         failure-status: "Failed"
@@ -123,7 +121,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