From 238621a7dd746ebec1543483626d769d613b18bd Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Fri, 9 Oct 2020 14:04:23 +0200 Subject: [PATCH] machine-config-operator: fix tests in 4.6 and 4.7 to be in sync with master After 4.7 branch cut, it seems some of the tests which were optional has become REQUIRED. Make e2e-metal-ipi test optional, make aws-proxy and cluster-bootimages always_run to false --- ...hift-machine-config-operator-release-4.6-presubmits.yaml | 6 ++++-- ...hift-machine-config-operator-release-4.7-presubmits.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml index ea4b46ad8a76d..6f73267336a53 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml @@ -1,7 +1,7 @@ presubmits: openshift/machine-config-operator: - agent: kubernetes - always_run: true + always_run: false branches: - release-4.6 cluster: build01 @@ -220,7 +220,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.6 cluster: build01 @@ -232,6 +232,7 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-machine-config-operator-release-4.6-e2e-aws-proxy + optional: true rerun_command: /test e2e-aws-proxy spec: containers: @@ -503,6 +504,7 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-machine-config-operator-release-4.6-e2e-metal-ipi + optional: true rerun_command: /test e2e-metal-ipi spec: containers: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml index 4162e44c41634..2e1af4fe08f84 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml @@ -1,7 +1,7 @@ presubmits: openshift/machine-config-operator: - agent: kubernetes - always_run: true + always_run: false branches: - release-4.7 cluster: build01 @@ -220,7 +220,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.7 cluster: build01 @@ -232,6 +232,7 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-machine-config-operator-release-4.7-e2e-aws-proxy + optional: true rerun_command: /test e2e-aws-proxy spec: containers: @@ -503,6 +504,7 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-machine-config-operator-release-4.7-e2e-metal-ipi + optional: true rerun_command: /test e2e-metal-ipi spec: containers: