Skip to content

NO-JIRA: match external platform #2624

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
May 28, 2025
Merged

NO-JIRA: match external platform #2624

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
cd861b7
NO-JIRA: match external topology
neisw May 21, 2025
3cf9153
platform-external jobs: attributes suggestions
mtulio May 21, 2025
5164880
NO-JIRA: manage external variants
neisw May 21, 2025
b05d098
NO-JIRA: update platform
neisw May 22, 2025
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
7 changes: 7 additions & 0 deletions pkg/variantregistry/ocp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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"},
Expand Down
56 changes: 56 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 @@ -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) {
Expand Down
Loading