From fd2de3303931119b9056d7287663124bb29f588b Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Fri, 9 Oct 2020 15:56:04 +0200 Subject: [PATCH] config-updater: treat `main` branches as `master` There will be more and more `main` branches incoming (`main` being the new defaults for new GH repos) so this is an attempt to just cover them all. Also remove the repo-specific stanzas that the new one should replace. --- core-services/prow/02_config/_plugins.yaml | 86 +++++++++------------- 1 file changed, 34 insertions(+), 52 deletions(-) diff --git a/core-services/prow/02_config/_plugins.yaml b/core-services/prow/02_config/_plugins.yaml index 4cd1da2674c77..ea95243bf8bdf 100644 --- a/core-services/prow/02_config/_plugins.yaml +++ b/core-services/prow/02_config/_plugins.yaml @@ -614,6 +614,16 @@ config_updater: app.ci: - ci name: ci-operator-misc-configs + ci-operator/config/**/*-main.yaml: + clusters: + app.ci: + - ci + name: ci-operator-master-configs + ci-operator/config/**/*-main__*.yaml: + clusters: + app.ci: + - ci + name: ci-operator-master-configs ci-operator/config/**/*-ocp-ci-integration.yaml: clusters: app.ci: @@ -679,11 +689,6 @@ config_updater: app.ci: - ci name: ci-operator-misc-configs - ci-operator/config/**/*osde2e-main*.yaml: - clusters: - app.ci: - - ci - name: ci-operator-master-configs ci-operator/config/**/*podman-v1.*.yaml: clusters: app.ci: @@ -779,11 +784,6 @@ config_updater: app.ci: - ci name: ci-operator-misc-configs - ci-operator/config/ansible-collections/community.okd/*-main.yaml: - clusters: - app.ci: - - ci - name: ci-operator-master-configs ci-operator/config/eclipse/che-operator/*-7*.yaml: clusters: app.ci: @@ -824,21 +824,11 @@ config_updater: app.ci: - ci name: ci-operator-misc-configs - ci-operator/config/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-main.yaml: - clusters: - app.ci: - - ci - name: ci-operator-master-configs ci-operator/config/operator-framework/*/*feature*.yaml: clusters: app.ci: - ci name: ci-operator-misc-configs - ci-operator/config/operator-framework/*/*main*.yaml: - clusters: - app.ci: - - ci - name: ci-operator-master-configs ci-operator/config/redhat-operator-ecosystem/playground/*-cvp-ocp-4.4.yaml: clusters: app.ci: @@ -878,6 +868,30 @@ config_updater: - ci gzip: true name: job-config-misc + ci-operator/jobs/**/*-main-periodics.yaml: + clusters: + api.ci: + - ci + app.ci: + - ci + gzip: true + name: job-config-master + ci-operator/jobs/**/*-main-postsubmits.yaml: + clusters: + api.ci: + - ci + app.ci: + - ci + gzip: true + name: job-config-master + ci-operator/jobs/**/*-main-presubmits.yaml: + clusters: + api.ci: + - ci + app.ci: + - ci + gzip: true + name: job-config-master ci-operator/jobs/**/*-ocp-ci-integration*.yaml: clusters: app.ci: @@ -987,14 +1001,6 @@ config_updater: - ci gzip: true name: job-config-misc - ci-operator/jobs/**/*osde2e-main*.yaml: - clusters: - api.ci: - - ci - app.ci: - - ci - gzip: true - name: job-config-master ci-operator/jobs/**/*podman-v1.*.yaml: clusters: api.ci: @@ -1155,14 +1161,6 @@ config_updater: - ci gzip: true name: job-config-misc - ci-operator/jobs/ansible-collections/community.okd/*-main-*.yaml: - clusters: - api.ci: - - ci - app.ci: - - ci - gzip: true - name: job-config-master ci-operator/jobs/eclipse/che-operator/*-7*.yaml: clusters: api.ci: @@ -1218,14 +1216,6 @@ config_updater: - ci gzip: true name: job-config-misc - ci-operator/jobs/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-main*.yaml: - clusters: - api.ci: - - ci - app.ci: - - ci - gzip: true - name: job-config-master ci-operator/jobs/operator-framework/*/*feature*.yaml: clusters: api.ci: @@ -1234,14 +1224,6 @@ config_updater: - ci gzip: true name: job-config-misc - ci-operator/jobs/operator-framework/*/*main*.yaml: - clusters: - api.ci: - - ci - app.ci: - - ci - gzip: true - name: job-config-master ci-operator/jobs/redhat-operator-ecosystem/playground/*-cvp-ocp-4.4.yaml: clusters: api.ci: