From f90778013b165906e18796345fe7a375a40b586d Mon Sep 17 00:00:00 2001 From: gabemontero Date: Thu, 21 Oct 2021 10:57:21 -0400 Subject: [PATCH 1/2] add new tech preview workflow that uses shared resource step registry test step --- .../e2e/techpreview/OWNERS | 7 +++++++ ...resource-e2e-techpreview-workflow.metadata.json | 14 ++++++++++++++ ...r-shared-resource-e2e-techpreview-workflow.yaml | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/OWNERS create mode 100644 ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.metadata.json create mode 100644 ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.yaml diff --git a/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/OWNERS b/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/OWNERS new file mode 100644 index 0000000000000..a07191d84c820 --- /dev/null +++ b/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/OWNERS @@ -0,0 +1,7 @@ +approvers: +- adambkaplan +- gabemontero +reviewers: +- coreydaley +- alicerum +- otaviof diff --git a/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.metadata.json b/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.metadata.json new file mode 100644 index 0000000000000..ed0b80e1a390a --- /dev/null +++ b/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.metadata.json @@ -0,0 +1,14 @@ +{ + "path": "csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.yaml", + "owners": { + "approvers": [ + "adambkaplan", + "gabemontero" + ], + "reviewers": [ + "coreydaley", + "alicerum", + "otaviof" + ] + } +} \ No newline at end of file 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 new file mode 100644 index 0000000000000..fd7b78115e039 --- /dev/null +++ b/ci-operator/step-registry/csi-driver-shared-resource/e2e/techpreview/csi-driver-shared-resource-e2e-techpreview-workflow.yaml @@ -0,0 +1,13 @@ +workflow: + as: csi-driver-shared-resource-e2e-techpreview + steps: + pre: + - chain: ipi-aws-pre-techpreview + test: + - ref: csi-driver-shared-resource-e2e + post: + - chain: gather-core-dump + - 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. + From a48988d3542424dbc610699f3755fee8c137d16f Mon Sep 17 00:00:00 2001 From: gabemontero Date: Thu, 21 Oct 2021 09:53:10 -0400 Subject: [PATCH 2/2] update shared resource operator repo CI to use tech preview workflow nuke use of 'make deploy' since tech preview mode results in CSO launching shared resource operator --- ...river-shared-resource-operator-master.yaml | 19 +------------------ ...shared-resource-operator-release-4.10.yaml | 19 +------------------ 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml index 50c453b92d1d0..c1b2c126a400e 100644 --- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml +++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml @@ -56,26 +56,9 @@ tests: - as: e2e-aws-csi-driver steps: cluster_profile: aws - pre: - - chain: ipi-aws-pre - - as: deploy-operator - cli: latest - commands: make deploy - dependencies: - - env: DRIVER_IMAGE - name: csi-driver-shared-resource - - env: NODE_DRIVER_REGISTRAR_IMAGE - name: csi-node-driver-registrar - - env: OPERATOR_IMAGE - name: csi-driver-shared-resource-operator - from: src - resources: - requests: - cpu: 50m - memory: 100Mi test: - ref: csi-driver-shared-resource-e2e - workflow: ipi-aws + workflow: csi-driver-shared-resource-e2e-techpreview zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.10.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.10.yaml index 0e93389c84d13..77728190977b8 100644 --- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.10.yaml +++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.10.yaml @@ -57,26 +57,9 @@ tests: - as: e2e-aws-csi-driver steps: cluster_profile: aws - pre: - - chain: ipi-aws-pre - - as: deploy-operator - cli: latest - commands: make deploy - dependencies: - - env: DRIVER_IMAGE - name: csi-driver-shared-resource - - env: NODE_DRIVER_REGISTRAR_IMAGE - name: csi-node-driver-registrar - - env: OPERATOR_IMAGE - name: csi-driver-shared-resource-operator - from: src - resources: - requests: - cpu: 50m - memory: 100Mi test: - ref: csi-driver-shared-resource-e2e - workflow: ipi-aws + workflow: csi-driver-shared-resource-e2e-techpreview zz_generated_metadata: branch: release-4.10 org: openshift