NO-JIRA: ote: fix duplicated topology label on SingleReplica

mtulio · mtulio · commit 2926066cfd87 · 2026-02-04T17:45:51.000-03:00
Previously the SingleReplica job was setting duplicated topology label: ~~~ topology="[SingleReplica SingleReplica]" ~~~ https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/openshift-origin-30747-ci-4.22-e2e-aws-upgrade-ovn-single-node/2018312069375332352/artifacts/e2e-aws-upgrade-ovn-single-node/single-node-e2e-test/build-log.txt This fix skips re-adding the label when running in a SingleReplica cluster.
diff --git a/pkg/test/ginkgo/cmd_runsuite.go b/pkg/test/ginkgo/cmd_runsuite.go
@@ -1228,9 +1228,12 @@ func determineEnvironmentFlags(ctx context.Context, upgrade bool, dryRun bool) (
 			envFlagBuilder.AddOptionalCapability(string(optionalCapability))
 		}
 
-		envFlagBuilder.
-			AddTopology(clusterState.ControlPlaneTopology).
-			AddVersion(clusterState.Version.Status.Desired.Version)
+		envFlagBuilder.AddVersion(clusterState.Version.Status.Desired.Version)
+
+		// SingleReplica is duplicated in the topology flag, so we don't need to add it here if it's set.
+		if !config.SingleReplicaTopology {
+			envFlagBuilder.AddTopology(clusterState.ControlPlaneTopology)
+		}
 	}
 
 	return envFlagBuilder.Build(), nil

Original file line number	Diff line number	Diff line change
`@@ -1228,9 +1228,12 @@ func determineEnvironmentFlags(ctx context.Context, upgrade bool, dryRun bool) (`
`1228`	`1228`	`envFlagBuilder.AddOptionalCapability(string(optionalCapability))`
`1229`	`1229`	`}`
`1230`	`1230`
`1231`		`- envFlagBuilder.`
`1232`		`- AddTopology(clusterState.ControlPlaneTopology).`
`1233`		`- AddVersion(clusterState.Version.Status.Desired.Version)`
	`1231`	`+ envFlagBuilder.AddVersion(clusterState.Version.Status.Desired.Version)`
	`1232`	`+`
	`1233`	`+ // SingleReplica is duplicated in the topology flag, so we don't need to add it here if it's set.`
	`1234`	`+ if !config.SingleReplicaTopology {`
	`1235`	`+ envFlagBuilder.AddTopology(clusterState.ControlPlaneTopology)`
	`1236`	`+ }`
`1234`	`1237`	`}`
`1235`	`1238`
`1236`	`1239`	`return envFlagBuilder.Build(), nil`