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
diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml
index 8fca3f7..63ffd82 100644
--- a/jjb/metal3/job_bml_integration_tests.yml
+++ b/jjb/metal3/job_bml_integration_tests.yml
@@ -59,6 +59,10 @@
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'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_main_integration_tests.yml
index aa2b39c..e532ded 100644
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_main_integration_tests.yml
@@ -59,6 +59,10 @@
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'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_capm3_e2e_tests.yml b/jjb/metal3/job_capm3_e2e_tests.yml
index d1372f3..b74841b 100644
--- a/jjb/metal3/job_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_tests.yml
@@ -58,6 +58,10 @@
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}'
description: 'Cluster API version. E.g. v1beta1.'
diff --git a/jjb/metal3/job_capm3_e2e_tests_parallel.yml b/jjb/metal3/job_capm3_e2e_tests_parallel.yml
index 5fec0e6..2a41d05 100644
--- a/jjb/metal3/job_capm3_e2e_tests_parallel.yml
+++ b/jjb/metal3/job_capm3_e2e_tests_parallel.yml
@@ -58,6 +58,10 @@
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}'
description: 'Cluster API version. E.g. v1beta1.'
diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
index d508be6..dc28bca 100644
--- a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
@@ -58,6 +58,10 @@
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'
description: 'Cluster API version. E.g. v1beta1.'
diff --git a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
index 6749379..2b51687 100644
--- a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
@@ -58,6 +58,10 @@
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'
description: 'Cluster API version. E.g. v1beta1.'
diff --git a/jjb/metal3/job_capm3_main_e2e_tests.yml b/jjb/metal3/job_capm3_main_e2e_tests.yml
index 0799346..40755f4 100644
--- a/jjb/metal3/job_capm3_main_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_tests.yml
@@ -58,6 +58,10 @@
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}'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
index 19bf5f3..e3ffb76 100644
--- a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
@@ -58,6 +58,10 @@
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'
description: 'Cluster API version. E.g. v1alpha4.'
diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_main_integration_tests.yml
index fc25627..c725f73 100644
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_integration_tests.yml
@@ -58,6 +58,10 @@
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}'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_feature_tests.yml b/jjb/metal3/job_feature_tests.yml
index 94fdc40..f6dcd3e 100644
--- a/jjb/metal3/job_feature_tests.yml
+++ b/jjb/metal3/job_feature_tests.yml
@@ -58,6 +58,10 @@
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'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_feature_tests_upgrade.yml b/jjb/metal3/job_feature_tests_upgrade.yml
index 5d0a008..7753035 100644
--- a/jjb/metal3/job_feature_tests_upgrade.yml
+++ b/jjb/metal3/job_feature_tests_upgrade.yml
@@ -59,6 +59,10 @@
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'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index 02a782b..20a6ca2 100644
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -54,6 +54,10 @@
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}'
description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
diff --git a/jjb/metal3/job_keep_capm3_e2e_tests.yml b/jjb/metal3/job_keep_capm3_e2e_tests.yml
index ba347fc..5a55058 100644
--- a/jjb/metal3/job_keep_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_tests.yml
@@ -58,6 +58,10 @@
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}'
description: 'Cluster API version. E.g. v1beta1.'
diff --git a/jjb/metal3/job_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml
index 49b6712..2596360 100644
--- a/jjb/metal3/job_keep_integration_vm.yml
+++ b/jjb/metal3/job_keep_integration_vm.yml
@@ -59,6 +59,10 @@
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}'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_main_feature_tests.yml b/jjb/metal3/job_main_feature_tests.yml
index e166a7d..3e326bc 100644
--- a/jjb/metal3/job_main_feature_tests.yml
+++ b/jjb/metal3/job_main_feature_tests.yml
@@ -59,6 +59,10 @@
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'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_main_feature_tests_upgrade.yml b/jjb/metal3/job_main_feature_tests_upgrade.yml
index 3fa39be..a60e48b 100644
--- a/jjb/metal3/job_main_feature_tests_upgrade.yml
+++ b/jjb/metal3/job_main_feature_tests_upgrade.yml
@@ -59,6 +59,10 @@
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'
description: 'Cluster API version.'
diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
index 5210855..4175cde 100644
--- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
@@ -59,6 +59,10 @@
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'
description: 'Cluster API version. E.g. v1beta1.'
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 0e2dc00..869e60d 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 * * *"