From 19b2b4244744768748aa702c8790329bf5d66792 Mon Sep 17 00:00:00 2001 From: Lennart Jern Date: Tue, 8 Feb 2022 15:26:27 +0200 Subject: [PATCH] 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 --- jjb/metal3/job_bml_integration_tests_centos.yml | 6 +----- jjb/metal3/job_bml_main_integration_tests_centos.yml | 8 ++------ jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml | 8 ++------ jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml | 8 ++------ .../job_capm3_v1a4_main_integration_tests_centos.yml | 8 ++------ .../job_capm3_v1a4_main_integration_tests_ubuntu.yml | 8 ++------ jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml | 8 ++------ jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml | 8 ++------ jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml | 6 +----- jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml | 6 +----- jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml | 6 +----- jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml | 6 +----- .../job_capm3_v1a5_main_integration_tests_centos.yml | 6 +----- .../job_capm3_v1a5_main_integration_tests_ubuntu.yml | 6 +----- jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml | 6 +----- jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml | 6 +----- jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml | 6 +----- jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml | 8 ++------ jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml | 8 ++------ jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml | 6 +----- jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml | 6 +----- .../job_capm3_v1b1_main_integration_tests_centos.yml | 6 +----- .../job_capm3_v1b1_main_integration_tests_ubuntu.yml | 6 +----- jjb/metal3/job_feature_tests_centos.yml | 6 +----- jjb/metal3/job_feature_tests_ubuntu.yml | 6 +----- jjb/metal3/job_feature_tests_upgrade_ubuntu.yml | 6 +----- jjb/metal3/job_keep_integration_vm_v1a5_centos.yml | 6 +----- jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml | 6 +----- jjb/metal3/job_keep_integration_vm_v1b1_centos.yml | 8 ++------ jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml | 8 ++------ jjb/metal3/job_main_feature_tests_centos.yml | 6 +----- jjb/metal3/job_main_feature_tests_ubuntu.yml | 6 +----- jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml | 6 +----- .../job_metal3_dev_tools_integration_test_centos.yml | 6 +----- .../job_metal3_dev_tools_integration_test_ubuntu.yml | 6 +----- 35 files changed, 46 insertions(+), 186 deletions(-) diff --git a/jjb/metal3/job_bml_integration_tests_centos.yml b/jjb/metal3/job_bml_integration_tests_centos.yml index 252ea7298..007fae7a5 100644 --- 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 c2e332c5e..0ac062879 100644 --- 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 3482394ea..51ee1bf1c 100644 --- 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 50f291a16..3aac6dc3e 100644 --- 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 661ba8e14..2f086e005 100644 --- 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 305fe005d..52c7b142c 100644 --- 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 c065a2bd8..06b1e281b 100644 --- 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 bfe44106e..aa5ced293 100644 --- 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 6bdb40dbf..af788ce67 100644 --- 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 dcd5eae40..f0581f9af 100644 --- 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 7edcff960..647c60047 100644 --- 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 e40145971..3c523f3e8 100644 --- 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 b3b471f71..a7650e3e9 100644 --- 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 610cbf471..cd9d181d1 100644 --- 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 fe46ebae3..97e8410bf 100644 --- 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 0b72f418a..662d58d95 100644 --- 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 255fc2f57..1c46bbcac 100644 --- 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 dd81c7706..7a0c7fa6e 100644 --- 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 5fc10acdf..93a507834 100644 --- 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 e145f5065..b0a6f683a 100644 --- 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 40a19685a..0dc064800 100644 --- 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 8ebf2ace1..f0aad6b24 100644 --- 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 256e4460a..e35fbbabe 100644 --- 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 6720a6215..bbaf600ab 100644 --- 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 1704e7bd2..edc92abaf 100644 --- 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 1ff63cc6a..e5aa6c314 100644 --- 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 c256c0480..6856c4555 100644 --- 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 8fe3eebb3..fdcbec36b 100644 --- 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 4e775496e..a1e4a2a90 100644 --- 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 9bf928c89..19709854a 100644 --- 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 513e874bb..6c43e7a3e 100644 --- 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 7bf67f052..44d05e24c 100644 --- 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 d927a8652..d3d565fb0 100644 --- 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 67dfd9515..61ce70ae2 100644 --- 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 d92f2dcdf..b280bb673 100644 --- 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 -- 2.25.1