From 4df5d17d32a64f3178be1494247198730a4e915b Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Mon, 21 Sep 2020 12:29:20 -0400 Subject: [PATCH] Ensure mao vpshere job runs on vsphere cluster --- .../openshift-machine-api-operator-master-presubmits.yaml | 2 +- .../openshift-machine-api-operator-release-4.6-presubmits.yaml | 2 +- .../openshift-machine-api-operator-release-4.7-presubmits.yaml | 2 +- core-services/sanitize-prow-jobs/_config.yaml | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml index e54d173ec4a1d..a408fea6ecb5d 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml @@ -796,7 +796,7 @@ presubmits: always_run: false branches: - master - cluster: build02 + cluster: vsphere context: ci/prow/e2e-vsphere-serial decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.6-presubmits.yaml index a6a7780b6cf6e..12ef591a2df2b 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.6-presubmits.yaml @@ -710,7 +710,7 @@ presubmits: always_run: false branches: - release-4.6 - cluster: build02 + cluster: vsphere context: ci/prow/e2e-vsphere-serial decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.7-presubmits.yaml index 70f66c42b42f7..30ec78fa257cb 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.7-presubmits.yaml @@ -710,7 +710,7 @@ presubmits: always_run: false branches: - release-4.7 - cluster: build02 + cluster: vsphere context: ci/prow/e2e-vsphere-serial decorate: true decoration_config: diff --git a/core-services/sanitize-prow-jobs/_config.yaml b/core-services/sanitize-prow-jobs/_config.yaml index 1e1b4175f659a..6e3d93e3e5d0d 100644 --- a/core-services/sanitize-prow-jobs/_config.yaml +++ b/core-services/sanitize-prow-jobs/_config.yaml @@ -4648,3 +4648,6 @@ groups: - periodic-ci-openshift-release-master-ocp-4.5-e2e-vsphere-serial - periodic-ci-openshift-release-master-ocp-4.6-e2e-vsphere-serial - periodic-ci-openshift-release-master-ocp-4.6-e2e-vsphere-upi-serial + - pull-ci-openshift-machine-api-operator-master-e2e-vsphere-serial + - pull-ci-openshift-machine-api-operator-release-4.6-e2e-vsphere-serial + - pull-ci-openshift-machine-api-operator-release-4.7-e2e-vsphere-serial