Metal3: Add release 1.6 tests

Also BMO release-0.5 tests and remove release 1.3 tests

Signed-off-by: Sunnatillo <sunnat.samadov@est.tech>
Change-Id: I2aecffc410ee3a14fb722c73e0b7e9c58b24183b

diff --git a/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml b/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
index e8e8cd439a18bb5b3616cd4a016f7a2d9068718b..7d732131bf2472f9c4fbd3ab21ad1a7683af6f58 100644 (file)
--- a/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
+++ b/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
@@ -19,6 +19,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
         - 'main'
+        - 'release-0.5'
         status-context: "{job_prefix}-{name}-e2e-test"
         success-status: "Passed"
         failure-status: "Failed"

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b2decb34edd8ba2bf94efc11b16f267d5b6be320..189629e5a523958976180cf261531600406f4617 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -94,6 +94,15 @@
           bmo_release_branch: main
           target_branches:
             - 'main'
+      - release-1-6:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.6
+          bmo_release_branch: release-0.5
+          target_branches:
+            - 'main'
+            - 'release-1.6'
+            - 'release-0.5'
       - release-1-5:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -112,14 +121,6 @@
             - 'main'
             - 'release-1.4'
             - 'release-0.3'
-      - release-1-3:
-          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'
     jobs:
       - integration_tests
 
@@ -152,6 +153,15 @@
           bmo_release_branch: main
           target_branches:
             - 'main'
+      - release-1-6:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.6
+          bmo_release_branch: release-0.5
+          target_branches:
+            - 'main'
+            - 'release-1.6'
+            - 'release-0.5'
       - release-1-5:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -170,14 +180,6 @@
             - 'main'
             - 'release-1.4'
             - 'release-0.3'
-      - release-1-3:
-          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'
     jobs:
       - keep_integration_tests
 
@@ -197,6 +199,12 @@
                 capm3_release_branch: main
                 bmo_release_branch: main
                 schedule: "H 4 * * *"
+            - release-1-6:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                schedule: "30 4 * * *"
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -209,12 +217,6 @@
                 capm3_release_branch: release-1.4
                 bmo_release_branch: release-0.3
                 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:
     name: bml-tests
@@ -263,6 +265,8 @@
     jobs:
       - capm3_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
+            - from-release-1-6:
+                upgrade_from: v1.6.
             - from-release-1-5:
                 upgrade_from: v1.5.
             - from-release-1-4:
@@ -302,6 +306,16 @@
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1  # v1.28.1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                capm3_target_branch: release-1-6
+                target_branches:
+                  - 'release-1.6'
+                  - 'release-0.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
@@ -322,15 +336,6 @@
                 target_branches:
                   - 'release-1.4'
                   - 'release-0.3'
-            - 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
-                target_branches:
-                  - 'release-1.3'
           exclude:
               - image_os: centos
       - capm3_e2e_integration_tests:
@@ -342,6 +347,15 @@
                 bmo_release_branch: main
                 target_branches:
                   - 'main'
+            - release-1-6:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                target_branches:
+                  - 'main'
+                  - 'release-1.6'
+                  - 'release-0.5'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -369,15 +383,15 @@
                 bmo_release_branch: main
                 target_branches:
                   - 'main'
-            - release-1-5:
+            - release-1-6:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.5
-                bmo_release_branch: release-0.4
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
                 target_branches:
                   - 'main'
-                  - 'release-1.5'
-                  - 'release-0.4'
+                  - 'release-1.6'
+                  - 'release-0.5'
       - capm3_e2e_feature_tests:
           capm3_target_branch:
             - main:
@@ -387,6 +401,14 @@
                 bmo_release_branch: main
                 target_branches:
                   - 'main'
+            - release-1-6:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                target_branches:
+                  - 'release-1.6'
+                  - 'release-0.5'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -403,13 +425,6 @@
                 target_branches:
                   - 'release-1.4'
                   - 'release-0.3'
-            - 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:
           capm3_target_branch:
             - main:
@@ -419,6 +434,15 @@
                 bmo_release_branch: main
                 target_branches:
                   - 'main'
+            - release-1-6:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                target_branches:
+                  - 'main'
+                  - 'release-1.6'
+                  - 'release-0.5'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -428,6 +452,15 @@
                   - 'main'
                   - 'release-1.5'
                   - 'release-0.4'
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                bmo_release_branch: release-0.3
+                target_branches:
+                  - 'main'
+                  - 'release-1.4'
+                  - 'release-0.3'
       - keep_capm3_e2e_basic_tests:
           capm3_target_branch:
             - main:
@@ -437,15 +470,15 @@
                 bmo_release_branch: main
                 target_branches:
                   - 'main'
-            - release-1-5:
+            - release-1-6:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.5
-                bmo_release_branch: release-0.4
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
                 target_branches:
                   - 'main'
-                  - 'release-1.5'
-                  - 'release-0.4'
+                  - 'release-1.6'
+                  - 'release-0.5'
       - keep_capm3_e2e_feature_tests:
           capm3_target_branch:
             - main:
@@ -455,6 +488,14 @@
                 bmo_release_branch: main
                 target_branches:
                   - 'main'
+            - release-1-6:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                target_branches:
+                  - 'release-1.6'
+                  - 'release-0.5'
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -471,15 +512,10 @@
                 target_branches:
                   - 'release-1.4'
                   - 'release-0.3'
-            - 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:
           upgrade_from_release:
+            - from-release-1-6:
+                upgrade_from: v1.6.
             - from-release-1-5:
                 upgrade_from: v1.5.
             - from-release-1-4:
@@ -519,6 +555,16 @@
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1  # v1.28.1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                capm3_target_branch: release-1-6
+                target_branches:
+                  - 'release-1.6'
+                  - 'release-0.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
@@ -539,15 +585,6 @@
                 target_branches:
                   - 'release-1.4'
                   - 'release-0.3'
-            - 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
-                target_branches:
-                  - 'release-1.3'
           exclude:
             - image_os: centos
 
@@ -562,6 +599,8 @@
     jobs:
       - capm3_main_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
+            - from-release-1-6:
+                upgrade_from: v1.6.
             - from-release-1-5:
                 upgrade_from: v1.5.
             - from-release-1-4:
@@ -597,6 +636,13 @@
                 capm3_release_branch: main
                 bmo_release_branch: main
                 capm3_target_branch: main
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1  # v1.28.1
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                capm3_target_branch: release-1-6
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
@@ -611,13 +657,6 @@
                 capm3_release_branch: release-1.4
                 bmo_release_branch: release-0.3
                 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
       - capm3_main_e2e_ephemeral_tests:
@@ -631,11 +670,11 @@
                 capm3_release_branch: main
                 bmo_release_branch: main
                 schedule: "H 4 * * *"
-            - release-1-5:
+            - release-1-6:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.5
-                bmo_release_branch: release-0.4
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
                 schedule: "30 4 * * *"
       - capm3_main_e2e_feature_tests:
           capm3_target_branch:
@@ -646,6 +685,13 @@
                 capm3_release_branch: main
                 bmo_release_branch: main
                 schedule: "H 2 * * *"
+            - release-1-6:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_branch: release-1.6
+                capm3_release_branch: release-1.6
+                bmo_release_branch: release-0.5
+                schedule: "H 8 * * *"
             - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -660,13 +706,6 @@
                 capm3_release_branch: release-1.4
                 bmo_release_branch: release-0.3
                 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:
     name: 'ironic_image_build_tests'