From 0f27f0050863e284d07fdfe9f99e26ea32ba1c30 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 10 Jun 2020 15:59:41 -0700 Subject: [PATCH] ci-operator/step-registry/openshift: Push e2e flavors under e2e/ This collects similar workflow definitions together instead of having a growing dump of sibling directories. Also use symlinks to parent OWNERS files for subdirectories had the same content. I haven't used symlinks for things like: * aws/ovn/OWNERS * vsphere/ovn/OWNERS despite them having the same content, because it's not clear which location would be more canonical. Will be nice if/when [1] gets fixed and we can go back to using aliases. [1]: https://github.com/openshift/ci-tools/pull/115#discussion_r350000636 --- .../openshift/e2e-aws-sdn-single/OWNERS | 14 -------------- .../openshift/e2e-vsphere-ovn/OWNERS | 17 ----------------- .../{e2e-aws-loki => e2e/aws/loki}/OWNERS | 0 .../loki}/openshift-e2e-aws-loki-workflow.yaml | 0 .../{e2e-aws-ovn-hybrid => e2e/aws/ovn}/OWNERS | 0 .../openshift/e2e/aws/ovn/hybrid/OWNERS | 1 + .../openshift-e2e-aws-ovn-hybrid-workflow.yaml | 0 .../ovn}/openshift-e2e-aws-ovn-workflow.yaml | 0 .../{e2e-aws-sdn-multi => e2e/aws/sdn}/OWNERS | 0 .../openshift/e2e/aws/sdn/multi/OWNERS | 1 + .../openshift-e2e-aws-sdn-multi-workflow.yaml | 0 .../openshift/e2e/aws/sdn/single/OWNERS | 1 + .../openshift-e2e-aws-sdn-single-workflow.yaml | 0 .../{e2e-aws-ovn => e2e/vsphere/ovn}/OWNERS | 0 .../openshift-e2e-vsphere-ovn-workflow.yaml | 0 15 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 ci-operator/step-registry/openshift/e2e-aws-sdn-single/OWNERS delete mode 100644 ci-operator/step-registry/openshift/e2e-vsphere-ovn/OWNERS rename ci-operator/step-registry/openshift/{e2e-aws-loki => e2e/aws/loki}/OWNERS (100%) rename ci-operator/step-registry/openshift/{e2e-aws-loki => e2e/aws/loki}/openshift-e2e-aws-loki-workflow.yaml (100%) rename ci-operator/step-registry/openshift/{e2e-aws-ovn-hybrid => e2e/aws/ovn}/OWNERS (100%) create mode 120000 ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/OWNERS rename ci-operator/step-registry/openshift/{e2e-aws-ovn-hybrid => e2e/aws/ovn/hybrid}/openshift-e2e-aws-ovn-hybrid-workflow.yaml (100%) rename ci-operator/step-registry/openshift/{e2e-aws-ovn => e2e/aws/ovn}/openshift-e2e-aws-ovn-workflow.yaml (100%) rename ci-operator/step-registry/openshift/{e2e-aws-sdn-multi => e2e/aws/sdn}/OWNERS (100%) create mode 120000 ci-operator/step-registry/openshift/e2e/aws/sdn/multi/OWNERS rename ci-operator/step-registry/openshift/{e2e-aws-sdn-multi => e2e/aws/sdn/multi}/openshift-e2e-aws-sdn-multi-workflow.yaml (100%) create mode 120000 ci-operator/step-registry/openshift/e2e/aws/sdn/single/OWNERS rename ci-operator/step-registry/openshift/{e2e-aws-sdn-single => e2e/aws/sdn/single}/openshift-e2e-aws-sdn-single-workflow.yaml (100%) rename ci-operator/step-registry/openshift/{e2e-aws-ovn => e2e/vsphere/ovn}/OWNERS (100%) rename ci-operator/step-registry/openshift/{e2e-vsphere-ovn => e2e/vsphere/ovn}/openshift-e2e-vsphere-ovn-workflow.yaml (100%) diff --git a/ci-operator/step-registry/openshift/e2e-aws-sdn-single/OWNERS b/ci-operator/step-registry/openshift/e2e-aws-sdn-single/OWNERS deleted file mode 100644 index 1e5ec45e2335..000000000000 --- a/ci-operator/step-registry/openshift/e2e-aws-sdn-single/OWNERS +++ /dev/null @@ -1,14 +0,0 @@ -approvers: -- danwinship -- dcbw -- knobunc -- pecameron -- squeed -reviewers: -- alexanderconstantinescu -- danwinship -- dcbw -- jacobtanenbaum -- pecameron -- rcarrillocruz -- squeed diff --git a/ci-operator/step-registry/openshift/e2e-vsphere-ovn/OWNERS b/ci-operator/step-registry/openshift/e2e-vsphere-ovn/OWNERS deleted file mode 100644 index f2edc7e03d9d..000000000000 --- a/ci-operator/step-registry/openshift/e2e-vsphere-ovn/OWNERS +++ /dev/null @@ -1,17 +0,0 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: -- danwinship -- dcbw -- knobunc -- pecameron -- squeed -reviewers: -- alexanderconstantinescu -- danwinship -- dcbw -- jacobtanenbaum -- pecameron -- rcarrillocruz -- squeed diff --git a/ci-operator/step-registry/openshift/e2e-aws-loki/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/loki/OWNERS similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-loki/OWNERS rename to ci-operator/step-registry/openshift/e2e/aws/loki/OWNERS diff --git a/ci-operator/step-registry/openshift/e2e-aws-loki/openshift-e2e-aws-loki-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/loki/openshift-e2e-aws-loki-workflow.yaml similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-loki/openshift-e2e-aws-loki-workflow.yaml rename to ci-operator/step-registry/openshift/e2e/aws/loki/openshift-e2e-aws-loki-workflow.yaml diff --git a/ci-operator/step-registry/openshift/e2e-aws-ovn-hybrid/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/ovn/OWNERS similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-ovn-hybrid/OWNERS rename to ci-operator/step-registry/openshift/e2e/aws/ovn/OWNERS diff --git a/ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/OWNERS new file mode 120000 index 000000000000..ec405d65a79d --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e-aws-ovn-hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-ovn-hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml rename to ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml diff --git a/ci-operator/step-registry/openshift/e2e-aws-ovn/openshift-e2e-aws-ovn-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/ovn/openshift-e2e-aws-ovn-workflow.yaml similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-ovn/openshift-e2e-aws-ovn-workflow.yaml rename to ci-operator/step-registry/openshift/e2e/aws/ovn/openshift-e2e-aws-ovn-workflow.yaml diff --git a/ci-operator/step-registry/openshift/e2e-aws-sdn-multi/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/sdn/OWNERS similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-sdn-multi/OWNERS rename to ci-operator/step-registry/openshift/e2e/aws/sdn/OWNERS diff --git a/ci-operator/step-registry/openshift/e2e/aws/sdn/multi/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/sdn/multi/OWNERS new file mode 120000 index 000000000000..ec405d65a79d --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/sdn/multi/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e-aws-sdn-multi/openshift-e2e-aws-sdn-multi-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/sdn/multi/openshift-e2e-aws-sdn-multi-workflow.yaml similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-sdn-multi/openshift-e2e-aws-sdn-multi-workflow.yaml rename to ci-operator/step-registry/openshift/e2e/aws/sdn/multi/openshift-e2e-aws-sdn-multi-workflow.yaml diff --git a/ci-operator/step-registry/openshift/e2e/aws/sdn/single/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/sdn/single/OWNERS new file mode 120000 index 000000000000..ec405d65a79d --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/sdn/single/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e-aws-sdn-single/openshift-e2e-aws-sdn-single-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/sdn/single/openshift-e2e-aws-sdn-single-workflow.yaml similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-sdn-single/openshift-e2e-aws-sdn-single-workflow.yaml rename to ci-operator/step-registry/openshift/e2e/aws/sdn/single/openshift-e2e-aws-sdn-single-workflow.yaml diff --git a/ci-operator/step-registry/openshift/e2e-aws-ovn/OWNERS b/ci-operator/step-registry/openshift/e2e/vsphere/ovn/OWNERS similarity index 100% rename from ci-operator/step-registry/openshift/e2e-aws-ovn/OWNERS rename to ci-operator/step-registry/openshift/e2e/vsphere/ovn/OWNERS diff --git a/ci-operator/step-registry/openshift/e2e-vsphere-ovn/openshift-e2e-vsphere-ovn-workflow.yaml b/ci-operator/step-registry/openshift/e2e/vsphere/ovn/openshift-e2e-vsphere-ovn-workflow.yaml similarity index 100% rename from ci-operator/step-registry/openshift/e2e-vsphere-ovn/openshift-e2e-vsphere-ovn-workflow.yaml rename to ci-operator/step-registry/openshift/e2e/vsphere/ovn/openshift-e2e-vsphere-ovn-workflow.yaml