rebase and some fixes

stackrox · Dec 16, 2024 · d7b23d7 · d7b23d7
1 parent 3dc51b6
commit d7b23d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/e2e/multicluster/multicluster_migration_test.go b/e2e/multicluster/multicluster_migration_test.go
@@ -26,8 +26,14 @@ const (
 	dpCloudProvider = "standalone"
 	dpRegion        = "standalone"
 	// the cluster ids configured for given clusters in fleet-manager's cluster config
-	cluster1ID = "cluster-1-id"
-	cluster2ID = "cluster-2-id"
+
+	// This assumes the ID used for cluster configuration
+	// REPO/dev/config/dataplane-cluster-configuration.yaml
+	cluster1ID = "1234567890abcdef1234567890abcdef" // pragma: allowlist secret
+
+	// This assumes the ID set for cluster 2 in deploy script
+	// $REPO/scripts/ci/multicluster_tests/deploy.sh
+	cluster2ID = "1234567890abcdef1234567890abcdeg" // pragma: allowlist secret
 )
 
 var (
@@ -86,7 +92,7 @@ var _ = Describe("Central Migration Test", Ordered, func() {
 		}
 	})
 
-	Describe("CentralRequest pre migration", Ordered, func() {
+	Describe("CentralRequest pre migration", func() {
 		It("should be assigned to cluster1", func() {
 			assertClusterAssignment(cluster1ID, centralRequest.Id, fleetmanagerAdminClient)
 		})
@@ -137,7 +143,7 @@ var _ = Describe("Central Migration Test", Ordered, func() {
 		Expect(err).ToNot(HaveOccurred())
 	})
 
-	Describe("CentralRequest post migration", Ordered, func() {
+	Describe("CentralRequest post migration", func() {
 		It("should be assigned to cluster2", func() {
 			assertClusterAssignment(cluster1ID, centralRequest.Id, fleetmanagerAdminClient)
 		})

diff --git a/e2e/multicluster/multicluster_suite_test.go b/e2e/multicluster/multicluster_suite_test.go
@@ -76,5 +76,4 @@ var _ = BeforeSuite(func() {
 
 		route53Client = route53.New(sess)
 	}
-
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,5 +76,4 @@ var _ = BeforeSuite(func() {

		route53Client = route53.New(sess)
		}

		})