From 5055d6112b2febfb420490b4223a59a478744a38 Mon Sep 17 00:00:00 2001
From: Petr Muller <afri@afri.cz>
Date: Wed, 30 Jun 2021 14:36:23 +0200
Subject: [PATCH 1/3] 4.10: Add BZ validation stanzas

We apparently forgot to create these on the last cut, so adding the 4.9 one too
---
 core-services/prow/02_config/_plugins.yaml | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/core-services/prow/02_config/_plugins.yaml b/core-services/prow/02_config/_plugins.yaml
index 68ca13eca022a..9f3c719ff4ff6 100644
--- a/core-services/prow/02_config/_plugins.yaml
+++ b/core-services/prow/02_config/_plugins.yaml
@@ -142,6 +142,24 @@ bugzilla:
       - 4.9.0
       target_release: 4.8.0
       validate_by_default: true
+    openshift-4.9:
+      dependent_bug_states:
+      - status: MODIFIED
+      - status: ON_QA
+      - status: VERIFIED
+      dependent_bug_target_releases:
+      - 4.10.0
+      target_release: 4.9.0
+      validate_by_default: true
+    openshift-4.10:
+      dependent_bug_states:
+      - status: MODIFIED
+      - status: ON_QA
+      - status: VERIFIED
+      dependent_bug_target_releases:
+      - 4.11.0
+      target_release: 4.10.0
+      validate_by_default: true
     release-3.11:
       add_external_link: true
       allowed_groups:
@@ -212,6 +230,24 @@ bugzilla:
       - 4.9.0
       target_release: 4.8.0
       validate_by_default: true
+    release-4.9:
+      dependent_bug_states:
+      - status: MODIFIED
+      - status: ON_QA
+      - status: VERIFIED
+      dependent_bug_target_releases:
+      - 4.10.0
+      target_release: 4.9.0
+      validate_by_default: true
+    release-4.10:
+      dependent_bug_states:
+      - status: MODIFIED
+      - status: ON_QA
+      - status: VERIFIED
+      dependent_bug_target_releases:
+      - 4.11.0
+      target_release: 4.10.0
+      validate_by_default: true
 cat: {}
 cherry_pick_unapproved:
   branchregexp: ^release-.*$

From afeb49ff9becf743cc6090e37ac5042c63b726e9 Mon Sep 17 00:00:00 2001
From: Petr Muller <afri@afri.cz>
Date: Wed, 30 Jun 2021 14:44:47 +0200
Subject: [PATCH 2/3] 4.10: Create config_updater patterns

I needed to tighten the 4.1 ones so that 4.10 and 4.1 do not interfere with each other
---
 core-services/prow/02_config/_plugins.yaml | 32 +++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/core-services/prow/02_config/_plugins.yaml b/core-services/prow/02_config/_plugins.yaml
index 9f3c719ff4ff6..e7145f7b5f782 100644
--- a/core-services/prow/02_config/_plugins.yaml
+++ b/core-services/prow/02_config/_plugins.yaml
@@ -316,7 +316,7 @@ config_updater:
         - ci
       gzip: true
       name: ci-operator-3.x-configs
-    ci-operator/config/**/*openshift-4.1*.yaml:
+    ci-operator/config/**/*openshift-4.1.yaml:
       clusters:
         app.ci:
         - ci
@@ -370,6 +370,12 @@ config_updater:
         - ci
       gzip: true
       name: ci-operator-4.9-configs
+    ci-operator/config/**/*openshift-4.10*.yaml:
+      clusters:
+        app.ci:
+        - ci
+      gzip: true
+      name: ci-operator-4.10-configs
     ci-operator/config/**/*openshift-v4*.yaml:
       clusters:
         app.ci:
@@ -400,7 +406,7 @@ config_updater:
         - ci
       gzip: true
       name: ci-operator-3.x-configs
-    ci-operator/config/**/*release-4.1*.yaml:
+    ci-operator/config/**/*release-4.1.yaml:
       clusters:
         app.ci:
         - ci
@@ -454,6 +460,12 @@ config_updater:
         - ci
       gzip: true
       name: ci-operator-4.9-configs
+    ci-operator/config/**/*release-4.10*.yaml:
+      clusters:
+        app.ci:
+        - ci
+      gzip: true
+      name: ci-operator-4.10-configs
     ci-operator/config/**/*release-next*.yaml:
       clusters:
         app.ci:
@@ -760,7 +772,7 @@ config_updater:
         - ci
       gzip: true
       name: job-config-3.x
-    ci-operator/jobs/**/*openshift-4.1*.yaml:
+    ci-operator/jobs/**/*openshift-4.1-*.yaml:
       clusters:
         app.ci:
         - ci
@@ -814,6 +826,12 @@ config_updater:
         - ci
       gzip: true
       name: job-config-4.9
+    ci-operator/jobs/**/*openshift-4.10*.yaml:
+      clusters:
+        app.ci:
+        - ci
+      gzip: true
+      name: job-config-4.10
     ci-operator/jobs/**/*openshift-v4*.yaml:
       clusters:
         app.ci:
@@ -844,7 +862,7 @@ config_updater:
         - ci
       gzip: true
       name: job-config-3.x
-    ci-operator/jobs/**/*release-4.1*.yaml:
+    ci-operator/jobs/**/*release-4.1-*.yaml:
       clusters:
         app.ci:
         - ci
@@ -898,6 +916,12 @@ config_updater:
         - ci
       gzip: true
       name: job-config-4.9
+    ci-operator/jobs/**/*release-4.10*.yaml:
+      clusters:
+        app.ci:
+        - ci
+      gzip: true
+      name: job-config-4.10
     ci-operator/jobs/**/*release-next*.yaml:
       clusters:
         app.ci:

From 0500eec2c5550c40aa8da1528db4437e0d8c5db0 Mon Sep 17 00:00:00 2001
From: Petr Muller <afri@afri.cz>
Date: Wed, 30 Jun 2021 14:45:55 +0200
Subject: [PATCH 3/3] 4.10: Start maintaining 4.10 merge blockers

---
 ci-operator/jobs/infra-periodics.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci-operator/jobs/infra-periodics.yaml b/ci-operator/jobs/infra-periodics.yaml
index d36164af8f307..38306360b01ba 100644
--- a/ci-operator/jobs/infra-periodics.yaml
+++ b/ci-operator/jobs/infra-periodics.yaml
@@ -1319,6 +1319,7 @@ periodics:
       - --config-dir=./ci-operator/config/
       - --current-release=4.9
       - --future-release=4.9
+      - --future-release=4.10
       - --github-token-path=/etc/github/oauth
       command:
       - blocking-issue-creator