X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=f642d55a9148c42c007d671271868fb4e2f6820a;hb=d3a335b11f4033f6dafa796f207b9b0c33b3b608;hp=334329524255184c65ef83a4013e12b9fac96ccd;hpb=3a9f12f976423277e04a94686a1321ae1d5d5f3a;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 33432952..f642d55a 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -26,6 +26,8 @@
 # jobs associated with that github repository. The job definitions can be found
 # in job_{job_id}.yml files in any of JJB include folders.
 
+# NOTE: kubectl_sha256 needs to match the kubernetes_version_from version
+
 - project:
     name: 'nordix_dev_tools'
     branch: '${{ghprbActualCommit}}'
@@ -90,6 +92,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 +113,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 +144,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 +165,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 +183,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 +198,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,21 +246,30 @@
     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:
             - image_os: centos
       - capm3_e2e_k8s_upgrade_tests:
           k8s_versions:
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
+                capm3_release_branch: main
+                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
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches:
@@ -266,20 +277,23 @@
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 k8s_version_upgrade_to: v1.26.4
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
-            - 1-24-1-25:
-                k8s_version_upgrade_from: v1.24.9
-                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
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
+                capm3_release_branch: release-1.5
+                capm3_target_branch: release-1-5
                 target_branches:
-                  - 'main'
+                  - 'release-1.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
                 target_branches:
@@ -287,17 +301,11 @@
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 k8s_version_upgrade_to: v1.26.4
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 capm3_release_branch: release-1.3
                 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,6 +316,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
@@ -323,13 +338,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 +353,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 +371,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 +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_basic_tests:
           capm3_target_branch:
             - main:
@@ -379,13 +394,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 +409,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,29 +427,32 @@
                 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:
             - image_os: centos
       - keep_capm3_e2e_k8s_upgrade_tests:
           k8s_versions:
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
+                capm3_release_branch: main
+                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
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches:
@@ -436,20 +460,23 @@
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 k8s_version_upgrade_to: v1.26.4
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
-            - 1-24-1-25:
-                k8s_version_upgrade_from: v1.24.9
-                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
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
+                capm3_release_branch: release-1.5
+                capm3_target_branch: release-1-5
                 target_branches:
-                  - 'main'
+                  - 'release-1.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
                 k8s_version_upgrade_to: v1.27.4
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
                 target_branches:
@@ -457,17 +484,11 @@
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 k8s_version_upgrade_to: v1.26.4
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 capm3_release_branch: release-1.3
                 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,48 +503,56 @@
     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:
             - image_os: centos
       - capm3_main_e2e_k8s_upgrade_tests:
           k8s_versions:
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
+                capm3_release_branch: main
+                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
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_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: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 capm3_release_branch: main
                 capm3_target_branch: main
-            - 1-24-1-25:
-                k8s_version_upgrade_from: v1.24.9
-                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
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.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
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 k8s_version_upgrade_to: v1.26.4
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 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 +565,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 +578,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 +596,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'