From 4d84967ac50db09ae6ebf7451e2c9cbcf41e17fe Mon Sep 17 00:00:00 2001 From: openshift-trt Date: Mon, 24 Aug 2026 16:43:58 +0000 Subject: [PATCH 1/4] fix(config): add gcd platform to 5.1-main and 4.23-main views PR #3899 added the GCD (Google Dedicated Cloud) platform to the variant registry and to the 5.0-main and 4.22-main views, but did not update the 5.1-main and 4.23-main views. This caused an "Unknown variant value: gcd (for variant Platform from view)" warning in Component Readiness because the variant validation found gcd platform data from GCD jobs running in 5.0/5.1 releases that was not recognized by these views. Co-Authored-By: Claude Opus 4.6 --- config/views.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/views.yaml b/config/views.yaml index c0b21cc877..28f61ed79a 100755 --- a/config/views.yaml +++ b/config/views.yaml @@ -52,6 +52,7 @@ component_readiness: - aws - azure - gcp + - gcd - metal - vsphere Topology: @@ -2381,6 +2382,7 @@ component_readiness: - aws - azure - gcp + - gcd - metal - vsphere Topology: From 56d27f28f431d8cb2c846413192cf636a594bcb8 Mon Sep 17 00:00:00 2001 From: openshift-trt Date: Mon, 24 Aug 2026 22:36:10 +0000 Subject: [PATCH 2/4] test: add unit test for gcd platform variant parsing Add test case for periodic-ci-openshift-release-main-ci-5.0-e2e-gcd-ovn to verify platform is correctly identified as gcd with release 5.0. Also update variant snapshot to fix pre-existing gcd JobTier mismatch. Co-Authored-By: Claude Opus 4.6 --- pkg/variantregistry/ocp_test.go | 30 ++++++++++++++++++++++++++++++ pkg/variantregistry/snapshot.yaml | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/pkg/variantregistry/ocp_test.go b/pkg/variantregistry/ocp_test.go index 9f772258df..9afea20f5a 100644 --- a/pkg/variantregistry/ocp_test.go +++ b/pkg/variantregistry/ocp_test.go @@ -2524,6 +2524,36 @@ func TestVariantSyncer(t *testing.T) { VariantCapability: "NoRegistryClusterInstall", }, }, + { + job: "periodic-ci-openshift-release-main-ci-5.0-e2e-gcd-ovn", + expected: map[string]string{ + VariantRelease: "5.0", + VariantReleaseMajor: "5", + VariantReleaseMinor: "0", + VariantArch: "amd64", + VariantInstaller: "ipi", + VariantPlatform: "gcd", + VariantNetwork: "ovn", + VariantNetworkStack: "ipv4", + VariantOwner: "eng", + VariantTopology: "ha", + VariantSuite: "unknown", + VariantUpgrade: VariantNoValue, + VariantProcedure: VariantNoValue, + VariantJobTier: "standard", + VariantAggregation: VariantNoValue, + VariantSecurityMode: VariantDefaultValue, + VariantFeatureSet: VariantDefaultValue, + VariantNetworkAccess: VariantDefaultValue, + VariantScheduler: VariantDefaultValue, + VariantContainerRuntime: "crun", + VariantCGroupMode: "v2", + VariantLayeredProduct: VariantNoValue, + VariantOS: "rhcos10", + VariantComponent: "Installer", + VariantCapability: "GCPSovereignCloudInstall", + }, + }, } for _, test := range tests { t.Run(test.job, func(t *testing.T) { diff --git a/pkg/variantregistry/snapshot.yaml b/pkg/variantregistry/snapshot.yaml index 4558bf8635..cc6e457d9b 100644 --- a/pkg/variantregistry/snapshot.yaml +++ b/pkg/variantregistry/snapshot.yaml @@ -274100,7 +274100,7 @@ periodic-ci-openshift-release-main-ci-5.1-e2e-gcd-ovn: ContainerRuntime: crun FeatureSet: default Installer: ipi - JobTier: candidate + JobTier: standard LayeredProduct: none Network: ovn NetworkAccess: default @@ -274126,7 +274126,7 @@ periodic-ci-openshift-release-main-ci-5.1-e2e-gcd-ovn-techpreview: ContainerRuntime: crun FeatureSet: techpreview Installer: ipi - JobTier: candidate + JobTier: standard LayeredProduct: none Network: ovn NetworkAccess: default From f82b6591bea13949cc7618fcb3c2459fff3b56dd Mon Sep 17 00:00:00 2001 From: openshift-trt Date: Tue, 25 Aug 2026 12:00:45 +0000 Subject: [PATCH 3/4] fix(variant): skip cluster data platform override for gcd GCD (Google Dedicated Cloud) jobs report their platform as GCP in cluster data, but we want to keep gcd in its own separate bucket. Add gcd to the platform skip list alongside rosa and osd-gcp. Co-Authored-By: Claude Opus 4.6 --- pkg/variantregistry/ocp.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/variantregistry/ocp.go b/pkg/variantregistry/ocp.go index 7916e815ce..4bbadf7ebf 100644 --- a/pkg/variantregistry/ocp.go +++ b/pkg/variantregistry/ocp.go @@ -335,6 +335,10 @@ func (v *OCPVariantLoader) CalculateVariantsForJob(jLog logrus.FieldLogger, jobN if jnv == "osd-gcp" { continue } + // GCD (Google Dedicated Cloud) is identified as GCP, but we want to keep it in a separate bucket + if jnv == "gcd" { + continue + } variants[k] = v case VariantArch: // Job name identification wins for arch, heterogenous jobs can show cluster data with From 4de7c6784b13426317e919d714e2786ce060c076 Mon Sep 17 00:00:00 2001 From: openshift-trt Date: Tue, 25 Aug 2026 12:09:49 +0000 Subject: [PATCH 4/4] test: add gcp platform variants file to gcd test case Verify that cluster data reporting gcp platform does not override the gcd platform derived from the job name. Co-Authored-By: Claude Opus 4.6 --- pkg/variantregistry/ocp_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/variantregistry/ocp_test.go b/pkg/variantregistry/ocp_test.go index 9afea20f5a..58f6899264 100644 --- a/pkg/variantregistry/ocp_test.go +++ b/pkg/variantregistry/ocp_test.go @@ -2526,6 +2526,9 @@ func TestVariantSyncer(t *testing.T) { }, { job: "periodic-ci-openshift-release-main-ci-5.0-e2e-gcd-ovn", + variantsFile: map[string]string{ + "Platform": "gcp", // should be ignored + }, expected: map[string]string{ VariantRelease: "5.0", VariantReleaseMajor: "5",