Merge "JIRA: AEGIS-458 scm removed fron test job tempate * add export LC_ALL="en_US...

diff --git a/jjb/airship/job_feature_tests_centos.yml b/jjb/airship/job_feature_tests_centos.yml
index ae29601fdda96d889edb351c2dfa4c2c5184b9d4..b056a377c123b19dfa41d9d435f051ea155fd82d 100644 (file)
--- a/jjb/airship/job_feature_tests_centos.yml
+++ b/jjb/airship/job_feature_tests_centos.yml
@@ -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: 'v1alpha4'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha4'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha4.'
+        default: 'v1alpha5'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Centos'

diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml
index 33ef33c845d1f172f268ebb33a6c57bd44654d7b..856232aa43ad9398b41e36a4d5f0cb809990e647 100644 (file)
--- a/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_ubuntu.yml
@@ -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: 'v1alpha4'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha4'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha4.'
+        default: 'v1alpha5'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'

diff --git a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
index 6ba96d885289ab9ab65e12300fa74ff3b7e9846d..289ef860274dda71900c768e14b2896482a6a452 100644 (file)
--- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
@@ -60,11 +60,11 @@
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'
-        description: 'Cluster API version. Can be v1alpha3.'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
         default: 'v1alpha4'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha4.'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'

diff --git a/jjb/airship/job_master_feature_tests_centos.yml b/jjb/airship/job_master_feature_tests_centos.yml
index d54d869d30159d67975f0f7c035207050e48dcb4..80eacced286a6ec52a5aa0f224bc85364dde048f 100644 (file)
--- a/jjb/airship/job_master_feature_tests_centos.yml
+++ b/jjb/airship/job_master_feature_tests_centos.yml
@@ -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: 'v1alpha4'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha4'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha4.'
+        default: 'v1alpha5'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Centos'

diff --git a/jjb/airship/job_master_feature_tests_ubuntu.yml b/jjb/airship/job_master_feature_tests_ubuntu.yml
index abfa6031c375a21f097095f7c1b75c8d1fea8185..77092a2a4128623fbd0a9f43ba38e237a8f9cfea 100644 (file)
--- a/jjb/airship/job_master_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_ubuntu.yml
@@ -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: 'v1alpha4'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha4'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha4.'
+        default: 'v1alpha5'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'

diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 0a777b0392c45c3d232b0c31a2e5f1789e7b0d38..7c13d943274ec0089882ecf5dd5b578ac41e6bdb 100644 (file)
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@ -60,11 +60,11 @@
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'
-        description: 'Cluster API version. Can be v1alpha3.'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
         default: 'v1alpha4'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha4.'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'