Skip to content

TRT-2907: Add gcd platform to 5.1-main and 4.23-main views #3939

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 25, 2026
Merged

TRT-2907: Add gcd platform to 5.1-main and 4.23-main views #3939

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
4d84967
fix(config): add gcd platform to 5.1-main and 4.23-main views
Aug 24, 2026
56d27f2
test: add unit test for gcd platform variant parsing
Aug 24, 2026
f82b659
fix(variant): skip cluster data platform override for gcd
Aug 25, 2026
4de7c67
test: add gcp platform variants file to gcd test case
Aug 25, 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
2 changes: 2 additions & 0 deletions config/views.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ component_readiness:
- aws
- azure
- gcp
- gcd
- metal
- vsphere
Topology:
Expand Down Expand Up @@ -2381,6 +2382,7 @@ component_readiness:
- aws
- azure
- gcp
- gcd
- metal
- vsphere
Topology:
Expand Down
4 changes: 4 additions & 0 deletions pkg/variantregistry/ocp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions pkg/variantregistry/ocp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2524,6 +2524,39 @@ func TestVariantSyncer(t *testing.T) {
VariantCapability: "NoRegistryClusterInstall",
},
},
{
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",
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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/variantregistry/snapshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down