X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fjob_feature_tests_ubuntu.yml;h=da78bf26cca223f9f948cb419dafe34d91405660;hb=6d5b353c5b4b3a4a7e7dc26e4aa83151df1936c6;hp=da8b7376882ae8a66cb2efe61d9e97b94ac41b59;hpb=a11e30729ef68367af80eec3f47534cb70be2800;p=infra%2Fcicd.git

diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml
index da8b7376..da78bf26 100644
--- 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:
@@ -125,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