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

diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml
index 13900bfa..da78bf26 100644
--- 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,15 +59,19 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha3'
-        description: 'Cluster API version. Can be v1alpha3 or v1alpha4.'
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
         description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
-        default: 8192
+        default: 4096
         description: 'RAM size of the target host.'
     - string:
         name: NUM_NODES
@@ -76,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:
@@ -100,10 +104,12 @@
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: False
+        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"
@@ -115,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