From f10086d665e378dc973f00cd789382b3cd32ddf1 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 20 Sep 2021 17:24:49 +0200 Subject: [PATCH 1/2] Add e2e tests for Azure Disk CSI driver on Azure Stack --- ...azure-disk-csi-driver-operator-master.yaml | 4 ++ ...csi-driver-operator-master-presubmits.yaml | 72 +++++++++++++++++++ .../openshift/e2e/azurestack/upi-csi/OWNERS | 13 ++++ ...-azurestack-upi-csi-workflow.metadata.json | 19 +++++ ...shift-e2e-azurestack-upi-csi-workflow.yaml | 18 +++++ 5 files changed, 126 insertions(+) create mode 100644 ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/OWNERS create mode 100644 ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.metadata.json create mode 100644 ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml diff --git a/ci-operator/config/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master.yaml b/ci-operator/config/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master.yaml index 4ac7ef1085711..9ad5abced1418 100644 --- a/ci-operator/config/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master.yaml +++ b/ci-operator/config/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master.yaml @@ -58,6 +58,10 @@ tests: steps: cluster_profile: azure4 workflow: openshift-e2e-azure-csi-migration +- as: e2e-azurestack-csi + steps: + cluster_profile: azurestack + workflow: openshift-e2e-azurestack-upi-csi zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/jobs/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master-presubmits.yaml index 3a89eb78e0144..e73715c8fed3e 100644 --- a/ci-operator/jobs/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/azure-disk-csi-driver-operator/openshift-azure-disk-csi-driver-operator-master-presubmits.yaml @@ -218,6 +218,78 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-csi-migration,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/e2e-azurestack-csi + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-azure-disk-csi-driver-operator-master-e2e-azurestack-csi + rerun_command: /test e2e-azurestack-csi + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-azurestack-csi-cluster-profile + - --target=e2e-azurestack-csi + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-azurestack-csi-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-azurestack + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-azurestack-csi,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/OWNERS b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/OWNERS new file mode 100644 index 0000000000000..26b8e859c54b2 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/OWNERS @@ -0,0 +1,13 @@ +approvers: +- bertinatto +- dobsonj +- gnufied +- jsafrane +- tsmetana + +reviewers: +- bertinatto +- dobsonj +- gnufied +- jsafrane +- tsmetana \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.metadata.json b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.metadata.json new file mode 100644 index 0000000000000..1c21629dea3cd --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.metadata.json @@ -0,0 +1,19 @@ +{ + "path": "openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml", + "owners": { + "approvers": [ + "bertinatto", + "dobsonj", + "gnufied", + "jsafrane", + "tsmetana" + ], + "reviewers": [ + "bertinatto", + "dobsonj", + "gnufied", + "jsafrane", + "tsmetana" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml new file mode 100644 index 0000000000000..51a74320b32c8 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml @@ -0,0 +1,18 @@ +workflow: + as: openshift-e2e-azurestack-upi-csi + steps: + pre: + - chain: upi-azurestack-pre + - ref: storage-conf-csi-azure-disk + - ref: storage-obj-save + test: + - ref: openshift-e2e-test + post: + - ref: storage-obj-check + - chain: gather-core-dump + - chain: upi-azurestack-post + env: + TEST_CSI_DRIVER_MANIFEST: manifest-azure-disk.yaml + TEST_SUITE: openshift/csi + documentation: |- + The Openshift E2E AzureStack `csi` workflow executes the `openshift/csi` end-to-end test suite on Azure Disk CSI driver on Azure Stack. From 50cac90079b2316d5aa32545bc8d4b73aef09d02 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 21 Sep 2021 14:50:51 +0200 Subject: [PATCH 2/2] Run the ASH tests with less parallel tests Out ASH env. is very slow. "4" usually passes under 2 hours. With "8", some random tests start timing out. --- .../upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml index 51a74320b32c8..f4d32b6cf01b9 100644 --- a/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/azurestack/upi-csi/openshift-e2e-azurestack-upi-csi-workflow.yaml @@ -14,5 +14,7 @@ workflow: env: TEST_CSI_DRIVER_MANIFEST: manifest-azure-disk.yaml TEST_SUITE: openshift/csi + # Our AzureStack env is very slow. "8" was too high and tests timed out randomly. + TEST_ARGS: --max-parallel-tests 4 documentation: |- The Openshift E2E AzureStack `csi` workflow executes the `openshift/csi` end-to-end test suite on Azure Disk CSI driver on Azure Stack.