From fba373c23747d6ccc9a53b4ab0364ea61a7b22b8 Mon Sep 17 00:00:00 2001 From: Lennart Jern Date: Thu, 10 Feb 2022 09:50:44 +0200 Subject: [PATCH] metal3: Rename DISTRIBUTION -> IMAGE_OS IMAGE_OS is the variable that is used when running the tests, so to avoid unnecessary variables we want the same variable name here also. Change-Id: I9ddb64414a142ebd78550c4546dec671f0f791a7 --- jjb/metal3/job_bml_integration_tests_centos.yml | 4 ++-- .../job_bml_main_integration_tests_centos.yml | 4 ++-- jjb/metal3/job_capm3_v1a4_integration_tests.yml | 14 +++++++------- ...ob_capm3_v1a4_main_integration_tests_centos.yml | 4 ++-- ...ob_capm3_v1a4_main_integration_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml | 4 ++-- jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml | 4 ++-- .../job_capm3_v1a5_integration_tests_centos.yml | 4 ++-- .../job_capm3_v1a5_integration_tests_ubuntu.yml | 4 ++-- .../job_capm3_v1a5_main_e2e_tests_centos.yml | 4 ++-- .../job_capm3_v1a5_main_e2e_tests_ubuntu.yml | 4 ++-- ...ob_capm3_v1a5_main_integration_tests_centos.yml | 4 ++-- ...ob_capm3_v1a5_main_integration_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml | 4 ++-- jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml | 4 ++-- .../job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml | 4 ++-- .../job_capm3_v1b1_integration_tests_centos.yml | 4 ++-- .../job_capm3_v1b1_integration_tests_ubuntu.yml | 4 ++-- .../job_capm3_v1b1_main_e2e_tests_centos.yml | 4 ++-- .../job_capm3_v1b1_main_e2e_tests_ubuntu.yml | 4 ++-- ...ob_capm3_v1b1_main_integration_tests_centos.yml | 4 ++-- ...ob_capm3_v1b1_main_integration_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_feature_tests_centos.yml | 4 ++-- jjb/metal3/job_feature_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_feature_tests_upgrade_ubuntu.yml | 4 ++-- jjb/metal3/job_keep_integration_vm_v1a5_centos.yml | 4 ++-- jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml | 4 ++-- jjb/metal3/job_keep_integration_vm_v1b1_centos.yml | 4 ++-- jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml | 4 ++-- jjb/metal3/job_linter_tests.yml | 5 ++++- jjb/metal3/job_main_feature_tests_centos.yml | 4 ++-- jjb/metal3/job_main_feature_tests_ubuntu.yml | 4 ++-- .../job_main_feature_tests_upgrade_ubuntu.yml | 4 ++-- ...ob_metal3_dev_tools_integration_test_centos.yml | 4 ++-- ...ob_metal3_dev_tools_integration_test_ubuntu.yml | 4 ++-- jjb/metal3/projects.yml | 14 +++++++------- 36 files changed, 84 insertions(+), 81 deletions(-) diff --git a/jjb/metal3/job_bml_integration_tests_centos.yml b/jjb/metal3/job_bml_integration_tests_centos.yml index 007fae7a5..8e85e1690 100644 --- a/jjb/metal3/job_bml_integration_tests_centos.yml +++ b/jjb/metal3/job_bml_integration_tests_centos.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_bml_main_integration_tests_centos.yml b/jjb/metal3/job_bml_main_integration_tests_centos.yml index 0ac062879..161abee42 100644 --- a/jjb/metal3/job_bml_main_integration_tests_centos.yml +++ b/jjb/metal3/job_bml_main_integration_tests_centos.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_capm3_v1a4_integration_tests.yml b/jjb/metal3/job_capm3_v1a4_integration_tests.yml index feb4d7d2b..0dc65995c 100644 --- a/jjb/metal3/job_capm3_v1a4_integration_tests.yml +++ b/jjb/metal3/job_capm3_v1a4_integration_tests.yml @@ -26,8 +26,8 @@ - job-template: id: capm3_v1a4_integration_tests - name: '{job_prefix}_{name}_v1a4_integration_test_{distribution}' - description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on {distribution}." + name: '{job_prefix}_{name}_v1a4_integration_test_{image_os}' + description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on {image_os}." project-type: pipeline defaults: global disabled: False @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION - default: '{distribution}' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + name: IMAGE_OS + default: '{image_os}' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha3' @@ -86,7 +86,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '((.|\n)*\s)?/test-v1a4-{distribution}-integration(\s(.|\n)*)?' + trigger-phrase: '((.|\n)*\s)?/test-v1a4-{image_os}-integration(\s(.|\n)*)?' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -98,7 +98,7 @@ - 'main' - 'release-0.4' - 'release-0.0' - status-context: "test-v1a4-{distribution}-integration" + status-context: "test-v1a4-{image_os}-integration" success-status: "Passed" failure-status: "Failed" error-status: "Error" 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 2f086e005..256526659 100644 --- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha3' 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 52c7b142c..32b1452bc 100644 --- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha3' diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml index 06b1e281b..f9908ee4b 100644 --- a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml index aa5ced293..01611afc0 100644 --- a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml index af788ce67..4ae113ffd 100644 --- a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml index f0581f9af..0ba8ea8ab 100644 --- a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' 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 647c60047..b2189baa7 100644 --- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml @@ -54,9 +54,9 @@ default: 'release-0.5' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' 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 3c523f3e8..30d5763f3 100644 --- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'release-0.5' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' 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 a7650e3e9..dddd83125 100644 --- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' 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 cd9d181d1..a22546a8f 100644 --- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml index 97e8410bf..46e4cf6c9 100644 --- a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml index 662d58d95..9df2d449c 100644 --- a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' 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 1c46bbcac..72ad3e823 100644 --- a/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml index 7a0c7fa6e..3369f68a4 100644 --- a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml @@ -54,9 +54,9 @@ default: 'main' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml index 93a507834..b6f85687f 100644 --- a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'main' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' 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 b0a6f683a..f053093a2 100644 --- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml @@ -54,9 +54,9 @@ default: 'main' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' 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 0dc064800..1b311b198 100644 --- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'main' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' 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 f0aad6b24..acdaa5387 100644 --- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' 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 e35fbbabe..4e825f0b9 100644 --- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_feature_tests_centos.yml b/jjb/metal3/job_feature_tests_centos.yml index bbaf600ab..d7d8989af 100644 --- a/jjb/metal3/job_feature_tests_centos.yml +++ b/jjb/metal3/job_feature_tests_centos.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_feature_tests_ubuntu.yml b/jjb/metal3/job_feature_tests_ubuntu.yml index edc92abaf..23a558723 100644 --- a/jjb/metal3/job_feature_tests_ubuntu.yml +++ b/jjb/metal3/job_feature_tests_ubuntu.yml @@ -54,9 +54,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml index e5aa6c314..ef751b019 100644 --- a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml +++ b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml index 6856c4555..2c4914d02 100644 --- a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml +++ b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml index fdcbec36b..ff578fc3f 100644 --- a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml +++ b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml index a1e4a2a90..a2ad7ec73 100644 --- a/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml +++ b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml @@ -55,9 +55,9 @@ default: 'main' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml index 19709854a..14eeff05e 100644 --- a/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml +++ b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml @@ -55,9 +55,9 @@ default: 'main' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_linter_tests.yml b/jjb/metal3/job_linter_tests.yml index df5d291c1..9959b8d59 100644 --- a/jjb/metal3/job_linter_tests.yml +++ b/jjb/metal3/job_linter_tests.yml @@ -45,7 +45,10 @@ name: ghprbActualCommit default: 'master' description: 'CI Repo branch for triggering manual build' - + - string: + name: IMAGE_OS + default: 'ubuntu' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/metal3/job_main_feature_tests_centos.yml b/jjb/metal3/job_main_feature_tests_centos.yml index 6c43e7a3e..f4a5b61b2 100644 --- a/jjb/metal3/job_main_feature_tests_centos.yml +++ b/jjb/metal3/job_main_feature_tests_centos.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_main_feature_tests_ubuntu.yml b/jjb/metal3/job_main_feature_tests_ubuntu.yml index 44d05e24c..7e6029e70 100644 --- a/jjb/metal3/job_main_feature_tests_ubuntu.yml +++ b/jjb/metal3/job_main_feature_tests_ubuntu.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml index d3d565fb0..6138de05c 100644 --- a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml +++ b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests.' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1alpha4' 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 61ce70ae2..84db9cc2c 100644 --- a/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml +++ b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'centos' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' 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 b280bb673..f3c31c711 100644 --- a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml +++ b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml @@ -55,9 +55,9 @@ default: 'master' description: 'Target branch of the PR' - string: - name: DISTRIBUTION + name: IMAGE_OS default: 'ubuntu' - description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos' + description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml index 03e54dfb4..070c39969 100644 --- a/jjb/metal3/projects.yml +++ b/jjb/metal3/projects.yml @@ -58,7 +58,7 @@ ci_github_repo: '${{ghprbAuthorRepoGitUrl}}' jobs: - capm3_v1a4_integration_tests: - distribution: + image_os: - ubuntu - centos - capm3_v1a5_integration_tests_centos @@ -90,7 +90,7 @@ name: "baremetal-operator" jobs: - capm3_v1a4_integration_tests: - distribution: + image_os: - ubuntu - centos - capm3_v1a5_integration_tests_centos @@ -110,7 +110,7 @@ name: "ip-address-manager" jobs: - capm3_v1a4_integration_tests: - distribution: + image_os: - ubuntu - centos - capm3_v1a5_integration_tests_centos @@ -126,7 +126,7 @@ name: "metal3_dev_env" jobs: - capm3_v1a4_integration_tests: - distribution: + image_os: - ubuntu - centos - capm3_v1a4_main_integration_tests_centos @@ -163,7 +163,7 @@ name: "cluster-api-provider-metal3" jobs: - capm3_v1a4_integration_tests: - distribution: + image_os: - ubuntu - centos - capm3_v1a5_integration_tests_centos @@ -192,7 +192,7 @@ name: "ironic-image" jobs: - capm3_v1a4_integration_tests: - distribution: + image_os: - ubuntu - centos - capm3_v1a5_integration_tests_centos @@ -211,7 +211,7 @@ name: "ironic-ipa-downloader" jobs: - capm3_v1a4_integration_tests: - distribution: ubuntu + image_os: ubuntu - capm3_v1a5_integration_tests_ubuntu - capm3_v1b1_integration_tests_centos - capm3_v1b1_integration_tests_ubuntu -- 2.25.1