diff --git a/pkg/variantregistry/ocp.go b/pkg/variantregistry/ocp.go index 6d87251c5d..e9475cdb77 100644 --- a/pkg/variantregistry/ocp.go +++ b/pkg/variantregistry/ocp.go @@ -444,6 +444,7 @@ func setSuite(_ logrus.FieldLogger, variants map[string]string, jobName string) {"-etcd-scaling", "etcd-scaling"}, {"conformance", "parallel"}, // Jobs with "conformance" but no explicit serial are probably parallel {"usernamespace", "usernamespace"}, + {"-e2e-external-", "parallel"}, } for _, entry := range suitePatterns { @@ -760,6 +761,9 @@ func setInstaller(_ logrus.FieldLogger, variants map[string]string, jobName stri {"_hcp", "hypershift"}, {"-upi", "upi"}, {"-agent", "agent"}, + {"-e2e-external-aws", "upi"}, // clusters with platform type external can be installed in any provider with no installer automation (upi). + {"-e2e-external-vsphere", "upi"}, + {"-e2e-oci-assisted", "assisted"}, } for _, entry := range installationPatterns { @@ -803,6 +807,9 @@ func setPlatform(jLog logrus.FieldLogger, variants map[string]string, jobName st substring string platform string }{ + {"-e2e-external-aws", "external-aws"}, // platform type external can be installed in any provider. Syntax platformType(provider). + {"-e2e-external-vsphere", "external-vsphere"}, + {"-e2e-oci-assisted", "external-oci"}, {"-rosa", "rosa"}, // Keep above AWS as many ROSA jobs also mention AWS {"-aws", "aws"}, {"-alibaba", "alibaba"}, diff --git a/pkg/variantregistry/ocp_test.go b/pkg/variantregistry/ocp_test.go index 63981e1f07..42e8a6f61e 100644 --- a/pkg/variantregistry/ocp_test.go +++ b/pkg/variantregistry/ocp_test.go @@ -1248,6 +1248,62 @@ func TestVariantSyncer(t *testing.T) { VariantLayeredProduct: "virt", }, }, + { + job: "periodic-ci-openshift-release-master-nightly-4.20-e2e-external-aws", + variantsFile: map[string]string{}, + expected: map[string]string{ + VariantRelease: "4.20", + VariantReleaseMajor: "4", + VariantReleaseMinor: "20", + VariantArch: "amd64", + VariantInstaller: "upi", + VariantPlatform: "external-aws", + VariantProcedure: "none", + VariantJobTier: "candidate", + VariantNetwork: "ovn", + VariantNetworkStack: "ipv4", + VariantOwner: "eng", + VariantTopology: "ha", + VariantSuite: "parallel", + VariantUpgrade: VariantNoValue, + VariantAggregation: VariantNoValue, + VariantSecurityMode: VariantDefaultValue, + VariantFeatureSet: VariantDefaultValue, + VariantNetworkAccess: VariantDefaultValue, + VariantScheduler: VariantDefaultValue, + VariantContainerRuntime: "crun", + VariantCGroupMode: "v2", + VariantLayeredProduct: VariantNoValue, + }, + }, + { + job: "periodic-ci-openshift-release-master-nightly-4.20-e2e-external-vsphere-ccm", + variantsFile: map[string]string{}, + expected: map[string]string{ + VariantRelease: "4.20", + VariantReleaseMajor: "4", + VariantReleaseMinor: "20", + VariantArch: "amd64", + VariantInstaller: "upi", + VariantPlatform: "external-vsphere", + VariantProcedure: "none", + VariantJobTier: "candidate", + VariantNetwork: "ovn", + VariantNetworkStack: "ipv4", + VariantOwner: "eng", + VariantTopology: "ha", + VariantSuite: "parallel", + VariantUpgrade: VariantNoValue, + VariantAggregation: VariantNoValue, + VariantSecurityMode: VariantDefaultValue, + VariantFeatureSet: VariantDefaultValue, + VariantNetworkAccess: VariantDefaultValue, + VariantScheduler: VariantDefaultValue, + VariantContainerRuntime: "crun", + VariantCGroupMode: "v2", + VariantLayeredProduct: VariantNoValue, + }, + }, } 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 d51989e832..4041a6613e 100644 --- a/pkg/variantregistry/snapshot.yaml +++ b/pkg/variantregistry/snapshot.yaml @@ -9863,6 +9863,7 @@ periodic-ci-openshift-assisted-test-infra-master-e2e-oci-assisted-4-19-periodic: NetworkAccess: default NetworkStack: ipv4 Owner: eng + Platform: external-oci Procedure: none Scheduler: default SecurityMode: default @@ -9880,6 +9881,7 @@ periodic-ci-openshift-assisted-test-infra-master-e2e-oci-assisted-bm-iscsi-4-19- NetworkAccess: default NetworkStack: ipv4 Owner: eng + Platform: external-oci Procedure: none Scheduler: default SecurityMode: default @@ -164617,21 +164619,21 @@ periodic-ci-openshift-release-master-nightly-4.15-e2e-external-vsphere-ccm: CGroupMode: v2 ContainerRuntime: runc FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: vsphere + Platform: external-vsphere Procedure: none Release: "4.15" ReleaseMajor: "4" ReleaseMinor: "15" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.15-e2e-gcp-graceful-shutdown: @@ -166879,21 +166881,21 @@ periodic-ci-openshift-release-master-nightly-4.16-e2e-external-aws: CGroupMode: v2 ContainerRuntime: runc FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.16" ReleaseMajor: "4" ReleaseMinor: "16" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.16-e2e-external-aws-ccm: @@ -166902,21 +166904,21 @@ periodic-ci-openshift-release-master-nightly-4.16-e2e-external-aws-ccm: CGroupMode: v2 ContainerRuntime: runc FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.16" ReleaseMajor: "4" ReleaseMinor: "16" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.16-e2e-external-vsphere-ccm: @@ -166925,21 +166927,21 @@ periodic-ci-openshift-release-master-nightly-4.16-e2e-external-vsphere-ccm: CGroupMode: v2 ContainerRuntime: runc FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: vsphere + Platform: external-vsphere Procedure: none Release: "4.16" ReleaseMajor: "4" ReleaseMinor: "16" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-graceful-shutdown: @@ -169892,21 +169894,21 @@ periodic-ci-openshift-release-master-nightly-4.17-e2e-external-aws: CGroupMode: v2 ContainerRuntime: runc FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.17" ReleaseMajor: "4" ReleaseMinor: "17" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.17-e2e-external-aws-ccm: @@ -169915,21 +169917,21 @@ periodic-ci-openshift-release-master-nightly-4.17-e2e-external-aws-ccm: CGroupMode: v2 ContainerRuntime: runc FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.17" ReleaseMajor: "4" ReleaseMinor: "17" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.17-e2e-external-vsphere-ccm: @@ -169938,21 +169940,21 @@ periodic-ci-openshift-release-master-nightly-4.17-e2e-external-vsphere-ccm: CGroupMode: v2 ContainerRuntime: runc FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: vsphere + Platform: external-vsphere Procedure: none Release: "4.17" ReleaseMajor: "4" ReleaseMinor: "17" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.17-e2e-gcp-graceful-shutdown: @@ -173328,21 +173330,21 @@ periodic-ci-openshift-release-master-nightly-4.18-e2e-external-aws: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.18" ReleaseMajor: "4" ReleaseMinor: "18" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.18-e2e-external-aws-ccm: @@ -173351,21 +173353,21 @@ periodic-ci-openshift-release-master-nightly-4.18-e2e-external-aws-ccm: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.18" ReleaseMajor: "4" ReleaseMinor: "18" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.18-e2e-external-vsphere-ccm: @@ -173374,21 +173376,21 @@ periodic-ci-openshift-release-master-nightly-4.18-e2e-external-vsphere-ccm: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: vsphere + Platform: external-vsphere Procedure: none Release: "4.18" ReleaseMajor: "4" ReleaseMinor: "18" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.18-e2e-gcp-graceful-shutdown: @@ -177674,21 +177676,21 @@ periodic-ci-openshift-release-master-nightly-4.19-e2e-external-aws: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.19" ReleaseMajor: "4" ReleaseMinor: "19" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.19-e2e-external-aws-ccm: @@ -177697,21 +177699,21 @@ periodic-ci-openshift-release-master-nightly-4.19-e2e-external-aws-ccm: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.19" ReleaseMajor: "4" ReleaseMinor: "19" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.19-e2e-external-vsphere-ccm: @@ -177720,21 +177722,21 @@ periodic-ci-openshift-release-master-nightly-4.19-e2e-external-vsphere-ccm: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: vsphere + Platform: external-vsphere Procedure: none Release: "4.19" ReleaseMajor: "4" ReleaseMinor: "19" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.19-e2e-gcp-graceful-shutdown: @@ -182019,21 +182021,21 @@ periodic-ci-openshift-release-master-nightly-4.20-e2e-external-aws: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.20" ReleaseMajor: "4" ReleaseMinor: "20" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.20-e2e-external-aws-ccm: @@ -182042,21 +182044,21 @@ periodic-ci-openshift-release-master-nightly-4.20-e2e-external-aws-ccm: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: aws + Platform: external-aws Procedure: none Release: "4.20" ReleaseMajor: "4" ReleaseMinor: "20" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.20-e2e-external-vsphere-ccm: @@ -182065,21 +182067,21 @@ periodic-ci-openshift-release-master-nightly-4.20-e2e-external-vsphere-ccm: CGroupMode: v2 ContainerRuntime: crun FeatureSet: default - Installer: ipi + Installer: upi JobTier: informing LayeredProduct: none Network: ovn NetworkAccess: default NetworkStack: ipv4 Owner: eng - Platform: vsphere + Platform: external-vsphere Procedure: none Release: "4.20" ReleaseMajor: "4" ReleaseMinor: "20" Scheduler: default SecurityMode: default - Suite: unknown + Suite: parallel Topology: ha Upgrade: none periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-graceful-shutdown: