Skip to content

STOR-2973: CI implementation: Validate Storage on GCP Dedicated #81996

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

Merged
openshift-merge-bot merged 4 commits into from
Aug 13, 2026
Merged

STOR-2973: CI implementation: Validate Storage on GCP Dedicated #81996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e24235
STOR-2973: Add CSI storage certification workflow for GCD
rvagner78 Jul 16, 2026
e347739
STOR-2973: Add CSI storage certification workflow for GCD, env variables
rvagner78 Jul 16, 2026
458419d
STOR-2968: skip tests that assume GCP infrastructure that doesn't exi…
rvagner78 Aug 11, 2026
6eb38ea
STOR-2968: revert: skip tests that assume GCP infrastructure that doe…
rvagner78 Aug 12, 2026
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
6 changes: 6 additions & 0 deletions ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,12 @@ tests:
steps:
cluster_profile: openshift-org-gcp
workflow: openshift-e2e-gcp-manual-oidc-workload-identity-persistent-disk
- always_run: false
as: e2e-gcd-csi
optional: true

@patrickdillon patrickdillon Aug 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to SKIP the tests we're skipping here:
https://github.com/openshift/release/blob/main/ci-operator/config/openshift/installer/openshift-installer-main.yaml#L556

Also, I think we're going to need to skip the test API LBs follow /readyz of kube-apiserver and stop sending requests so you should probably add that in as well

@rvagner78 rvagner78 Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, updated.

@rvagner78 rvagner78 Aug 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, updated.

Finally it looks like we don't need SKIP_TEST in our job, because we don't run them anyway.
The /pj-rehearse pull-ci-openshift-csi-operator-release-5.0-e2e-gcd-csi passed and CSI storage tests were executed.

steps:
cluster_profile: gcd
workflow: openshift-e2e-gcd-csi
- as: verify-deps
steps:
test:
Expand Down
12 changes: 12 additions & 0 deletions ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.0__periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,18 @@ tests:
env:
COMPUTE_NODE_TYPE: n4-standard-4
workflow: openshift-e2e-gcp-csi-custom-worker
- as: periodic-e2e-gcd-csi
cron: 0 6 * * 1
reporter_config:
channel: '#team-ocp-storage-triage'
job_states_to_report:
- failure
- error
report_template: |
':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>'
steps:
cluster_profile: gcd
workflow: openshift-e2e-gcd-csi
- as: periodic-e2e-gcp-csi-image-snapshot
cron: 25 8 * * 2
steps:
Expand Down
94 changes: 94 additions & 0 deletions ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.0-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,100 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build13
cron: 0 6 * * 1
decorate: true
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
extra_refs:
- base_ref: release-5.0
org: openshift
repo: csi-operator
sparse_checkout_files:
- .ci-operator.yaml
labels:
ci-operator.openshift.io/cloud: gcp
ci-operator.openshift.io/cloud-cluster-profile: gcd
ci-operator.openshift.io/variant: periodics
ci.openshift.io/generator: prowgen
job-release: "5.0"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-csi-operator-release-5.0-periodics-periodic-e2e-gcd-csi
reporter_config:
slack:
channel: '#team-ocp-storage-triage'
job_states_to_report:
- failure
- error
report_template: |
':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>'
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
- --target=periodic-e2e-gcd-csi
- --variant=periodics
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
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: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build13
cron: 40 4 * * 0
Expand Down
108 changes: 101 additions & 7 deletions ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.0-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2405,6 +2405,100 @@ presubmits:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
context: ci/prow/e2e-gcd-csi
decorate: true
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- Dockerfile.aws-ebs
- Dockerfile.aws-efs
- Dockerfile.azure-disk
- Dockerfile.azure-file
- Dockerfile.create_efs
- Dockerfile.gcp-pd
- Dockerfile.openstack-cinder
- Dockerfile.openstack-manila
- Dockerfile.samba
- Dockerfile.test
labels:
ci-operator.openshift.io/cloud: gcp
ci-operator.openshift.io/cloud-cluster-profile: gcd
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-csi-operator-release-5.0-e2e-gcd-csi
optional: true
rerun_command: /test e2e-gcd-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
- --target=e2e-gcd-csi
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
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: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-gcd-csi,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build04
context: ci/prow/e2e-gcp
decorate: true
decoration_config:
Expand Down Expand Up @@ -2497,7 +2591,7 @@ presubmits:
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
cluster: build04
context: ci/prow/e2e-gcp-csi
decorate: true
decoration_config:
Expand Down Expand Up @@ -2590,7 +2684,7 @@ presubmits:
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
cluster: build04
context: ci/prow/e2e-gcp-csi-c3
decorate: true
decoration_config:
Expand Down Expand Up @@ -2684,7 +2778,7 @@ presubmits:
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
cluster: build04
context: ci/prow/e2e-gcp-csi-extended
decorate: true
decoration_config:
Expand Down Expand Up @@ -2778,7 +2872,7 @@ presubmits:
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
cluster: build04
context: ci/prow/e2e-gcp-csi-image-snapshot
decorate: true
decoration_config:
Expand Down Expand Up @@ -2872,7 +2966,7 @@ presubmits:
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
cluster: build04
context: ci/prow/e2e-gcp-csi-manual-oidc
decorate: true
decoration_config:
Expand Down Expand Up @@ -2966,7 +3060,7 @@ presubmits:
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
cluster: build04
context: ci/prow/e2e-gcp-csi-n4
decorate: true
decoration_config:
Expand Down Expand Up @@ -3060,7 +3154,7 @@ presubmits:
branches:
- ^release-5\.0$
- ^release-5\.0-
cluster: build02
cluster: build04
context: ci/prow/e2e-gcp-ovn-upgrade
decorate: true
decoration_config:
Expand Down
5 changes: 5 additions & 0 deletions ci-operator/step-registry/openshift/e2e/gcd/csi/OWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
approvers:
- storage-approvers

reviewers:
- storage-reviewers
11 changes: 11 additions & 0 deletions ci-operator/step-registry/openshift/e2e/gcd/csi/openshift-e2e-gcd-csi-workflow.metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"path": "openshift/e2e/gcd/csi/openshift-e2e-gcd-csi-workflow.yaml",
"owners": {
"approvers": [
"storage-approvers"
],
"reviewers": [
"storage-reviewers"
]
}
}
36 changes: 36 additions & 0 deletions ci-operator/step-registry/openshift/e2e/gcd/csi/openshift-e2e-gcd-csi-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
workflow:
as: openshift-e2e-gcd-csi
steps:
allow_best_effort_post_steps: true
pre:
- chain: ipi-gcd-pre
- ref: storage-conf-csi-gcp-pd
- ref: storage-obj-save
test:
- ref: openshift-e2e-test
post:
- ref: storage-obj-check
- chain: gather-core-dump
- chain: ipi-gcp-post
- ref: gcp-deprovision-bastionhost
- ref: gcp-deprovision-vpc
env:
BASE_DOMAIN: ci.gcd.devcluster.openshift.com
BASTION_IMAGE_NAME: fedora-coreos-41-20241122-3-0-gcp-x86-64
BASTION_IMAGE_PROJECT: eu0:openshift
BASTION_MACHINE_TYPE: c3-standard-4
COMPUTE_DISK_TYPE: hyperdisk-balanced
COMPUTE_NODE_REPLICAS: "2"
COMPUTE_NODE_TYPE: c3-standard-4
CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced
CONTROL_PLANE_NODE_TYPE: c3-standard-8
DEFAULT_MACHINE_OSIMAGE: projects/eu0:openshift/images/rhcos10
FEATURE_SET: TechPreviewNoUpgrade
PUBLISH: Internal
TEST_CSI_DRIVER_MANIFEST: manifest-gcp-pd.yaml
TEST_OCP_CSI_DRIVER_MANIFEST: ocp-manifest-gcp-pd.yaml
TEST_SUITE: openshift/csi
documentation: |-
The OpenShift E2E GCD CSI workflow executes the openshift/csi end-to-end
test suite on a private cluster on Google Cloud Dedicated using the
GCP PD CSI driver with hyperdisk-balanced storage.