Add bmo_release_branch var ir JJBs for enabling CI in BMO branches

Change-Id: I7e4587b50b68f3d045d04e95a93df30e9bd99ffd

diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml
index dfe9b608895472a2cf320f03540ffc05a5bda4a7..6ffeebea84a049bb56a281743dc23e9d20ebdf70 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests.yml
+++ b/jjb/metal3/job_bml_integration_tests.yml
@@ -62,6 +62,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO 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 0d80a3f6af21c6ab0fa045ed2c128467c5719afd..121777c48088c30f197b3f717094823e520c54a6 100644 (file)
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_main_integration_tests.yml
@@ -62,6 +62,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index 7336ec98f85db5678569dc1224cfba0c660f6dd5..cd7962f9b4a15aa5f31962e8f87b5ab1af8d07e6 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
index 9edba6ce157ceb093d8cdc5632c10cb097fa304b..eb9a6fae86a90fdebbdcbc59edf08b68f582c2b2 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_e2e_feature_tests.yml b/jjb/metal3/job_capm3_e2e_feature_tests.yml
index 72611cffa0ecbc5327a792bb9a08377a6cff9e18..362448fadc2d1ed73a0c0e269782ba3b4c11b6dd 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_feature_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_feature_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_capm3_e2e_integration_tests.yml b/jjb/metal3/job_capm3_e2e_integration_tests.yml
index 78a7be0e07abe0df99f716e8a96f119e27bc6cec..34c0983404acb5f95edb55255aa53f4ce9f5f6a8 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_integration_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_integration_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
index 8a8b1812674e8be03b2f2c766c6c08ebe2ad7b49..aa2c8617af2e96d7325dfb5739d8b4415b208837 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests.yml
index 50f2d5aa81d010a1c4906598b58038c07d26d8a3..a51cdebdf69e88fcf11d70dfe47aaf7beefb53e7 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO 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 c2f8fa2b0d6347cd5363026124d3cbcf3c41fe32..bce4400c46005dd483787994069b0b5ccb07b56a 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_main_e2e_feature_tests.yml b/jjb/metal3/job_capm3_main_e2e_feature_tests.yml
index fe183b1fa4ee11cfdba3494fa0bb05d8d7e9b88e..97d5c84b9fe607d8c712459c551700fdc4c22d3c 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_feature_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_feature_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml b/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
index a529e4746b1833e8ff5be5447b9c7ab60835c17e..2aff7ba80ccb61fb4183f64d79dc4ddc949fe410 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml
index 688c1cc6e9c80ad6c725c84d83951704ca0a82b6..6fa473e7675d2c02f137a97afed4846820ed00a6 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_main_integration_tests.yml
index c725f73039e90cb909d8713c4b1cae44b63005b7..b34f57f12d30609c460b2225a40a8e4eb6506b02 100644 (file)
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_integration_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index c72d810ad3bb6ad810b8fd24e929045446d13630..15dae130dd98564053794eba2af3005f72f00806 100644 (file)
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -57,6 +57,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: IMAGE_OS
         default: '{image_os}'

diff --git a/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml b/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
index adcb561974e4bb5bd82277a05a3d1f137df14c06..e44b0c55859eee964c748721e2236737c832f481 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
index de151c9ba516e2bf159b5f788c316d45a5c9cf24..93380983e88a244a652a91f78f80c439e6f64a2d 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml b/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
index 8a8d8c725e9fea386c74b348c1ecc13c98095d50..8fa914ee1dc167348c75fc93143f02f0cc7371be 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml b/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
index d58de6b1a17baa9710c42005d867e5ebc6dc7b5c..b88e68f9165b3ddb499824a57207d4d0b8628f6b 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: 'main'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
index d3c85afb0cae7b3d40671ab3bd3a09409bba675b..b08ca1a7a9f6c2e10673e2b1d3accae9799b8b4c 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml
index e0d386a434de97f74dbdac3dffd91aece54da7ee..946d3b46c47e1411a58167ba372b18a2896363c6 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm.yml
+++ b/jjb/metal3/job_keep_integration_vm.yml
@@ -62,6 +62,10 @@
         name: capm3_release_branch
         default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
index 4175cdef6a4c357f0e36f5b46326dd2a2e3af530..52108557e4b6b8c4d6e969a4f683f18be20c0c2e 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
@@ -58,10 +58,6 @@
         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 2f9cef017455e5b7153ccb670c15004360860a19..36973dc4ed05db7914c4cc4ba9aeb3cca3263d9e 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -91,12 +91,14 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: main
+          bmo_release_branch: main
           target_branches:
             - 'main'
       - release-1-5:
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.5
+          bmo_release_branch: release-0.4
           target_branches:
             - 'main'
             - 'release-1.5'
@@ -104,6 +106,7 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.4
+          bmo_release_branch: v0.3.0  # This would point to a tag until we branch out
           target_branches:
             - 'main'
             - 'release-1.4'
@@ -111,6 +114,7 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.3
+          bmo_release_branch: v0.2.0 # We won't have a BMO branch for this, so pointing to a tag
           target_branches:
             - 'main'
             - 'release-1.3'
@@ -143,12 +147,14 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: main
+          bmo_release_branch: main
           target_branches:
             - 'main'
       - release-1-5:
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.5
+          bmo_release_branch: release-0.4
           target_branches:
             - 'main'
             - 'release-1.5'
@@ -156,6 +162,7 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.4
+          bmo_release_branch: v0.3.0  # This would point to a tag until we branch out
           target_branches:
             - 'main'
             - 'release-1.4'
@@ -163,6 +170,7 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.3
+          bmo_release_branch: v0.2.0 # We won't have a BMO branch for this, so pointing to a tag
           target_branches:
             - 'main'
             - 'release-1.3'
@@ -183,21 +191,25 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 schedule: "H 4 * * *"
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 schedule: "30 4 * * *"
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 schedule: "30 4 * * *"
             - release-1-3:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.3
+                bmo_release_branch: v0.2.0
                 schedule: "30 4 * * *"
 
 - project:
@@ -264,6 +276,7 @@
                 k8s_version_upgrade_to: v1.28.1
                 kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1  # v1.28.1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
@@ -273,6 +286,7 @@
                 kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: main
                 capm3_target_branch: main
+                bmo_release_branch: main
                 target_branches:
                   - 'main'
             - 1-25-1-26:
@@ -280,6 +294,7 @@
                 k8s_version_upgrade_to: v1.26.4
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
@@ -288,6 +303,7 @@
                 k8s_version_upgrade_to: v1.27.4
                 kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 capm3_target_branch: release-1-5
                 target_branches:
                   - 'release-1.5'
@@ -296,6 +312,7 @@
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 capm3_target_branch: release-1-4
                 target_branches:
                   - 'release-1.4'
@@ -304,6 +321,7 @@
                 kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 k8s_version_upgrade_to: v1.26.4
                 capm3_release_branch: release-1.3
+                bmo_release_branch: v0.2.0
                 capm3_target_branch: release-1-3
                 target_branches:
                   - 'release-1.3'
@@ -315,12 +333,14 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 target_branches:
                   - 'main'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 target_branches:
                   - 'main'
                   - 'release-1.5'
@@ -328,6 +348,7 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 target_branches:
                   - 'main'
                   - 'release-1.4'
@@ -337,12 +358,14 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 target_branches:
                   - 'main'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 target_branches:
                   - 'main'
                   - 'release-1.5'
@@ -352,24 +375,28 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 target_branches:
                   - 'main'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 target_branches:
                   - 'release-1.5'
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 target_branches:
                   - 'release-1.4'
             - release-1-3:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.3
+                bmo_release_branch: v0.2.0
                 target_branches:
                   - 'release-1.3'
       - keep_capm3_e2e_integration_tests:
@@ -378,12 +405,14 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 target_branches:
                   - 'main'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 target_branches:
                   - 'main'
                   - 'release-1.5'
@@ -393,12 +422,14 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 target_branches:
                   - 'main'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 target_branches:
                   - 'main'
                   - 'release-1.5'
@@ -408,24 +439,28 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 target_branches:
                   - 'main'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 target_branches:
                   - 'release-1.5'
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 target_branches:
                   - 'release-1.4'
             - release-1-3:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.3
+                bmo_release_branch: v0.2.0
                 target_branches:
                   - 'release-1.3'
       - keep_capm3_e2e_clusterctl_upgrade_tests:
@@ -447,6 +482,7 @@
                 k8s_version_upgrade_to: v1.28.1
                 kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1  # v1.28.1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
@@ -455,6 +491,7 @@
                 k8s_version_upgrade_to: v1.27.4
                 kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
@@ -463,6 +500,7 @@
                 k8s_version_upgrade_to: v1.26.4
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
@@ -471,6 +509,7 @@
                 k8s_version_upgrade_to: v1.27.4
                 kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 capm3_target_branch: release-1-5
                 target_branches:
                   - 'release-1.5'
@@ -479,6 +518,7 @@
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 capm3_target_branch: release-1-4
                 target_branches:
                   - 'release-1.4'
@@ -487,6 +527,7 @@
                 kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 k8s_version_upgrade_to: v1.26.4
                 capm3_release_branch: release-1.3
+                bmo_release_branch: v0.2.0
                 capm3_target_branch: release-1-3
                 target_branches:
                   - 'release-1.3'
@@ -521,6 +562,7 @@
                 k8s_version_upgrade_to: v1.28.1
                 kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1  # v1.28.1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
@@ -529,30 +571,35 @@
                 k8s_version_upgrade_to: v1.27.4
                 kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 k8s_version_upgrade_to: v1.26.4
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: main
+                bmo_release_branch: main
                 capm3_target_branch: main
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
                 kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 capm3_target_branch: release-1-5
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 capm3_target_branch: release-1-4
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 k8s_version_upgrade_to: v1.26.4
                 capm3_release_branch: release-1.3
+                bmo_release_branch: v0.2.0
                 capm3_target_branch: release-1-3
           exclude:
               - image_os: centos
@@ -565,11 +612,13 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: main
+                bmo_release_branch: main
                 schedule: "H 4 * * *"
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 schedule: "30 4 * * *"
       - capm3_main_e2e_feature_tests:
           capm3_target_branch:
@@ -578,24 +627,28 @@
                 capm3_version: v1beta1
                 capm3_branch: main
                 capm3_release_branch: main
+                bmo_release_branch: main
                 schedule: "H 2 * * *"
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_branch: release-1.5
                 capm3_release_branch: release-1.5
+                bmo_release_branch: release-0.4
                 schedule: "H 11 * * *"
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_branch: release-1.4
                 capm3_release_branch: release-1.4
+                bmo_release_branch: v0.3.0
                 schedule: "H 5 * * *"
             - release-1-3:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_branch: release-1.3
                 capm3_release_branch: release-1.3
+                bmo_release_branch: v0.2.0
                 schedule: "H 8 * * *"
 
 - project: