From 6b3259b2f336738e15b8e4cdb649023e89e4620a Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Thu, 19 Aug 2021 15:09:58 +0100 Subject: [PATCH 1/2] Use regular ipi-pre chain instead of techpreview specific chain --- .../csi-driver-shared-resource-e2e-techpreview-workflow.yaml | 4 ++-- .../openshift-e2e-aws-builds-techpreview-workflow.yaml | 3 ++- .../techpreview/openshift-e2e-aws-techpreview-workflow.yaml | 3 ++- .../serial/openshift-e2e-aws-techpreview-serial-workflow.yaml | 3 ++- .../techpreview/openshift-e2e-azure-techpreview-workflow.yaml | 3 ++- .../openshift-e2e-azure-techpreview-serial-workflow.yaml | 3 ++- .../openshift-e2e-openstack-techpreview-workflow.yaml | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.yaml b/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.yaml index fd7b78115e039..49842d5c122d2 100644 --- a/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.yaml +++ b/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: csi-driver-shared-resource-e2e-techpreview steps: pre: - - chain: ipi-aws-pre-techpreview + - ref: ipi-conf-techpreview + - chain: ipi-aws-pre test: - ref: csi-driver-shared-resource-e2e post: @@ -10,4 +11,3 @@ workflow: - chain: ipi-aws-post documentation: |- The Openshift E2E CSI Driver Shared Resource AWS workflow executes the common CSI Driver Shared Resource end-to-end test suite on AWS with a TechPreviewNoUpgrade cluster configuration. - diff --git a/ci-operator/step-registry/openshift/e2e/aws/builds/techpreview/openshift-e2e-aws-builds-techpreview-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/builds/techpreview/openshift-e2e-aws-builds-techpreview-workflow.yaml index 775f3d626bd9e..65ef4a8911b68 100644 --- a/ci-operator/step-registry/openshift/e2e/aws/builds/techpreview/openshift-e2e-aws-builds-techpreview-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/aws/builds/techpreview/openshift-e2e-aws-builds-techpreview-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: openshift-e2e-aws-builds-techpreview steps: pre: - - chain: ipi-aws-pre-techpreview + - ref: ipi-conf-techpreview + - chain: ipi-aws-pre - ref: build-github-secrets test: - ref: openshift-e2e-test diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml index 6f8e1934df7e3..c60aef7fc0e23 100644 --- a/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: openshift-e2e-aws-techpreview steps: pre: - - chain: ipi-aws-pre-techpreview + - ref: ipi-conf-techpreview + - chain: ipi-aws-pre test: - ref: openshift-e2e-test post: diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml index 224f052002006..0c14e7dd5c099 100644 --- a/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: openshift-e2e-aws-techpreview-serial steps: pre: - - chain: ipi-aws-pre-techpreview + - ref: ipi-conf-techpreview + - chain: ipi-aws-pre test: - ref: openshift-e2e-test post: diff --git a/ci-operator/step-registry/openshift/e2e/azure/techpreview/openshift-e2e-azure-techpreview-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azure/techpreview/openshift-e2e-azure-techpreview-workflow.yaml index fac0d8c29ff8b..bfd532d72467e 100644 --- a/ci-operator/step-registry/openshift/e2e/azure/techpreview/openshift-e2e-azure-techpreview-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/azure/techpreview/openshift-e2e-azure-techpreview-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: openshift-e2e-azure-techpreview steps: pre: - - chain: ipi-azure-pre-techpreview + - ref: ipi-conf-techpreview + - chain: ipi-azure-pre test: - ref: openshift-e2e-test post: diff --git a/ci-operator/step-registry/openshift/e2e/azure/techpreview/serial/openshift-e2e-azure-techpreview-serial-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azure/techpreview/serial/openshift-e2e-azure-techpreview-serial-workflow.yaml index 39271badbdd81..a336368ab48d3 100644 --- a/ci-operator/step-registry/openshift/e2e/azure/techpreview/serial/openshift-e2e-azure-techpreview-serial-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/azure/techpreview/serial/openshift-e2e-azure-techpreview-serial-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: openshift-e2e-azure-techpreview-serial steps: pre: - - chain: ipi-azure-pre-techpreview + - ref: ipi-conf-techpreview + - chain: ipi-azure-pre test: - ref: openshift-e2e-test post: diff --git a/ci-operator/step-registry/openshift/e2e/openstack/techpreview/openshift-e2e-openstack-techpreview-workflow.yaml b/ci-operator/step-registry/openshift/e2e/openstack/techpreview/openshift-e2e-openstack-techpreview-workflow.yaml index 984235f019831..72992899885ba 100644 --- a/ci-operator/step-registry/openshift/e2e/openstack/techpreview/openshift-e2e-openstack-techpreview-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/openstack/techpreview/openshift-e2e-openstack-techpreview-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: openshift-e2e-openstack-techpreview steps: pre: - - chain: ipi-openstack-pre-techpreview + - ref: ipi-conf-techpreview + - chain: ipi-openstack-pre test: - chain: openstack-test-e2e post: From b0dd6f9ea966de00e62f913ebd6f9ea1fe05e358 Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Thu, 19 Aug 2021 15:12:43 +0100 Subject: [PATCH 2/2] Remove redundant provider specific ipi-config--techpreview --- .../ipi/aws/pre/techpreview/OWNERS | 1 - ...pi-aws-pre-techpreview-chain.metadata.json | 14 -------------- .../ipi-aws-pre-techpreview-chain.yaml | 8 -------- .../ipi/azure/pre/techpreview/OWNERS | 1 - ...-azure-pre-techpreview-chain.metadata.json | 8 -------- .../ipi-azure-pre-techpreview-chain.yaml | 8 -------- .../ipi/conf/aws/techpreview/OWNERS | 1 - ...i-conf-aws-techpreview-chain.metadata.json | 14 -------------- .../ipi-conf-aws-techpreview-chain.yaml | 10 ---------- .../ipi/conf/azure/techpreview/OWNERS | 1 - ...conf-azure-techpreview-chain.metadata.json | 8 -------- .../ipi-conf-azure-techpreview-chain.yaml | 10 ---------- .../ipi/conf/openstack/techpreview/OWNERS | 1 - ...-openstack-techpreview-chain.metadata.json | 11 ----------- .../ipi-conf-openstack-techpreview-chain.yaml | 19 ------------------- .../ipi/openstack/pre/techpreview/OWNERS | 1 - ...nstack-pre-techpreview-chain.metadata.json | 11 ----------- .../ipi-openstack-pre-techpreview-chain.yaml | 8 -------- 18 files changed, 135 deletions(-) delete mode 120000 ci-operator/step-registry/ipi/aws/pre/techpreview/OWNERS delete mode 100644 ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.metadata.json delete mode 100644 ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml delete mode 120000 ci-operator/step-registry/ipi/azure/pre/techpreview/OWNERS delete mode 100644 ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.metadata.json delete mode 100644 ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.yaml delete mode 120000 ci-operator/step-registry/ipi/conf/aws/techpreview/OWNERS delete mode 100644 ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.metadata.json delete mode 100644 ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml delete mode 120000 ci-operator/step-registry/ipi/conf/azure/techpreview/OWNERS delete mode 100644 ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.metadata.json delete mode 100644 ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.yaml delete mode 120000 ci-operator/step-registry/ipi/conf/openstack/techpreview/OWNERS delete mode 100644 ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.metadata.json delete mode 100644 ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.yaml delete mode 120000 ci-operator/step-registry/ipi/openstack/pre/techpreview/OWNERS delete mode 100644 ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.metadata.json delete mode 100644 ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.yaml diff --git a/ci-operator/step-registry/ipi/aws/pre/techpreview/OWNERS b/ci-operator/step-registry/ipi/aws/pre/techpreview/OWNERS deleted file mode 120000 index ec405d65a79df..0000000000000 --- a/ci-operator/step-registry/ipi/aws/pre/techpreview/OWNERS +++ /dev/null @@ -1 +0,0 @@ -../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.metadata.json deleted file mode 100644 index 26c0b49b1d0a7..0000000000000 --- a/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.metadata.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "path": "ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml", - "owners": { - "approvers": [ - "smarterclayton", - "wking", - "vrutkovs", - "abhinavdahiya", - "deads2k", - "staebler", - "technical-release-team-approvers" - ] - } -} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml b/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml deleted file mode 100644 index 03a378dab7e8c..0000000000000 --- a/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml +++ /dev/null @@ -1,8 +0,0 @@ -chain: - as: ipi-aws-pre-techpreview - steps: - - chain: ipi-conf-aws-techpreview - - chain: ipi-install - documentation: |- - The IPI setup step contains all steps that provision an OpenShift cluster - in a Tech Preview configuration on AWS. diff --git a/ci-operator/step-registry/ipi/azure/pre/techpreview/OWNERS b/ci-operator/step-registry/ipi/azure/pre/techpreview/OWNERS deleted file mode 120000 index ec405d65a79df..0000000000000 --- a/ci-operator/step-registry/ipi/azure/pre/techpreview/OWNERS +++ /dev/null @@ -1 +0,0 @@ -../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.metadata.json deleted file mode 100644 index 3b7fa71151d12..0000000000000 --- a/ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.metadata.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "path": "ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.yaml", - "owners": { - "approvers": [ - "abhinavdahiya" - ] - } -} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.yaml b/ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.yaml deleted file mode 100644 index 86b0019304012..0000000000000 --- a/ci-operator/step-registry/ipi/azure/pre/techpreview/ipi-azure-pre-techpreview-chain.yaml +++ /dev/null @@ -1,8 +0,0 @@ -chain: - as: ipi-azure-pre-techpreview - steps: - - chain: ipi-conf-azure-techpreview - - chain: ipi-install - documentation: |- - The IPI setup step contains all steps that provision an OpenShift cluster - in a Tech Preview configuration on Azure. diff --git a/ci-operator/step-registry/ipi/conf/aws/techpreview/OWNERS b/ci-operator/step-registry/ipi/conf/aws/techpreview/OWNERS deleted file mode 120000 index ec405d65a79df..0000000000000 --- a/ci-operator/step-registry/ipi/conf/aws/techpreview/OWNERS +++ /dev/null @@ -1 +0,0 @@ -../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.metadata.json deleted file mode 100644 index 225e57e90d875..0000000000000 --- a/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.metadata.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "path": "ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml", - "owners": { - "approvers": [ - "smarterclayton", - "wking", - "vrutkovs", - "abhinavdahiya", - "deads2k", - "staebler", - "technical-release-team-approvers" - ] - } -} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml b/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml deleted file mode 100644 index 4797fb3c51645..0000000000000 --- a/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml +++ /dev/null @@ -1,10 +0,0 @@ -chain: - as: ipi-conf-aws-techpreview - steps: - - ref: ipi-conf - - ref: ipi-conf-aws - - ref: ipi-conf-techpreview - - ref: ipi-install-monitoringpvc - documentation: |- - The IPI configure step chain generates the install-config.yaml file based on the cluster profile and optional input files. - This configuration will create a cluster with a TechPreviewNoUpgrade FeatureGate installed. diff --git a/ci-operator/step-registry/ipi/conf/azure/techpreview/OWNERS b/ci-operator/step-registry/ipi/conf/azure/techpreview/OWNERS deleted file mode 120000 index ec405d65a79df..0000000000000 --- a/ci-operator/step-registry/ipi/conf/azure/techpreview/OWNERS +++ /dev/null @@ -1 +0,0 @@ -../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.metadata.json deleted file mode 100644 index 80601e09a682c..0000000000000 --- a/ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.metadata.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "path": "ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.yaml", - "owners": { - "approvers": [ - "abhinavdahiya" - ] - } -} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.yaml b/ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.yaml deleted file mode 100644 index 22dd4d403c210..0000000000000 --- a/ci-operator/step-registry/ipi/conf/azure/techpreview/ipi-conf-azure-techpreview-chain.yaml +++ /dev/null @@ -1,10 +0,0 @@ -chain: - as: ipi-conf-azure-techpreview - steps: - - ref: ipi-conf - - ref: ipi-conf-azure - - ref: ipi-conf-techpreview - - ref: ipi-install-monitoringpvc - documentation: |- - The IPI configure step chain generates the install-config.yaml file based on the cluster profile and optional input files. - This configuration will create a cluster with a TechPreviewNoUpgrade FeatureGate installed. diff --git a/ci-operator/step-registry/ipi/conf/openstack/techpreview/OWNERS b/ci-operator/step-registry/ipi/conf/openstack/techpreview/OWNERS deleted file mode 120000 index ec405d65a79df..0000000000000 --- a/ci-operator/step-registry/ipi/conf/openstack/techpreview/OWNERS +++ /dev/null @@ -1 +0,0 @@ -../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.metadata.json deleted file mode 100644 index 36244da0e5718..0000000000000 --- a/ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.metadata.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "path": "ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.yaml", - "owners": { - "approvers": [ - "openstack-approvers" - ], - "reviewers": [ - "openstack-reviewers" - ] - } -} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.yaml b/ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.yaml deleted file mode 100644 index 3d7bf3a7977ab..0000000000000 --- a/ci-operator/step-registry/ipi/conf/openstack/techpreview/ipi-conf-openstack-techpreview-chain.yaml +++ /dev/null @@ -1,19 +0,0 @@ -chain: - as: ipi-conf-openstack-techpreview - steps: - - ref: openstack-conf-clouds - - ref: openstack-conf-resourcenames - - ref: openstack-conf-createfips - - ref: openstack-conf-generateconfig - - ref: openstack-conf-creatednsrecords - - ref: openstack-conf-exportcindercredentials - - ref: ipi-conf-etcd-on-ramfs - - ref: ipi-conf-openstack-precheck - - ref: ipi-install-monitoringpvc - - ref: ipi-conf-techpreview - documentation: |- - The ipi-conf-openstack-techpreview chain contains all the - refs and chains necessary to configure the system before - deploying an IPI installation of OpenShift onto OpenStack. - This configuration will create a cluster with a - TechPreviewNoUpgrade FeatureGate installed. diff --git a/ci-operator/step-registry/ipi/openstack/pre/techpreview/OWNERS b/ci-operator/step-registry/ipi/openstack/pre/techpreview/OWNERS deleted file mode 120000 index ec405d65a79df..0000000000000 --- a/ci-operator/step-registry/ipi/openstack/pre/techpreview/OWNERS +++ /dev/null @@ -1 +0,0 @@ -../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.metadata.json deleted file mode 100644 index 3096586c377bc..0000000000000 --- a/ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.metadata.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "path": "ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.yaml", - "owners": { - "approvers": [ - "openstack-approvers" - ], - "reviewers": [ - "openstack-reviewers" - ] - } -} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.yaml b/ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.yaml deleted file mode 100644 index 374de96e3d03c..0000000000000 --- a/ci-operator/step-registry/ipi/openstack/pre/techpreview/ipi-openstack-pre-techpreview-chain.yaml +++ /dev/null @@ -1,8 +0,0 @@ -chain: - as: ipi-openstack-pre-techpreview - steps: - - chain: ipi-conf-openstack-techpreview - - chain: ipi-install - documentation: |- - The IPI setup step contains all steps that provision an OpenShift cluster - in a Tech Preview configuration on OpenStack.