From 23982da755f2c50e05d83c85936ae4b465651ea6 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 26 Mar 2021 09:07:26 -0700 Subject: [PATCH] ci-operator/jobs/openshift/cluster-version-operator: Metal optional on 4.7 Fix: $ 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.7-presubmits.yaml) ... -ci/prow/e2e-metal-assisted false true +ci/prow/e2e-metal-assisted true - which dates back to when the job was created in 104130400a (ci-operator-prowgen --from-dir ./ci-operator/config --to-dir ./ci-operator/jobs, 2020-11-05, #13446). --- ...nshift-cluster-version-operator-release-4.7-presubmits.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml index f01292752115c..da24f2b2b83f5 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml @@ -205,7 +205,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.7 cluster: build01 @@ -217,6 +217,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.7-e2e-metal-assisted + optional: true rerun_command: /test e2e-metal-assisted spec: containers: