From d4892577623695d070e594aa119e252ef87b23e4 Mon Sep 17 00:00:00 2001 From: kashifest Date: Thu, 7 Jul 2022 13:50:06 +0300 Subject: [PATCH] Add capm3_release_branch as an env var This capm3__release_branch environment variable will be passed to pipeline and to the dev-env tests below in the hierarchy to determine for which CAPM3 and IPAM branch the test should be running. Change-Id: I6845050fcc0b0a7f16481dfe84ddb4551bb5fb4a --- jjb/metal3/job_bml_integration_tests.yml | 4 ++++ jjb/metal3/job_bml_main_integration_tests.yml | 4 ++++ jjb/metal3/job_capm3_e2e_tests.yml | 4 ++++ jjb/metal3/job_capm3_e2e_tests_parallel.yml | 4 ++++ jjb/metal3/job_capm3_e2e_upgrade_tests.yml | 4 ++++ jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml | 4 ++++ jjb/metal3/job_capm3_main_e2e_tests.yml | 4 ++++ jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml | 4 ++++ jjb/metal3/job_capm3_main_integration_tests.yml | 4 ++++ jjb/metal3/job_feature_tests.yml | 4 ++++ jjb/metal3/job_feature_tests_upgrade.yml | 4 ++++ jjb/metal3/job_integration_tests.yml | 4 ++++ jjb/metal3/job_keep_capm3_e2e_tests.yml | 4 ++++ jjb/metal3/job_keep_integration_vm.yml | 4 ++++ jjb/metal3/job_main_feature_tests.yml | 4 ++++ jjb/metal3/job_main_feature_tests_upgrade.yml | 4 ++++ jjb/metal3/job_metal3_dev_tools_integration_test.yml | 4 ++++ jjb/metal3/projects.yml | 10 ++++++++++ 18 files changed, 78 insertions(+) diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml index 8fca3f70..63ffd82f 100644 --- a/jjb/metal3/job_bml_integration_tests.yml +++ b/jjb/metal3/job_bml_integration_tests.yml @@ -58,6 +58,10 @@ 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: capm3_release_branch + default: 'main' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_main_integration_tests.yml index aa2b39c5..e532deda 100644 --- a/jjb/metal3/job_bml_main_integration_tests.yml +++ b/jjb/metal3/job_bml_main_integration_tests.yml @@ -58,6 +58,10 @@ 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: capm3_release_branch + default: 'main' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_capm3_e2e_tests.yml b/jjb/metal3/job_capm3_e2e_tests.yml index d1372f3e..b74841bf 100644 --- a/jjb/metal3/job_capm3_e2e_tests.yml +++ b/jjb/metal3/job_capm3_e2e_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: '{capm3_release_branch}' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: '{capi_version}' diff --git a/jjb/metal3/job_capm3_e2e_tests_parallel.yml b/jjb/metal3/job_capm3_e2e_tests_parallel.yml index 5fec0e6c..2a41d05c 100644 --- a/jjb/metal3/job_capm3_e2e_tests_parallel.yml +++ b/jjb/metal3/job_capm3_e2e_tests_parallel.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: '{capm3_release_branch}' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: '{capi_version}' diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml index d508be64..dc28bca5 100644 --- a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml +++ b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: 'main' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml index 67493793..2b516871 100644 --- a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml +++ b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: 'main' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_capm3_main_e2e_tests.yml b/jjb/metal3/job_capm3_main_e2e_tests.yml index 0799346b..40755f4c 100644 --- a/jjb/metal3/job_capm3_main_e2e_tests.yml +++ b/jjb/metal3/job_capm3_main_e2e_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: '{capm3_release_branch}' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: '{capi_version}' diff --git a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml index 19bf5f3e..e3ffb76e 100644 --- a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml +++ b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: 'release-0.5' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_main_integration_tests.yml index fc25627e..c725f730 100644 --- a/jjb/metal3/job_capm3_main_integration_tests.yml +++ b/jjb/metal3/job_capm3_main_integration_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: '{capm3_release_branch}' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: '{capi_version}' diff --git a/jjb/metal3/job_feature_tests.yml b/jjb/metal3/job_feature_tests.yml index 94fdc405..f6dcd3ef 100644 --- a/jjb/metal3/job_feature_tests.yml +++ b/jjb/metal3/job_feature_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: 'main' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_feature_tests_upgrade.yml b/jjb/metal3/job_feature_tests_upgrade.yml index 5d0a0082..7753035f 100644 --- a/jjb/metal3/job_feature_tests_upgrade.yml +++ b/jjb/metal3/job_feature_tests_upgrade.yml @@ -58,6 +58,10 @@ 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: capm3_release_branch + default: 'release-0.5' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml index 02a782b4..20a6ca20 100644 --- a/jjb/metal3/job_integration_tests.yml +++ b/jjb/metal3/job_integration_tests.yml @@ -53,6 +53,10 @@ name: ghprbTargetBranch default: 'main' description: 'Target branch of the PR' + - string: + name: capm3_release_branch + default: '{capm3_release_branch}' + description: 'The target branch of CAPM3 to be used for this test' - string: name: IMAGE_OS default: '{image_os}' diff --git a/jjb/metal3/job_keep_capm3_e2e_tests.yml b/jjb/metal3/job_keep_capm3_e2e_tests.yml index ba347fca..5a55058a 100644 --- a/jjb/metal3/job_keep_capm3_e2e_tests.yml +++ b/jjb/metal3/job_keep_capm3_e2e_tests.yml @@ -57,6 +57,10 @@ 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: capm3_release_branch + default: '{capm3_release_branch}' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: '{capi_version}' diff --git a/jjb/metal3/job_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml index 49b67128..2596360a 100644 --- a/jjb/metal3/job_keep_integration_vm.yml +++ b/jjb/metal3/job_keep_integration_vm.yml @@ -58,6 +58,10 @@ 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: capm3_release_branch + default: '{capm3_release_branch}' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: '{capi_version}' diff --git a/jjb/metal3/job_main_feature_tests.yml b/jjb/metal3/job_main_feature_tests.yml index e166a7d5..3e326bcf 100644 --- a/jjb/metal3/job_main_feature_tests.yml +++ b/jjb/metal3/job_main_feature_tests.yml @@ -58,6 +58,10 @@ 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: capm3_release_branch + default: 'main' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/job_main_feature_tests_upgrade.yml b/jjb/metal3/job_main_feature_tests_upgrade.yml index 3fa39bee..a60e48bc 100644 --- a/jjb/metal3/job_main_feature_tests_upgrade.yml +++ b/jjb/metal3/job_main_feature_tests_upgrade.yml @@ -58,6 +58,10 @@ 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: capm3_release_branch + default: 'release-0.5' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1alpha4' diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml index 52108557..4175cdef 100644 --- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml +++ b/jjb/metal3/job_metal3_dev_tools_integration_test.yml @@ -58,6 +58,10 @@ 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: capm3_release_branch + default: 'main' + description: 'The target branch of CAPM3 to be used for this test' - string: name: CAPI_VERSION default: 'v1beta1' diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml index 0e2dc00b..869e60d6 100644 --- a/jjb/metal3/projects.yml +++ b/jjb/metal3/projects.yml @@ -85,11 +85,13 @@ - main: capi_version: v1beta1 capm3_version: v1beta1 + capm3_release_branch: main target_branches: - 'main' - release-0-5: capi_version: v1alpha4 capm3_version: v1alpha5 + capm3_release_branch: release-0.5 target_branches: - 'main' - 'release-0.5' @@ -126,11 +128,13 @@ - main: capi_version: v1beta1 capm3_version: v1beta1 + capm3_release_branch: main target_branches: - 'main' - release-0-5: capi_version: v1alpha4 capm3_version: v1alpha5 + capm3_release_branch: release-0.5 target_branches: - 'main' - 'release-0.5' @@ -180,10 +184,12 @@ - main: capi_version: v1beta1 capm3_version: v1beta1 + capm3_release_branch: main schedule: "H 4 * * *" - release-0-5: capi_version: v1alpha4 capm3_version: v1alpha5 + capm3_release_branch: release-0.5 schedule: "30 4 * * *" - project: @@ -232,11 +238,13 @@ - main: capi_version: v1beta1 capm3_version: v1beta1 + capm3_release_branch: main target_branches: - 'main' - release-0-5: capi_version: v1alpha4 capm3_version: v1alpha5 + capm3_release_branch: release-0.5 target_branches: - 'release-0.5' jobs: @@ -274,11 +282,13 @@ capi_version: v1beta1 capm3_version: v1beta1 capm3_branch: main + capm3_release_branch: main schedule: "H 20 * * *" - release-0-5: capi_version: v1alpha4 capm3_version: v1alpha5 capm3_branch: release-0.5 + capm3_release_branch: release-0.5 schedule: "H 23 * * *" -- 2.25.1