Remove TARGET_NODE_OS variable

This variable is not used in the pipelines anymore. It was previously
used to set the IMAGE_OS variable, but we are now using the DISTRIBUTION
variable for this instead. DISTRIBUTION is currently always set to the
same that TARGET_NODE_OS, except that it is all lower case.

Change-Id: Ifc89943b8921ff27fb41a45c59fa44801346f6e1

diff --git a/jjb/metal3/job_bml_integration_tests_centos.yml b/jjb/metal3/job_bml_integration_tests_centos.yml
index 252ea72987ba92759a652c1c107c17ae7b520bbd..007fae7a56e1217b1ed5c0d6586bd493db36fd62 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_integration_tests_centos.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_bml_main_integration_tests_centos.yml b/jjb/metal3/job_bml_main_integration_tests_centos.yml
index c2e332c5e1994ab39b1f7d8dd42f6174f16de714..0ac0628799146b83e192e52f2973569352dc2fdb 100644 (file)
--- a/jjb/metal3/job_bml_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_main_integration_tests_centos.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -84,7 +80,7 @@
 
     triggers:
     - timed: "H 2 * * *"
-    
+
     pipeline-scm:
       scm:
       - git:

diff --git a/jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml
index 3482394ea85896ff3b315b7ee2df6d7b7238376a..51ee1bf1c3726d4e1bacbe556bf062436f09d873 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'
@@ -65,15 +65,11 @@
         name: CAPM3_VERSION
         default: 'v1alpha4'
         description: 'Cluster API provider Metal3 version. Can be v1alpha4 or v1alpha5.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml
index 50f291a162d03a617f874b59e9cde1e6b47e25d6..3aac6dc3e8e9f9f8cd316489a83743581c80c173 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'
@@ -65,15 +65,11 @@
         name: CAPM3_VERSION
         default: 'v1alpha4'
         description: 'Cluster API provider Metal3 version. Can be v1alpha4 or v1alpha5.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
index 661ba8e142c3bbfc5ce105fc77f3186eb477d0ea..2f086e005ebbaea8d904f6228be3f5d3e3186797 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'
@@ -65,15 +65,11 @@
         name: CAPM3_VERSION
         default: 'v1alpha4'
         description: 'Cluster API provider Metal3 version. Can be v1alpha4 or v1alpha5.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
index 305fe005d09d9a4017d1eb04cd1e99231ed78419..52c7b142c13f1d90d1c5ea6d8fbb17d3ebccb889 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'
@@ -65,15 +65,11 @@
         name: CAPM3_VERSION
         default: 'v1alpha4'
         description: 'Cluster API provider Metal3 version. Can be v1alpha4 or v1alpha5.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
index c065a2bd81b3e2ad8277a79be87079fdf632a979..06b1e281bdf969cbceb8cac66912ae16c0ad6cdd 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -77,7 +73,7 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
index bfe44106e596f5661f78c9e10102f8f21fa516af..aa5ced2931e0375782c83ec3869679fcfd5aaa8e 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -77,7 +73,7 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
index 6bdb40dbf4ffba2e82392ae36fe13288fdcfdf8a..af788ce6713b0aef757165eb1f3bb7ee6def37c3 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
index dcd5eae40e44e870cf8c7ad1ed9ea082fc4f144d..f0581f9af2a20a0795302c1c476582159e8382cb 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         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: 4096

diff --git a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
index 7edcff96053303499594f88b2d3f69e1265efad4..647c60047b47783af8b0ba29f2fdba07bda3bf4e 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
index e4014597167764a1021e5cf730365f7ed5f2bf98..3c523f3e8b9ffd117a53c2425a4744c898589323 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         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: 4096

diff --git a/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
index b3b471f71637a1f98806da155861b76f65d5baa6..a7650e3e9b4b33e528cddd772d951a3e61c89573 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
index 610cbf471e8d4b350c5309af0222b59ee40f8f2b..cd9d181d16855deb9d1cace415735d7fc1b60ca8 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         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: 4096

diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
index fe46ebae3c2a2dd7d3a380064120dd18e91cc7d0..97e8410bf2c21bbafb8c1062fb4ff211e1f1ea1f 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version. Can be v1beta1.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
index 0b72f418a1466f3109444f2bd8ea9a0858d5f3ab..662d58d95da53a5e582ab0086ce0546df3dbbabf 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version. Can be v1beta1.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
index 255fc2f5734fc8d0311e4d11386c168b97df9a52..1c46bbcac903bbad6fda0aa28f02d4b02deaf28e 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version. Can be v1beta1.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
index dd81c7706be91a643e349d0dbb83e3077148b528..7a0c7fa6e80b2e9e6cae88d02cd234e4ee2c2300 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -118,4 +114,4 @@
           honor-refspec: True
           shallow-clone: False
       script-path: "{ci_github_pipeline}"
-      lightweight-checkout: False
\ No newline at end of file
+      lightweight-checkout: False

diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
index 5fc10acdf0783301f0a6d41cfe1255f99f45770c..93a50783456829d9a2b9cca5f26b93322ae33dd5 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         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: 4096
@@ -118,4 +114,4 @@
           honor-refspec: True
           shallow-clone: False
       script-path: "{ci_github_pipeline}"
-      lightweight-checkout: False
\ No newline at end of file
+      lightweight-checkout: False

diff --git a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
index e145f50651b6d310221f67e048b74074981b7a90..b0a6f683a6e15d919008b928d69a0cbc7ba391ef 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
index 40a19685ad819b1790bd02fb560b568ba5cf779d..0dc064800d2b62d9667727e95168de6fa6ce83ba 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         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: 4096

diff --git a/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
index 8ebf2ace1bbc3021455361cbf62cd4c5acc792e3..f0aad6b24033ff8a9f763fcf7de559a3a971d294 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
index 256e4460acb88d3186495094e692a21422819b36..e35fbbabe180f896be1604f9a2afb5251d9ee803 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         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: 4096

diff --git a/jjb/metal3/job_feature_tests_centos.yml b/jjb/metal3/job_feature_tests_centos.yml
index 6720a6215603648241dcbb1c72761e4284ede77b..bbaf600ab6241072cc4f78c9a48555d19c2c889b 100644 (file)
--- a/jjb/metal3/job_feature_tests_centos.yml
+++ b/jjb/metal3/job_feature_tests_centos.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_feature_tests_ubuntu.yml b/jjb/metal3/job_feature_tests_ubuntu.yml
index 1704e7bd23d87af0409e8e47cf4ba3798314c3a7..edc92abafe067d6f0571d73d1753bba0dae33e93 100644 (file)
--- a/jjb/metal3/job_feature_tests_ubuntu.yml
+++ b/jjb/metal3/job_feature_tests_ubuntu.yml
@@ -56,7 +56,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -65,10 +65,6 @@
         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: 4096

diff --git a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
index 1ff63cc6ae0bdfc720118ff0b05f4e64495a9ba4..e5aa6c3146cc8ab3042d25002357f251e2219f46 100644 (file)
--- a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -72,10 +72,6 @@
     - string:
         name: CAPM3RELEASE
         description: 'CAPM3 release tag to upgrade from, e.g. v1.0.0'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
index c256c0480b9a0d1d0b9f8fc27b567f9d8af0e167..6856c4555838218209d358bf1ff47d1e3e1c0b90 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
index 8fe3eebb3462f5bd3a3906cb841075fc11b941c1..fdcbec36b8226af0af979e47738a38b3b7e19c9a 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1alpha5'
         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: 4096

diff --git a/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
index 4e775496e4603f62d0aac730b6f3c1e65ebddacf..a1e4a2a90a806db6c8bc1952f63ceccf50651ac1 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -123,4 +119,4 @@
           honor-refspec: True
           shallow-clone: False
       script-path: "{ci_github_pipeline}"
-      lightweight-checkout: False
\ No newline at end of file
+      lightweight-checkout: False

diff --git a/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
index 9bf928c8959dc219b2b7a515a62c9dcab28f25b2..19709854a6ee55283d06c260ca4972eddebd0a88 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         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: 4096
@@ -123,4 +119,4 @@
           honor-refspec: True
           shallow-clone: False
       script-path: "{ci_github_pipeline}"
-      lightweight-checkout: False
\ No newline at end of file
+      lightweight-checkout: False

diff --git a/jjb/metal3/job_main_feature_tests_centos.yml b/jjb/metal3/job_main_feature_tests_centos.yml
index 513e874bb9e31466a086a90c91a8d4d62aba3a77..6c43e7a3e147357d17f5815216bedf02affa0510 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_centos.yml
+++ b/jjb/metal3/job_main_feature_tests_centos.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_main_feature_tests_ubuntu.yml b/jjb/metal3/job_main_feature_tests_ubuntu.yml
index 7bf67f05270ca61257dd4a879c7c527ab95e1ca1..44d05e24cd11152c5108ac6c3df656a98a22e0ce 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_ubuntu.yml
+++ b/jjb/metal3/job_main_feature_tests_ubuntu.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         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: 4096

diff --git a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
index d927a8652fcd6ed9e05af51a79b13374fb8cf1b6..d3d565fb042e2f0648a7993cfe307afed7b51763 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests.'
+        description: 'Distribution to use for the target host and the tests.'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
@@ -72,10 +72,6 @@
     - string:
         name: CAPM3RELEASE
         description: 'CAPM3 release tag to upgrade from, e.g. v1.0.0'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
index 67dfd9515eed21b82e8815703d45407e2302b6cf..61ce70ae2e8dbd284fc62f6c14f3bd8f28893772 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'centos'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Centos'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
index d92f2dcdf41e0b57809ba5554e54c6ec185e3a5a..b280bb6734817ef6ebbc96eb278ae5c7ee33e730 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
@@ -57,7 +57,7 @@
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
-        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -66,10 +66,6 @@
         name: CAPM3_VERSION
         default: 'v1beta1'
         description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
-    - string:
-        name: TARGET_NODE_OS
-        default: 'Ubuntu'
-        description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096