From efabae080907212af2fdc470a6f5671396d8aeb5 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 | 747 +++++++--------------
 2 files changed, 256 insertions(+), 499 deletions(-)

diff --git a/jenkins/README.md b/jenkins/README.md
index c272fa3f..6e6fd3bc 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 f57262ec..a9a5adf5 100644
--- a/prow/manifests/overlays/metal3/config.yaml
+++ b/prow/manifests/overlays/metal3/config.yaml
@@ -138,6 +138,7 @@ branch-protection:
                 contexts:
                   [
                     "test-centos-integration-release-1-6",
+                    "test-centos-integration-release-1-7"
                   ]
 
 deck:
@@ -627,6 +628,7 @@ presubmits:
             imagePullPolicy: Always
     - name: test
       branches:
+        - release-0.6
         - release-0.5
       run_if_changed: "^(Makefile|hack/.*)$"
       decorate: true
@@ -658,6 +660,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
@@ -667,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
@@ -679,6 +683,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
@@ -691,6 +701,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
@@ -704,6 +720,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
@@ -716,18 +738,18 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-centos-e2e-integration-test-release-1-4
+    - name: metal3-ubuntu-e2e-integration-test-main
       branches:
-        - release-0.3
+        - main
       agent: jenkins
       always_run: false
       optional: false
-    - name: metal3-ubuntu-e2e-integration-test-main
+    - name: metal3-ubuntu-e2e-integration-test-release-1-7
       branches:
-        - main
+        - release-0.6
       agent: jenkins
       always_run: false
-      optional: false
+      optional: true
     - name: metal3-ubuntu-e2e-integration-test-release-1-6
       branches:
         - release-0.5
@@ -740,16 +762,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
@@ -765,15 +787,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
@@ -789,16 +811,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
@@ -814,12 +836,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:
@@ -839,66 +855,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
@@ -906,14 +913,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
@@ -922,10 +921,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:
@@ -945,8 +940,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:
@@ -960,22 +956,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:
@@ -992,8 +972,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:
@@ -1004,22 +985,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
@@ -1038,9 +1003,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:
@@ -1086,8 +1051,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:
@@ -1101,22 +1067,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
@@ -1135,8 +1085,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:
@@ -1150,22 +1101,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
@@ -1200,8 +1135,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:
@@ -1215,22 +1151,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:
@@ -1238,6 +1158,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
@@ -1250,6 +1176,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
@@ -1263,21 +1195,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
@@ -1287,6 +1219,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
@@ -1299,12 +1237,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:
@@ -1312,6 +1244,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
@@ -1324,15 +1262,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
@@ -1348,16 +1286,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
@@ -1373,12 +1311,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:
@@ -1398,66 +1330,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
@@ -1465,14 +1388,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
@@ -1481,10 +1396,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)$'
@@ -1549,6 +1460,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
@@ -1557,6 +1472,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
@@ -1566,6 +1485,10 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
+    - 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
@@ -1574,11 +1497,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
@@ -1590,147 +1513,106 @@ presubmits:
       agent: jenkins
       always_run: false
       optional: true
-    - name: metal3-ubuntu-e2e-integration-test-release-1-4
-      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
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-5
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-centos-e2e-feature-test-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-feature-test-main
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-6
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-5
-      agent: jenkins
-      always_run: false
-      optional: true
-    - name: metal3-ubuntu-e2e-feature-test-release-1-4
-      agent: jenkins
-      always_run: false
-      optional: true
-    # 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-clusterctl-upgrade-test-release-1-6
+    - 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
@@ -1785,6 +1667,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
@@ -1793,6 +1679,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
@@ -1802,6 +1692,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
@@ -1810,11 +1704,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
@@ -1826,12 +1720,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
@@ -1843,11 +1737,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
@@ -1859,12 +1753,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
@@ -1876,28 +1770,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
@@ -1925,51 +1819,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)$'
@@ -2033,8 +1886,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:
@@ -2048,22 +1902,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:
@@ -2080,8 +1918,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:
@@ -2092,22 +1931,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
@@ -2127,9 +1950,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:
@@ -2173,8 +1996,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:
@@ -2187,21 +2011,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
@@ -2220,8 +2029,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:
@@ -2235,22 +2045,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
@@ -2274,6 +2068,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
@@ -2286,6 +2084,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
@@ -2299,6 +2101,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
@@ -2311,15 +2117,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
@@ -2335,16 +2137,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
@@ -2360,15 +2158,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
@@ -2384,16 +2178,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
@@ -2409,12 +2199,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:
@@ -2434,6 +2218,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
@@ -2470,45 +2266,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
@@ -2517,10 +2278,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)$'
@@ -2672,24 +2429,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
@@ -2697,24 +2454,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)$'