From 2af4dddd0f6c39fd500c28cb132f1dff745b7a9c Mon Sep 17 00:00:00 2001
From: adil ghaffar <muhammad.adil.ghaffar@est.tech>
Date: Fri, 12 Apr 2024 15:54:45 +0300
Subject: [PATCH] Update for CAPM3 and IPAM release-1.7 and BMO 0.6.0

Signed-off-by: adil ghaffar <muhammad.adil.ghaffar@est.tech>
---
 jenkins/README.md                          |   8 +-
 prow/manifests/overlays/metal3/config.yaml | 755 +++++++--------------
 2 files changed, 260 insertions(+), 503 deletions(-)

diff --git a/jenkins/README.md b/jenkins/README.md
index c272fa3f4..6e6fd3bcf 100644
--- a/jenkins/README.md
+++ b/jenkins/README.md
@@ -27,6 +27,10 @@ the commands below. The job result will be posted as a comment.
   v1beta1 and branch main on Ubuntu
 * **/test-centos-integration-main** run integration tests with CAPM3 API version
   v1beta1 and branch main on CentOS
+* **/test-ubuntu-integration-release-1-7** run integration tests with CAPM3 API
+  version v1beta1 and branch release-1.7 on Ubuntu
+* **/test-centos-integration-release-1-7** run integration tests with CAPM3 API
+  version v1beta1 and branch release-1.7 on CentOS
 * **/test-ubuntu-integration-release-1-6** run integration tests with CAPM3 API
   version v1beta1 and branch release-1.6 on Ubuntu
 * **/test-centos-integration-release-1-6** run integration tests with CAPM3 API
@@ -35,10 +39,6 @@ the commands below. The job result will be posted as a comment.
   version v1beta1 and branch release-1.5 on Ubuntu
 * **/test-centos-integration-release-1-5** run integration tests with CAPM3 API
   version v1beta1 and branch release-1.5 on CentOS
-* **/test-ubuntu-integration-release-1-4** run integration tests with CAPM3 API
-  version v1beta1 and branch release-1.4 on Ubuntu
-* **/test-centos-integration-release-1-4** run integration tests with CAPM3 API
-  version v1beta1 and branch release-1.4 on CentOS
 
 ### E2E tests
 
diff --git a/prow/manifests/overlays/metal3/config.yaml b/prow/manifests/overlays/metal3/config.yaml
index 24e7f3b24..4a6444169 100644
--- a/prow/manifests/overlays/metal3/config.yaml
+++ b/prow/manifests/overlays/metal3/config.yaml
@@ -148,6 +148,7 @@ branch-protection:
                 contexts:
                   [
                     "test-centos-integration-release-1-6",
+                    "test-centos-integration-release-1-7"
                   ]
 
 deck:
@@ -637,6 +638,7 @@ presubmits:
             imagePullPolicy: Always
     - name: test
       branches:
+        - release-0.6
         - release-0.5
       run_if_changed: "^(Makefile|hack/.*)$"
       decorate: true
@@ -668,6 +670,7 @@ presubmits:
       # E2e tests do not exist before release-0.5
       branches:
         - main
+        - release-0.6
         - release-0.5
       agent: jenkins
       # Don't run unless triggered to avoid wasting resources
@@ -677,6 +680,7 @@ presubmits:
       # E2e tests do not exist before release-0.5
       branches:
         - main
+        - release-0.6
         - release-0.5
       agent: jenkins
       # Don't run unless triggered to avoid wasting resources
@@ -689,6 +693,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-centos-e2e-basic-test-release-1-7
+      branches:
+        - release-0.6
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-basic-test-release-1-6
       branches:
         - release-0.5
@@ -701,6 +711,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-ubuntu-e2e-basic-test-release-1-7
+      branches:
+        - release-0.6
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-ubuntu-e2e-basic-test-release-1-6
       branches:
         - release-0.5
@@ -714,6 +730,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
+    - name: metal3-centos-e2e-integration-test-release-1-7
+      branches:
+        - release-0.6
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-integration-test-release-1-6
       branches:
         - release-0.5
@@ -726,18 +748,18 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-centos-e2e-integration-test-release-1-4
-      branches:
-        - release-0.3
-      agent: jenkins
-      always_run: false
-      optional: true
     - name: metal3-ubuntu-e2e-integration-test-main
       branches:
         - main
       agent: jenkins
       always_run: false
       optional: false
+    - name: metal3-ubuntu-e2e-integration-test-release-1-7
+      branches:
+        - release-0.6
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-ubuntu-e2e-integration-test-release-1-6
       branches:
         - release-0.5
@@ -750,16 +772,16 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-integration-test-release-1-4
+    # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
+    - name: metal3-centos-e2e-feature-test-main
       branches:
-        - release-0.3
+        - main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
-    - name: metal3-centos-e2e-feature-test-main
+    - name: metal3-centos-e2e-feature-test-release-1-7
       branches:
-        - main
+        - release-0.6
       agent: jenkins
       always_run: false
       optional: true
@@ -775,15 +797,15 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-4
+    - name: metal3-ubuntu-e2e-feature-test-main
       branches:
-        - release-0.3
+        - main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-main
+    - name: metal3-ubuntu-e2e-feature-test-release-1-7
       branches:
-        - main
+        - release-0.6
       agent: jenkins
       always_run: false
       optional: true
@@ -799,16 +821,16 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-4
+    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
+    - name: metal3-e2e-clusterctl-upgrade-test-main
       branches:
-        - release-0.3
+        - main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
-    - name: metal3-e2e-clusterctl-upgrade-test-main
+    - name: metal3-e2e-clusterctl-upgrade-test-release-1-7
       branches:
-        - main
+        - release-0.6
       agent: jenkins
       always_run: false
       optional: true
@@ -824,12 +846,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-4
-      branches:
-        - release-0.3
-      agent: jenkins
-      always_run: false
-      optional: true
     # name: {job_prefix}-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}
     - name: metal3-e2e-1-28-1-29-upgrade-test-main
       branches:
@@ -849,66 +865,57 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-6
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-7
       branches:
-        - release-0.5
+        - release-0.6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-6
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-7
       branches:
-        - release-0.5
+        - release-0.6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-6
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-7
       branches:
-        - release-0.5
+        - release-0.6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-5
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-6
       branches:
-        - release-0.4
+        - release-0.5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-5
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-6
       branches:
-        - release-0.4
+        - release-0.5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-5
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-6
       branches:
-        - release-0.4
+        - release-0.5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-4
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-5
       branches:
-        - release-0.3
+        - release-0.4
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-4
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-5
       branches:
-        - release-0.3
+        - release-0.4
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-4
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-5
       branches:
-        - release-0.3
-      agent: jenkins
-      always_run: false
-      optional: true
-    # name: dev-env-integration-test-{image_os}-{capm3_target_branch}
-    - name: dev-env-integration-test-centos-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-centos-release-1-6
+        - release-0.4
       agent: jenkins
       always_run: false
       optional: true
@@ -916,14 +923,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-centos-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-ubuntu-main
-      agent: jenkins
-      always_run: false
-      optional: true
     - name: dev-env-integration-test-ubuntu-release-1-6
       agent: jenkins
       always_run: false
@@ -932,10 +931,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
   metal3-io/cluster-api-provider-metal3:
     - name: gomod
       branches:
@@ -955,8 +950,9 @@ presubmits:
             imagePullPolicy: Always
     - name: gomod
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -970,22 +966,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: gomod
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gomod.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     # NOTE: The test jobs are for verifying Makefile and hack/* script changes only
     - name: test
       branches:
@@ -1002,8 +982,9 @@ presubmits:
             imagePullPolicy: Always
     - name: test
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       run_if_changed: "^(Makefile|hack/.*)$"
       decorate: true
       spec:
@@ -1014,22 +995,6 @@ presubmits:
               - make
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: golangci-lint
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/ensure-golangci-lint.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: markdownlint
       branches:
         - main
@@ -1048,9 +1013,9 @@ presubmits:
             imagePullPolicy: Always
     - name: markdownlint
       branches:
+        - release-1.7
         - release-1.6
         - release-1.5
-        - release-1.4
       run_if_changed: '(\.md|markdownlint\.sh)$'
       decorate: true
       spec:
@@ -1096,8 +1061,9 @@ presubmits:
             imagePullPolicy: Always
     - name: generate
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -1111,22 +1077,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: generate
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/codegen.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: unit
       branches:
         - main
@@ -1145,8 +1095,9 @@ presubmits:
             imagePullPolicy: Always
     - name: unit
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -1160,22 +1111,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: unit
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/unit.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: manifestlint
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
@@ -1210,8 +1145,9 @@ presubmits:
             imagePullPolicy: Always
     - name: build
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       run_if_changed: "^api|^test|^Makefile$"
       decorate: true
       spec:
@@ -1225,22 +1161,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: build
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/build.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     # name: {job_prefix}-{image_os}-e2e-basic-test-{capm3_target_branch}
     - name: metal3-centos-e2e-basic-test-main
       branches:
@@ -1248,6 +1168,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-centos-e2e-basic-test-release-1-7
+      branches:
+        - release-1.7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-basic-test-release-1-6
       branches:
         - release-1.6
@@ -1260,6 +1186,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-ubuntu-e2e-basic-test-release-1-7
+      branches:
+        - release-1.7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-ubuntu-e2e-basic-test-release-1-6
       branches:
         - release-1.6
@@ -1273,21 +1205,21 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-centos-e2e-integration-test-release-1-6
+    - name: metal3-centos-e2e-integration-test-release-1-7
       branches:
-        - release-1.6
+        - release-1.7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-integration-test-release-1-5
+    - name: metal3-centos-e2e-integration-test-release-1-6
       branches:
-        - release-1.5
+        - release-1.6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-integration-test-release-1-4
+    - name: metal3-centos-e2e-integration-test-release-1-5
       branches:
-        - release-1.4
+        - release-1.5
       agent: jenkins
       always_run: false
       optional: true
@@ -1297,6 +1229,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
+    - name: metal3-ubuntu-e2e-integration-test-release-1-7
+      branches:
+        - release-1.7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-ubuntu-e2e-integration-test-release-1-6
       branches:
         - release-1.6
@@ -1309,12 +1247,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-ubuntu-e2e-integration-test-release-1-4
-      branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: false
     # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
     - name: metal3-centos-e2e-feature-test-main
       branches:
@@ -1322,6 +1254,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-centos-e2e-feature-test-release-1-7
+      branches:
+        - release-1.7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-feature-test-release-1-6
       branches:
         - release-1.6
@@ -1334,15 +1272,15 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-4
+    - name: metal3-ubuntu-e2e-feature-test-main
       branches:
-        - release-1.4
+        - main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-main
+    - name: metal3-ubuntu-e2e-feature-test-release-1-7
       branches:
-        - main
+        - release-1.7
       agent: jenkins
       always_run: false
       optional: true
@@ -1358,16 +1296,16 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-4
+    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
+    - name: metal3-e2e-clusterctl-upgrade-test-main
       branches:
-        - release-1.4
+        - main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
-    - name: metal3-e2e-clusterctl-upgrade-test-main
+    - name: metal3-e2e-clusterctl-upgrade-test-release-1-7
       branches:
-        - main
+        - release-1.7
       agent: jenkins
       always_run: false
       optional: true
@@ -1383,12 +1321,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-4
-      branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: true
     # name: {job_prefix}-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}
     - name: metal3-e2e-1-28-1-29-upgrade-test-main
       branches:
@@ -1408,66 +1340,57 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-6
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-7
       branches:
-        - release-1.6
+        - release-1.7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-6
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-7
       branches:
-        - release-1.6
+        - release-1.7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-6
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-7
       branches:
-        - release-1.6
+        - release-1.7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-5
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-6
       branches:
-        - release-1.5
+        - release-1.6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-5
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-6
       branches:
-        - release-1.5
+        - release-1.6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-5
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-6
       branches:
-        - release-1.5
+        - release-1.6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-4
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-5
       branches:
-        - release-1.4
+        - release-1.5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-4
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-5
       branches:
-        - release-1.4
+        - release-1.5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-4
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-5
       branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: true
-    # name: dev-env-integration-test-{image_os}-{capm3_target_branch}
-    - name: dev-env-integration-test-centos-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-centos-release-1-6
+        - release-1.5
       agent: jenkins
       always_run: false
       optional: true
@@ -1475,14 +1398,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-centos-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-ubuntu-main
-      agent: jenkins
-      always_run: false
-      optional: true
     - name: dev-env-integration-test-ubuntu-release-1-6
       agent: jenkins
       always_run: false
@@ -1491,10 +1406,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
   metal3-io/community:
     - name: markdownlint
       run_if_changed: '(\.md|markdownlint\.sh)$'
@@ -1559,188 +1470,159 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-basic-test-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-basic-test-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-basic-test-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: true
-    # name: {job_prefix}-{image_os}-e2e-integration-test-{capm3_target_branch}
-    - name: metal3-centos-e2e-integration-test-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-centos-e2e-integration-test-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: false
-    - name: metal3-centos-e2e-integration-test-release-1-5
+    - name: metal3-centos-e2e-basic-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-integration-test-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-integration-test-main
-      agent: jenkins
-      always_run: false
-      optional: false
-    - name: metal3-ubuntu-e2e-integration-test-release-1-6
+    - name: metal3-centos-e2e-basic-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-integration-test-release-1-5
+    - name: metal3-ubuntu-e2e-basic-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-integration-test-release-1-4
+    - name: metal3-ubuntu-e2e-basic-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
-    - name: metal3-centos-e2e-feature-test-main
+    - name: metal3-ubuntu-e2e-basic-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-6
+    # name: {job_prefix}-{image_os}-e2e-integration-test-{capm3_target_branch}
+    - name: metal3-centos-e2e-integration-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-5
+    - name: metal3-centos-e2e-integration-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-4
+    - name: metal3-centos-e2e-integration-test-release-1-6
       agent: jenkins
       always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-feature-test-main
+      optional: false
+    - name: metal3-centos-e2e-integration-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-6
+    - name: metal3-ubuntu-e2e-integration-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-5
+    - name: metal3-ubuntu-e2e-integration-test-release-1-7
       agent: jenkins
       always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-4
+      optional: false
+    - name: metal3-ubuntu-e2e-integration-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
-    - name: metal3-e2e-clusterctl-upgrade-test-main
+    - name: metal3-ubuntu-e2e-integration-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-6
+    # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
+    - name: metal3-centos-e2e-feature-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-5
+    - name: metal3-centos-e2e-feature-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-4
+    - name: metal3-centos-e2e-feature-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-3
+    - name: metal3-centos-e2e-feature-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-0-5
+    - name: metal3-ubuntu-e2e-feature-test-main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}
-    - name: metal3-e2e-1-28-1-29-upgrade-test-main
+    - name: metal3-ubuntu-e2e-feature-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-main
+    - name: metal3-ubuntu-e2e-feature-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-main
+    - name: metal3-ubuntu-e2e-feature-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-6
+    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
+    - name: metal3-e2e-clusterctl-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-6
+    - name: metal3-e2e-clusterctl-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-6
+    - name: metal3-e2e-clusterctl-upgrade-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-5
+    - name: metal3-e2e-clusterctl-upgrade-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-5
+    # name: {job_prefix}-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}
+    - name: metal3-e2e-1-28-1-29-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-5
+    - name: metal3-e2e-1-27-1-28-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-4
+    - name: metal3-e2e-1-26-1-27-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-4
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-4
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    # name: dev-env-integration-test-{image_os}-{capm3_target_branch}
-    - name: dev-env-integration-test-centos-main
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-centos-release-1-6
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-centos-release-1-5
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-centos-release-1-4
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-6
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-ubuntu-main
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-6
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-5
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-4
+    - name: dev-env-integration-test-centos-release-1-5
       agent: jenkins
       always_run: false
       optional: true
@@ -1795,6 +1677,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-centos-e2e-basic-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-basic-test-release-1-6
       agent: jenkins
       always_run: false
@@ -1803,6 +1689,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-ubuntu-e2e-basic-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-ubuntu-e2e-basic-test-release-1-6
       agent: jenkins
       always_run: false
@@ -1812,6 +1702,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
+    - name: metal3-centos-e2e-integration-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-integration-test-release-1-6
       agent: jenkins
       always_run: false
@@ -1820,11 +1714,11 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-integration-test-release-1-4
+    - name: metal3-ubuntu-e2e-integration-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-integration-test-main
+    - name: metal3-ubuntu-e2e-integration-test-release-1-7
       agent: jenkins
       always_run: false
       optional: false
@@ -1836,12 +1730,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-integration-test-release-1-4
+    # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
+    - name: metal3-centos-e2e-feature-test-main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
-    - name: metal3-centos-e2e-feature-test-main
+    - name: metal3-centos-e2e-feature-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
@@ -1853,11 +1747,11 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-4
+    - name: metal3-ubuntu-e2e-feature-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-main
+    - name: metal3-ubuntu-e2e-feature-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
@@ -1869,12 +1763,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-4
+    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
+    - name: metal3-e2e-clusterctl-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
-    - name: metal3-e2e-clusterctl-upgrade-test-main
+    - name: metal3-e2e-clusterctl-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
@@ -1886,28 +1780,28 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-4
+    # name: {job_prefix}-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}
+    - name: metal3-e2e-1-28-1-29-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-3
+    - name: metal3-e2e-1-27-1-28-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-0-5
+    - name: metal3-e2e-1-26-1-27-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}
-    - name: metal3-e2e-1-28-1-29-upgrade-test-main
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-main
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-main
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
@@ -1935,51 +1829,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    # name: dev-env-integration-test-{image_os}-{capm3_target_branch}
-    - name: dev-env-integration-test-centos-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-centos-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: true
     - name: dev-env-integration-test-centos-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-centos-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-ubuntu-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-5
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
   metal3-io/metal3-docs:
     - name: markdownlint
       run_if_changed: '(\.md|markdownlint\.sh)$'
@@ -2043,8 +1896,9 @@ presubmits:
             imagePullPolicy: Always
     - name: gomod
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -2058,22 +1912,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: gomod
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gomod.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     # NOTE: The test jobs are for verifying the Makefile and hack/* scripts only
     - name: test
       branches:
@@ -2090,8 +1928,9 @@ presubmits:
             imagePullPolicy: Always
     - name: test
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       run_if_changed: "^(Makefile|hack/.*)$"
       decorate: true
       spec:
@@ -2102,22 +1941,6 @@ presubmits:
               - make
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: golangci-lint
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/ensure-golangci-lint.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: markdownlint
       branches:
         - main
@@ -2137,9 +1960,9 @@ presubmits:
     - name: markdownlint
       run_if_changed: '(\.md|markdownlint\.sh)$'
       branches:
+        - release-1.7
         - release-1.6
         - release-1.5
-        - release-1.4
       decorate: true
       spec:
         containers:
@@ -2183,8 +2006,9 @@ presubmits:
             image: docker.io/golang:1.21
     - name: unit
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -2197,21 +2021,6 @@ presubmits:
               - name: IS_CONTAINER
                 value: "TRUE"
             image: docker.io/golang:1.20
-    - name: unit
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/unit.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
     - name: generate
       branches:
         - main
@@ -2230,8 +2039,9 @@ presubmits:
             imagePullPolicy: Always
     - name: generate
       branches:
-        - release-1.5
+        - release-1.7
         - release-1.6
+        - release-1.5
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -2245,22 +2055,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: generate
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/codegen.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: manifestlint
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
@@ -2284,6 +2078,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-centos-e2e-basic-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-basic-test-release-1-6
       branches:
         - release-1.6
@@ -2296,6 +2094,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-ubuntu-e2e-basic-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-ubuntu-e2e-basic-test-release-1-6
       branches:
         - release-1.6
@@ -2309,6 +2111,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
+    - name: metal3-centos-e2e-integration-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-centos-e2e-integration-test-release-1-6
       branches:
         - release-1.6
@@ -2321,15 +2127,11 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-integration-test-release-1-4
-      branches:
-        - release-1.4
+    - name: metal3-ubuntu-e2e-integration-test-main
       agent: jenkins
       always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-integration-test-main
-      branches:
-        - main
+      optional: false
+    - name: metal3-ubuntu-e2e-integration-test-release-1-7
       agent: jenkins
       always_run: false
       optional: false
@@ -2345,16 +2147,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-ubuntu-e2e-integration-test-release-1-4
-      branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: false
     # name: {job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}
     - name: metal3-centos-e2e-feature-test-main
-      branches:
-        - main
+      agent: jenkins
+      always_run: false
+      optional: true
+    - name: metal3-centos-e2e-feature-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
@@ -2370,15 +2168,11 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-4
-      branches:
-        - release-1.4
+    - name: metal3-ubuntu-e2e-feature-test-main
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-main
-      branches:
-        - main
+    - name: metal3-ubuntu-e2e-feature-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
@@ -2394,16 +2188,12 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-4
-      branches:
-        - release-1.4
+    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
+    - name: metal3-e2e-clusterctl-upgrade-test-main
       agent: jenkins
       always_run: false
       optional: true
-    # name: {job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}
-    - name: metal3-e2e-clusterctl-upgrade-test-main
-      branches:
-        - main
+    - name: metal3-e2e-clusterctl-upgrade-test-release-1-7
       agent: jenkins
       always_run: false
       optional: true
@@ -2419,12 +2209,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-clusterctl-upgrade-test-release-1-4
-      branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: true
     # name: {job_prefix}-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}
     - name: metal3-e2e-1-28-1-29-upgrade-test-main
       branches:
@@ -2444,6 +2228,18 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
+    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
+    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-7
+      agent: jenkins
+      always_run: false
+      optional: true
     - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-6
       branches:
         - release-1.6
@@ -2480,45 +2276,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-e2e-1-28-1-29-upgrade-test-release-1-4
-      branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-e2e-1-27-1-28-upgrade-test-release-1-4
-      branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-e2e-1-26-1-27-upgrade-test-release-1-4
-      branches:
-        - release-1.4
-      agent: jenkins
-      always_run: false
-      optional: true
-    # name: dev-env-integration-test-{image_os}-{capm3_target_branch}
-    - name: dev-env-integration-test-centos-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-centos-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: true
     - name: dev-env-integration-test-centos-release-1-5
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-centos-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: dev-env-integration-test-ubuntu-main
-      agent: jenkins
-      always_run: false
-      optional: true
     - name: dev-env-integration-test-ubuntu-release-1-6
       agent: jenkins
       always_run: false
@@ -2527,10 +2288,6 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: dev-env-integration-test-ubuntu-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
   metal3-io/ironic-ipa-downloader:
     - name: shellcheck
       run_if_changed: '((\.sh)|^Makefile)$'
@@ -2648,24 +2405,24 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-centos-e2e-integration-test-release-1-6
+    - name: metal3-centos-e2e-integration-test-release-1-7
       branches:
         - release-24.0
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-centos-e2e-integration-test-release-1-5
+    - name: metal3-centos-e2e-integration-test-release-1-6
       branches:
-        - release-23.1
+        - release-24.0
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-centos-e2e-integration-test-release-1-4
+    - name: metal3-centos-e2e-integration-test-release-1-5
       branches:
         - release-23.1
       agent: jenkins
       always_run: false
-      optional: true
+      optional: false
     - name: metal3-ubuntu-e2e-integration-test-main
       branches:
         - main
@@ -2673,24 +2430,24 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-ubuntu-e2e-integration-test-release-1-6
+    - name: metal3-ubuntu-e2e-integration-test-release-1-7
       branches:
         - release-24.0
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-ubuntu-e2e-integration-test-release-1-5
+    - name: metal3-ubuntu-e2e-integration-test-release-1-6
       branches:
-        - release-23.1
+        - release-24.0
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-ubuntu-e2e-integration-test-release-1-4
+    - name: metal3-ubuntu-e2e-integration-test-release-1-5
       branches:
         - release-23.1
       agent: jenkins
       always_run: false
-      optional: true
+      optional: false
   metal3-io/mariadb-image:
     - name: shellcheck
       run_if_changed: '((\.sh)|^Makefile)$'