From e6b339e3012539a8690164b5a5efb5f0018031f3 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 21 Jun 2021 12:23:14 -0700
Subject: [PATCH] ci-operator/jobs/openshift/cluster-version-operator: Metal
 optional on 4.8 and 4.9

Just like we did for 4.7 in 23982da755
(ci-operator/jobs/openshift/cluster-version-operator: Metal optional
on 4.7, 2021-03-26, #17203), but now for 4.8 and 4.9.  Using the
previous procedure on the new releases:

  $ disp() {
  >   yaml2json < "ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-${1}" | jq -r '.presubmits | to_entries[].value[] | .context + " " + (.always_run | tostring) + " " + (.optional // "-" | tostring)' | sort
  > }
  $ diff -U0 <(disp master-presubmits.yaml) <(disp release-4.8-presubmits.yaml)
  --- /dev/fd/63  2021-06-21 12:20:23.738355653 -0700
  +++ /dev/fd/62  2021-06-21 12:20:23.739355653 -0700
  @@ -4 +4 @@
  -ci/prow/e2e-metal-assisted false true
  +ci/prow/e2e-metal-assisted true -

And similarly for 4.9, but this commit fixes both.
---
 ...nshift-cluster-version-operator-release-4.8-presubmits.yaml | 3 ++-
 ...nshift-cluster-version-operator-release-4.9-presubmits.yaml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml
index 0647c033f0762..a5eb7237dc29c 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml
@@ -199,7 +199,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.8
     cluster: build01
@@ -211,6 +211,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.8-e2e-metal-assisted
+    optional: true
     rerun_command: /test e2e-metal-assisted
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml
index 5fe9054ba3b49..b4737e625701f 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml
@@ -193,7 +193,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -203,6 +203,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-e2e-metal-assisted
+    optional: true
     rerun_command: /test e2e-metal-assisted
     spec:
       containers: