diff --git a/config/views.yaml b/config/views.yaml index c0b21cc87..28f61ed79 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: diff --git a/pkg/variantregistry/ocp.go b/pkg/variantregistry/ocp.go index 7916e815c..4bbadf7eb 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 diff --git a/pkg/variantregistry/ocp_test.go b/pkg/variantregistry/ocp_test.go index 9f772258d..58f689926 100644 --- a/pkg/variantregistry/ocp_test.go +++ b/pkg/variantregistry/ocp_test.go @@ -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) { diff --git a/pkg/variantregistry/snapshot.yaml b/pkg/variantregistry/snapshot.yaml index 4558bf863..cc6e457d9 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