NO-JIRA: match external topology

Author: neisw

pkg/variantregistry/ocp.go

@@ -731,10 +731,21 @@ func setTopology(_ logrus.FieldLogger, variants map[string]string, jobName strin
 		{"-hypershift", "external"},
 		{"-hcp", "external"},
 		{"_hcp", "external"},
+		{"-external", "external"},
 		{"-compact", "compact"},
 		{"-microshift", "microshift"},
 	}
 
+	// the use of external-lb in these cases do not apply to topology so drop them out from evaluation
+	ignorePatterns := []string{"-external-lb-", "-externallb", "-ingress-external-"}
+	for _, ignore := range ignorePatterns {
+		replace := "-"
+		if ignore[len(ignore)-1] != '-' {
+			replace = ""
+		}
+		jobNameLower = strings.ReplaceAll(jobNameLower, ignore, replace)
+	}
+
 	for _, entry := range topologyPatterns {
 		if strings.Contains(jobNameLower, entry.substring) {
 			variants[VariantTopology] = entry.topology

pkg/variantregistry/snapshot.yaml

@@ -9544,7 +9544,7 @@ periodic-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-external-4-1
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-ipv4v6-4-19-periodic:
     Aggregation: none
@@ -53540,7 +53540,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-vsphere-upi-platform-external-f28-destructive:
     Aggregation: none
@@ -53563,7 +53563,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-vsphere-upi-platform-none-f28:
     Aggregation: none
@@ -64145,7 +64145,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-vsphere-upi-platform-external-f28-destructive:
     Aggregation: none
@@ -64168,7 +64168,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-vsphere-upi-platform-none-f28:
     Aggregation: none
@@ -74893,7 +74893,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-vsphere-upi-platform-external-f28-destructive:
     Aggregation: none
@@ -74916,7 +74916,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-vsphere-upi-platform-none-f28:
     Aggregation: none
@@ -86949,7 +86949,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-vsphere-upi-platform-external-f28-destructive:
     Aggregation: none
@@ -86972,7 +86972,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-vsphere-upi-platform-none-f28:
     Aggregation: none
@@ -100083,7 +100083,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-vsphere-upi-platform-external-f28-destructive:
     Aggregation: none
@@ -100106,7 +100106,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-vsphere-upi-platform-none-f28:
     Aggregation: none
@@ -113164,7 +113164,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-vsphere-upi-platform-external-f28-destructive:
     Aggregation: none
@@ -113187,7 +113187,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-vsphere-upi-platform-none-f28:
     Aggregation: none
@@ -125946,7 +125946,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-vsphere-upi-platform-external-f28-destructive:
     Aggregation: none
@@ -125969,7 +125969,7 @@ periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-vsphere
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-vsphere-upi-platform-none-f28:
     Aggregation: none
@@ -143579,7 +143579,7 @@ periodic-ci-openshift-release-master-ci-4.16-e2e-external-aws:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-ci-4.16-e2e-external-aws-ccm:
     Aggregation: none
@@ -143602,7 +143602,7 @@ periodic-ci-openshift-release-master-ci-4.16-e2e-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-cilium:
     Aggregation: none
@@ -164678,7 +164678,7 @@ periodic-ci-openshift-release-master-nightly-4.15-e2e-external-vsphere-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.15-e2e-gcp-graceful-shutdown:
     Aggregation: none
@@ -166940,7 +166940,7 @@ periodic-ci-openshift-release-master-nightly-4.16-e2e-external-aws:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.16-e2e-external-aws-ccm:
     Aggregation: none
@@ -166963,7 +166963,7 @@ periodic-ci-openshift-release-master-nightly-4.16-e2e-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.16-e2e-external-vsphere-ccm:
     Aggregation: none
@@ -166986,7 +166986,7 @@ periodic-ci-openshift-release-master-nightly-4.16-e2e-external-vsphere-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-graceful-shutdown:
     Aggregation: none
@@ -168715,7 +168715,7 @@ periodic-ci-openshift-release-master-nightly-4.16-opct-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.16-telco5g-network-flow-matrix-bm:
     Aggregation: none
@@ -169953,7 +169953,7 @@ periodic-ci-openshift-release-master-nightly-4.17-e2e-external-aws:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.17-e2e-external-aws-ccm:
     Aggregation: none
@@ -169976,7 +169976,7 @@ periodic-ci-openshift-release-master-nightly-4.17-e2e-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.17-e2e-external-vsphere-ccm:
     Aggregation: none
@@ -169999,7 +169999,7 @@ periodic-ci-openshift-release-master-nightly-4.17-e2e-external-vsphere-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.17-e2e-gcp-graceful-shutdown:
     Aggregation: none
@@ -171801,7 +171801,7 @@ periodic-ci-openshift-release-master-nightly-4.17-opct-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.17-telco5g-network-flow-matrix-bm:
     Aggregation: none
@@ -173389,7 +173389,7 @@ periodic-ci-openshift-release-master-nightly-4.18-e2e-external-aws:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.18-e2e-external-aws-ccm:
     Aggregation: none
@@ -173412,7 +173412,7 @@ periodic-ci-openshift-release-master-nightly-4.18-e2e-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.18-e2e-external-vsphere-ccm:
     Aggregation: none
@@ -173435,7 +173435,7 @@ periodic-ci-openshift-release-master-nightly-4.18-e2e-external-vsphere-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.18-e2e-gcp-graceful-shutdown:
     Aggregation: none
@@ -176255,7 +176255,7 @@ periodic-ci-openshift-release-master-nightly-4.18-opct-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.18-telco5g-network-flow-matrix-bm:
     Aggregation: none
@@ -177735,7 +177735,7 @@ periodic-ci-openshift-release-master-nightly-4.19-e2e-external-aws:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.19-e2e-external-aws-ccm:
     Aggregation: none
@@ -177758,7 +177758,7 @@ periodic-ci-openshift-release-master-nightly-4.19-e2e-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.19-e2e-external-vsphere-ccm:
     Aggregation: none
@@ -177781,7 +177781,7 @@ periodic-ci-openshift-release-master-nightly-4.19-e2e-external-vsphere-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.19-e2e-gcp-graceful-shutdown:
     Aggregation: none
@@ -180626,7 +180626,7 @@ periodic-ci-openshift-release-master-nightly-4.19-opct-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.19-telco5g-network-flow-matrix-bm:
     Aggregation: none
@@ -182057,7 +182057,7 @@ periodic-ci-openshift-release-master-nightly-4.20-e2e-external-aws:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.20-e2e-external-aws-ccm:
     Aggregation: none
@@ -182080,7 +182080,7 @@ periodic-ci-openshift-release-master-nightly-4.20-e2e-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.20-e2e-external-vsphere-ccm:
     Aggregation: none
@@ -182103,7 +182103,7 @@ periodic-ci-openshift-release-master-nightly-4.20-e2e-external-vsphere-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-graceful-shutdown:
     Aggregation: none
@@ -184947,7 +184947,7 @@ periodic-ci-openshift-release-master-nightly-4.20-opct-external-aws-ccm:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-openshift-release-master-nightly-4.20-telco5g-network-flow-matrix-bm:
     Aggregation: none
@@ -200657,7 +200657,7 @@ periodic-ci-redhat-openshift-ecosystem-opct-main-4.19-platform-external-vsphere:
     Scheduler: default
     SecurityMode: default
     Suite: unknown
-    Topology: ha
+    Topology: external
     Upgrade: none
 periodic-ci-redhat-openshift-ecosystem-opct-main-4.19-platform-none-vsphere:
     Aggregation: none