Ok so e2e tests don't like reusing names

argoproj · Feb 5, 2021 · 7ecce4f · 7ecce4f
1 parent 1b1197a
commit 7ecce4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/test/e2e/bluegreen_test.go b/test/e2e/bluegreen_test.go
@@ -70,7 +70,7 @@ func (s *BlueGreenSuite) TestEphemeralMetadata() {
 apiVersion: v1
 kind: Service
 metadata:
-  name: ephemeral-metadata
+  name: ephemeral-metadata-bg
 spec:
   ports:
   - port: 80
@@ -83,7 +83,7 @@ spec:
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
 metadata:
-  name: ephemeral-metadata
+  name: ephemeral-metadata-bg
 spec:
   replicas: 2
   strategy:
@@ -94,15 +94,15 @@ spec:
       activeMetadata:
         labels:
           role: active
-      activeService: ephemeral-metadata
+      activeService: ephemeral-metadata-bg
       autoPromotionEnabled: false
   selector:
     matchLabels:
-      app: ephemeral-metadata
+      app: ephemeral-metadata-bg
   template:
     metadata:
       labels:
-        app: ephemeral-metadata
+        app: ephemeral-metadata-bg
     spec:
       containers:
       - name: ephemeral-metadata

diff --git a/test/e2e/canary_test.go b/test/e2e/canary_test.go
@@ -280,7 +280,7 @@ func (s *CanarySuite) TestEphemeralMetadata() {
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
 metadata:
-  name: ephemeral-metadata
+  name: ephemeral-metadata-canary
 spec:
   replicas: 2
   strategy:
@@ -296,11 +296,11 @@ spec:
       - pause: {}
   selector:
     matchLabels:
-      app: ephemeral-metadata
+      app: ephemeral-metadata-canary
   template:
     metadata:
       labels:
-        app: ephemeral-metadata
+        app: ephemeral-metadata-canary
     spec:
       containers:
       - name: ephemeral-metadata
@@ -313,7 +313,6 @@ spec:
 		When().
 		ApplyManifests().
 		WaitForRolloutReplicas(2).
-		Sleep(2*time.Second).
 		Then().
 		ExpectPods("all pods have stable metadata", podsHaveStableMetadata).
 		When().