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 3e848cdd9668ed6514a102f11701d8ad2cf0b8e0..da78bf26cca223f9f948cb419dafe34d91405660 100644 (file)
--- a/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_ubuntu.yml
@@ -27,7 +27,7 @@
 - job-template:
     id: feature_tests_ubuntu
     name: '{job_prefix}_{name}_feature_tests_ubuntu'
-    description: "Upgrade, Pivoting, Remediation tests on Ubuntu. "
+    description: "Pivoting and Remediation tests on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False
@@ -59,12 +59,12 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha3'
-        description: 'Cluster API version. Can be v1alpha3.'
+        default: 'v1beta1'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha4'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.'
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
@@ -80,7 +80,7 @@
     - string:
         name: TESTS_FOR
         default: "feature_tests"
-        description: 'Tests for pivoting, upgrade and remediation .'
+        description: 'Tests for pivoting and remediation.'
 
     properties:
     - build-discarder:
@@ -107,7 +107,9 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'release-0.3'
+          - 'main'
+          - 'release-0.5'
+          - 'release-0.1'
         status-context: "test-features"
         success-status: "Passed"
         failure-status: "Failed"
@@ -119,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