From 958184683aaf6ae7a8f29c03cb9a2c2f3661f082 Mon Sep 17 00:00:00 2001 From: Mat Kowalski Date: Wed, 26 Aug 2026 12:47:30 +0200 Subject: [PATCH 1/2] gcp: migrate e2e-gcp-ovn-rt workflow to N4 with hyperdisk-balanced Forward migration (step 1) following the revert in #84065. GCP N2 quota is very constrained, so move to N4 where the platform supports it. The openshift-e2e-gcp-ovn-rt workflow is a clean target: all of its consumers (e2e-gcp-ovn-rt-rhcos10-techpreview in nightly 4.22/4.23/5.0/5.1) run on releases >= 4.17, which is the floor for GCP N4 + hyperdisk-balanced support. N4 only supports hyperdisk-balanced disks (not pd-*), so this: - sets COMPUTE_NODE_TYPE=n4-standard-8 and COMPUTE_DISK_TYPE=hyperdisk-balanced on the workflow; - adds ipi-conf-gcp-osdisk-disktype (node OS disk) and storage-conf-storageclass-pre-set-default-gcp-hyperdisk (default StorageClass for dynamically provisioned PVCs, e.g. monitoring) before install, matching the openshift-e2e-gcp-csi-custom-worker convention; - drops the now-redundant COMPUTE_NODE_TYPE: n2-standard-8 override from the four consumers so node and disk type stay a single source of truth in the workflow. Depends on #84065 (revert) merging first. Assisted-By: Claude Opus 4.8 --- .../release/openshift-release-main__nightly-4.22.yaml | 1 - .../release/openshift-release-main__nightly-4.23.yaml | 1 - .../release/openshift-release-main__nightly-5.0.yaml | 1 - .../release/openshift-release-main__nightly-5.1.yaml | 1 - .../e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml | 5 ++++- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml index aae8eeed614ae..3fcea0a354b4a 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml @@ -2934,7 +2934,6 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: n2-standard-8 FEATURE_SET: TechPreviewNoUpgrade OS_IMAGE_STREAM: rhel-10 RT_ENABLED: "true" diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml index 1ebd793f5e779..d7a4a113879a1 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml @@ -2730,7 +2730,6 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: n2-standard-8 FEATURE_SET: TechPreviewNoUpgrade OS_IMAGE_STREAM: rhel-10 RT_ENABLED: "true" diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml index 61b87c6c34b82..1c0257d321d9c 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml @@ -3095,7 +3095,6 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: n2-standard-8 FEATURE_SET: TechPreviewNoUpgrade OS_IMAGE_STREAM: rhel-10 RT_ENABLED: "true" diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml index 7dfeb8296ad9a..3eb7fec8a8b86 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml @@ -3090,7 +3090,6 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: n2-standard-8 FEATURE_SET: TechPreviewNoUpgrade OS_IMAGE_STREAM: rhel-10 RT_ENABLED: "true" diff --git a/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml b/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml index 2fd922770481d..7f880a3f0813b 100644 --- a/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml @@ -8,6 +8,8 @@ workflow: - ref: ovn-conf - ref: ipi-conf-debug-kdump-configure-logs - ref: rhcos-conf-osstream + - ref: ipi-conf-gcp-osdisk-disktype + - ref: storage-conf-storageclass-pre-set-default-gcp-hyperdisk - chain: ipi-install-stableinitial - ref: optional-operators-configure-realtime-tuned-profile test: @@ -20,6 +22,7 @@ workflow: env: FAIL_ON_CORE_DUMP: "false" RT_ENABLED: "true" - COMPUTE_NODE_TYPE: n2-standard-8 + COMPUTE_NODE_TYPE: n4-standard-8 + COMPUTE_DISK_TYPE: hyperdisk-balanced documentation: |- The Openshift E2E OVN workflow with RHCOS10 From cf490ac9a6fd37b90e2f26643d639fbe43cec9a9 Mon Sep 17 00:00:00 2001 From: Mat Kowalski Date: Thu, 27 Aug 2026 15:08:00 +0200 Subject: [PATCH 2/2] gcp: skip regional-PD conformance test on N4 e2e-gcp-ovn-rt jobs The [sig-storage][Driver: pd.csi.storage.gke.io] "regional PD should store data and sync across zones" conformance test provisions a regional pd-standard PersistentDisk and attaches it to a worker. N4 supports only hyperdisk-balanced (not Persistent Disk), so the attach fails deterministically now that e2e-gcp-ovn-rt-rhcos10-techpreview runs on n4-standard-8: AttachVolume.Attach failed: googleapi: Error 400: Regional disks is not supported for n4-standard-8 machine type Skip that single test via TEST_SKIPS on the 4.23/5.0/5.1 consumers (the releases whose payload contains it; it is absent in <=4.22). The rest of openshift/conformance/parallel still runs, and N2 jobs keep the test. This is the tactical unblock. The durable fix makes the test skip itself on hyperdisk-only worker families in openshift/origin (test/extended/storage/gce_pd_regional.go), after which these TEST_SKIPS lines can be dropped. Assisted-By: Claude Opus 4.8 --- .../openshift/release/openshift-release-main__nightly-4.23.yaml | 1 + .../openshift/release/openshift-release-main__nightly-5.0.yaml | 1 + .../openshift/release/openshift-release-main__nightly-5.1.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml index d7a4a113879a1..7b811ff1f1791 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml @@ -2733,6 +2733,7 @@ tests: FEATURE_SET: TechPreviewNoUpgrade OS_IMAGE_STREAM: rhel-10 RT_ENABLED: "true" + TEST_SKIPS: regional PD should store data and sync across zones observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml index 1c0257d321d9c..0745702dca9ef 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml @@ -3098,6 +3098,7 @@ tests: FEATURE_SET: TechPreviewNoUpgrade OS_IMAGE_STREAM: rhel-10 RT_ENABLED: "true" + TEST_SKIPS: regional PD should store data and sync across zones observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml index 3eb7fec8a8b86..a58f863abeafc 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-5.1.yaml @@ -3093,6 +3093,7 @@ tests: FEATURE_SET: TechPreviewNoUpgrade OS_IMAGE_STREAM: rhel-10 RT_ENABLED: "true" + TEST_SKIPS: regional PD should store data and sync across zones observers: enable: - observers-resource-watch