Skip to content

STOR-2543: Enable auto-run for e2e-gcp-csi-volumeattributesclass and add VAC manifest support #72857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radeore wants to merge 1 commit into
base: master
Choose a base branch
from
Open

STOR-2543: Enable auto-run for e2e-gcp-csi-volumeattributesclass and add VAC manifest support #72857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ci-operator/config/openshift/gcp-pd-csi-driver/openshift-gcp-pd-csi-driver-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ tests:
env:
TEST_SCENARIOS: \[CSI-Driver\]|\[GKE-PD-CSI\]
workflow: openshift-e2e-gcp-csi-extended
- always_run: false
as: e2e-gcp-csi-volumeattributesclass
- as: e2e-gcp-csi-volumeattributesclass
optional: true
steps:
cluster_profile: gcp
Expand Down
3 changes: 1 addition & 2 deletions ci-operator/config/openshift/gcp-pd-csi-driver/openshift-gcp-pd-csi-driver-release-4.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ tests:
env:
TEST_SCENARIOS: \[CSI-Driver\]|\[GKE-PD-CSI\]
workflow: openshift-e2e-gcp-csi-extended
- always_run: false
as: e2e-gcp-csi-volumeattributesclass
- as: e2e-gcp-csi-volumeattributesclass
optional: true
steps:
cluster_profile: gcp
Expand Down
2 changes: 1 addition & 1 deletion ...rator/jobs/openshift/gcp-pd-csi-driver/openshift-gcp-pd-csi-driver-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-gcp-csi-n4,?($|\s.*)
- agent: kubernetes
always_run: false
always_run: true
branches:
- ^master$
- ^master-
Expand Down
2 changes: 1 addition & 1 deletion ...jobs/openshift/gcp-pd-csi-driver/openshift-gcp-pd-csi-driver-release-4.21-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-gcp-csi-n4,?($|\s.*)
- agent: kubernetes
always_run: false
always_run: true
branches:
- ^release-4\.21$
- ^release-4\.21-
Expand Down
6 changes: 6 additions & 0 deletions ci-operator/step-registry/storage/conf/csi-gcp-pd/storage-conf-csi-gcp-pd-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ cd /go/src/github.com/openshift/gcp-pd-csi-driver-operator
if [ "${COMPUTE_DISK_TYPE}" == "hyperdisk-balanced" ]; then
# Using hyperdisk-balanced worker
cp test/e2e/hyperdisk-manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
# VolumeAttributesClass tests should only run on cluster with hyperdisk-balanced worker
if [ -f "test/e2e/${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST}" ]; then
echo "Copying ${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST} from openshift/gcp-pd-csi-driver-operator to ${SHARED_DIR}/${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST}"
cp test/e2e/${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST} ${SHARED_DIR}/${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST}
cat ${SHARED_DIR}/${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST}
fi
else
cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
fi
Expand Down
5 changes: 5 additions & 0 deletions ci-operator/step-registry/storage/conf/csi-gcp-pd/storage-conf-csi-gcp-pd-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ ref:
default: "pd-balanced"
documentation: |-
It defines the osDisk type for GCP compute nodes.
- name: TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST
default: "volumeattributesclass.yaml"
documentation: |-
The VolumeAttributesClass manifest to create. Used by the `openshift-tests` as a
manifest for openshift/csi tests. The file must be in ${SHARED_DIR}.
documentation: |-
The csi-gcp-pd step creates ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST} for
GCP PD CSI driver, which is consumed by openshift-e2e-test step to
Expand Down