Metal3: Add release-1.5 tests

Also removes older tests to keep the number of tests at the same level.

Change-Id: Iefa3de002a69c1d221366c2cb0395200c9e0886f

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 334329524255184c65ef83a4013e12b9fac96ccd..e7f303b2b8210739b6b4a7b613a512ea5f89a5b9 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -90,6 +90,13 @@
           capm3_release_branch: main
           target_branches:
             - 'main'
+      - release-1-5:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.5
+          target_branches:
+            - 'main'
+            - 'release-1.5'
       - release-1-4:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -104,13 +111,6 @@
           target_branches:
             - 'main'
             - 'release-1.3'
-      - release-1-2:
-          capi_version: v1beta1
-          capm3_version: v1beta1
-          capm3_release_branch: release-1.2
-          target_branches:
-            - 'main'
-            - 'release-1.2'
     jobs:
       - integration_tests
 
@@ -142,6 +142,13 @@
           capm3_release_branch: main
           target_branches:
             - 'main'
+      - release-1-5:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.5
+          target_branches:
+            - 'main'
+            - 'release-1.5'
       - release-1-4:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -156,13 +163,6 @@
           target_branches:
             - 'main'
             - 'release-1.3'
-      - release-1-2:
-          capi_version: v1beta1
-          capm3_version: v1beta1
-          capm3_release_branch: release-1.2
-          target_branches:
-            - 'main'
-            - 'release-1.2'
     jobs:
       - keep_integration_tests
 
@@ -181,6 +181,11 @@
                 capm3_version: v1beta1
                 capm3_release_branch: main
                 schedule: "H 4 * * *"
+            - release-1-5:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.5
+                schedule: "30 4 * * *"
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -191,11 +196,6 @@
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.3
                 schedule: "30 4 * * *"
-            - release-1-2:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                capm3_release_branch: release-1.2
-                schedule: "30 4 * * *"
 
 - project:
     name: bml-tests
@@ -244,12 +244,12 @@
     jobs:
       - capm3_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
+            - from-release-1-5:
+                upgrade_from: v1.5.
             - from-release-1-4:
                 upgrade_from: v1.4.
             - from-release-1-3:
                 upgrade_from: v1.3.
-            - from-release-1-2:
-                upgrade_from: v1.2.
             - from-release-0-5:
                 upgrade_from: v0.5.
           exclude:
@@ -277,6 +277,13 @@
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: release-1.5
+                capm3_target_branch: release-1-5
+                target_branches:
+                  - 'release-1.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
@@ -291,13 +298,6 @@
                 capm3_target_branch: release-1-3
                 target_branches:
                   - 'release-1.3'
-            - 1-25-1-26:
-                k8s_version_upgrade_from: v1.25.5
-                k8s_version_upgrade_to: v1.26.4
-                capm3_release_branch: release-1.2
-                capm3_target_branch: release-1-2
-                target_branches:
-                  - 'release-1.2'
           exclude:
               - image_os: centos
       - capm3_e2e_integration_tests:
@@ -308,13 +308,13 @@
                 capm3_release_branch: main
                 target_branches:
                   - 'main'
-            - release-1-4:
+            - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.4
+                capm3_release_branch: release-1.5
                 target_branches:
                   - 'main'
-                  - 'release-1.4'
+                  - 'release-1.5'
       - capm3_e2e_basic_tests:
           capm3_target_branch:
             - main:
@@ -323,13 +323,13 @@
                 capm3_release_branch: main
                 target_branches:
                   - 'main'
-            - release-1-4:
+            - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.4
+                capm3_release_branch: release-1.5
                 target_branches:
                   - 'main'
-                  - 'release-1.4'
+                  - 'release-1.5'
       - capm3_e2e_feature_tests:
           capm3_target_branch:
             - main:
@@ -338,6 +338,12 @@
                 capm3_release_branch: main
                 target_branches:
                   - 'main'
+            - release-1-5:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.5
+                target_branches:
+                  - 'release-1.5'
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -350,12 +356,6 @@
                 capm3_release_branch: release-1.3
                 target_branches:
                   - 'release-1.3'
-            - release-1-2:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                capm3_release_branch: release-1.2
-                target_branches:
-                  - 'release-1.2'
       - keep_capm3_e2e_integration_tests:
           capm3_target_branch:
             - main:
@@ -364,13 +364,13 @@
                 capm3_release_branch: main
                 target_branches:
                   - 'main'
-            - release-1-4:
+            - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.4
+                capm3_release_branch: release-1.5
                 target_branches:
                   - 'main'
-                  - 'release-1.4'
+                  - 'release-1.5'
       - keep_capm3_e2e_basic_tests:
           capm3_target_branch:
             - main:
@@ -379,13 +379,13 @@
                 capm3_release_branch: main
                 target_branches:
                   - 'main'
-            - release-1-4:
+            - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.4
+                capm3_release_branch: release-1.5
                 target_branches:
                   - 'main'
-                  - 'release-1.4'
+                  - 'release-1.5'
       - keep_capm3_e2e_feature_tests:
           capm3_target_branch:
             - main:
@@ -394,6 +394,12 @@
                 capm3_release_branch: main
                 target_branches:
                   - 'main'
+            - release-1-5:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.5
+                target_branches:
+                  - 'release-1.5'
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -406,20 +412,14 @@
                 capm3_release_branch: release-1.3
                 target_branches:
                   - 'release-1.3'
-            - release-1-2:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                capm3_release_branch: release-1.2
-                target_branches:
-                  - 'release-1.2'
       - keep_capm3_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
+            - from-release-1-5:
+                upgrade_from: v1.5.
             - from-release-1-4:
                 upgrade_from: v1.4.
             - from-release-1-3:
                 upgrade_from: v1.3.
-            - from-release-1-2:
-                upgrade_from: v1.2.
             - from-release-0-5:
                 upgrade_from: v0.5.
           exclude:
@@ -447,6 +447,13 @@
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: release-1.5
+                capm3_target_branch: release-1-5
+                target_branches:
+                  - 'release-1.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
@@ -461,13 +468,6 @@
                 capm3_target_branch: release-1-3
                 target_branches:
                   - 'release-1.3'
-            - 1-25-1-26:
-                k8s_version_upgrade_from: v1.25.5
-                k8s_version_upgrade_to: v1.26.4
-                capm3_release_branch: release-1.2
-                capm3_target_branch: release-1-2
-                target_branches:
-                  - 'release-1.2'
           exclude:
             - image_os: centos
 
@@ -482,12 +482,12 @@
     jobs:
       - capm3_main_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
+            - from-release-1-5:
+                upgrade_from: v1.5.
             - from-release-1-4:
                 upgrade_from: v1.4.
             - from-release-1-3:
                 upgrade_from: v1.3.
-            - from-release-1-2:
-                upgrade_from: v1.2.
             - from-release-0-5:
                 upgrade_from: v0.5.
           exclude:
@@ -509,6 +509,11 @@
                 k8s_version_upgrade_to: v1.25.5
                 capm3_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
+                capm3_release_branch: release-1.5
+                capm3_target_branch: release-1-5
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
@@ -519,11 +524,6 @@
                 k8s_version_upgrade_to: v1.26.4
                 capm3_release_branch: release-1.3
                 capm3_target_branch: release-1-3
-            - 1-25-1-26:
-                k8s_version_upgrade_from: v1.25.5
-                k8s_version_upgrade_to: v1.26.4
-                capm3_release_branch: release-1.2
-                capm3_target_branch: release-1-2
           exclude:
               - image_os: centos
       - capm3_main_e2e_ephemeral_tests:
@@ -536,10 +536,10 @@
                 capm3_version: v1beta1
                 capm3_release_branch: main
                 schedule: "H 4 * * *"
-            - release-1-4:
+            - release-1-5:
                 capi_version: v1beta1
                 capm3_version: v1beta1
-                capm3_release_branch: release-1.4
+                capm3_release_branch: release-1.5
                 schedule: "30 4 * * *"
       - capm3_main_e2e_feature_tests:
           capm3_target_branch:
@@ -549,6 +549,12 @@
                 capm3_branch: main
                 capm3_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
+                schedule: "H 11 * * *"
             - release-1-4:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -561,12 +567,6 @@
                 capm3_branch: release-1.3
                 capm3_release_branch: release-1.3
                 schedule: "H 8 * * *"
-            - release-1-2:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                capm3_branch: release-1.2
-                capm3_release_branch: release-1.2
-                schedule: "H 11 * * *"
 
 - project:
     name: 'ironic_image_build_tests'