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 8fca3f709bb3f9c357bdf5525772ad0681fb2e09..63ffd82faabe8db7f8b3a1a4bc7aedf31fc36159 100644 (file)
--- 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 aa2b39c5a2ad1f4a7257572f9ced9a1bdbb12b77..e532deda2108502987e7e6bf109ede49f350889e 100644 (file)
--- 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 d1372f3e725568643456372caa9a12c0b290f1db..b74841bf4fe7d5563e727196e4a9557b495660f3 100644 (file)
--- 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 5fec0e6c80c8d9ac80652026e56354060ce15c1e..2a41d05cce5c565cb4226c3c143819d72e460931 100644 (file)
--- 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 d508be64e295c1d36bb30d99b4504ad81e4bd2fc..dc28bca5128bf7653a369b06150532ff8e7d1bb6 100644 (file)
--- 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 6749379353b5d073cd593bfe24b6437ac379c34d..2b516871ae057036a260d550a4a0024b3867cbc9 100644 (file)
--- 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 0799346b5105af5a2ac56e44a67ff9ce972a6a53..40755f4c38f311b71cb296578c7110c89cc7aaa7 100644 (file)
--- 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 19bf5f3e5444a08ae95d8490eec7d8f33e0ecc5f..e3ffb76e9966bcfcebc3d16fdc00feaccda4cbba 100644 (file)
--- 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 fc25627e664c3526ee90d17c881a545889ed3541..c725f73039e90cb909d8713c4b1cae44b63005b7 100644 (file)
--- 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 94fdc40599613e9973c09bbe5c920a9ede8680dc..f6dcd3ef720e41ec0cb6eadcb987ce700bf561a3 100644 (file)
--- 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 5d0a0082ef116f46b1cd91f53051932e646f9de6..7753035ffdd0c966a2406cdb5ecdee7c6e91f1fa 100644 (file)
--- 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 02a782b40a4772e35708c7f424e526e897c27779..20a6ca205f681be56b87a2b3f40994c3578ad642 100644 (file)
--- 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 ba347fca31659d406f3f0dfaff599a7d06362fed..5a55058a1c65592da74abf88ac211a285b84161c 100644 (file)
--- 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 49b6712896fb7ff4d2ee1080e14bc294682d63f0..2596360a9c831ca55c0ad80658e2a7326cd1ad2b 100644 (file)
--- 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 e166a7d5ff8dcc2f957bddcf83456770452aaf8d..3e326bcf43134859037458778d6d289c42a6f4ae 100644 (file)
--- 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 3fa39bee7204db00052faa5d10e5177858fdadb9..a60e48bc16c4d9b17d7d0420878d27f028270be5 100644 (file)
--- 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 52108557e4b6b8c4d6e969a4f683f18be20c0c2e..4175cdef6a4c357f0e36f5b46326dd2a2e3af530 100644 (file)
--- 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 0e2dc00b61f03eb6519b9fb78c945cf35d9845b7..869e60d613bdc64cef2ba854fca6093847f26db3 100644 (file)
--- 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 * * *"