test: Minor refactors to TestStoppedWorkflow ArtifactGC test. Fixes a…

…rgoproj#11879

Signed-off-by: Garett MacGowan <garettsoftware@gmail.com>

test/e2e/artifacts_test.go

@@ -120,20 +120,7 @@ func (s *ArtifactsSuite) TestStoppedWorkflow() {
 
 	when.
 		DeleteWorkflow().
-		WaitForWorkflow(
-			fixtures.WorkflowCompletionOkay(true),
-			fixtures.Condition(func(wf *wfv1.Workflow) (bool, string) {
-
-				condition := "for artifact to not exist"
-
-				_, err = c.StatObject(context.Background(), "my-bucket-3", "on-deletion-wf-stopped", minio.StatObjectOptions{})
-
-				if err != nil {
-					return true, condition
-				}
-
-				return false, condition
-			}))
+		WaitForWorkflowDeletion()
 
 	then = when.Then()
 

test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml

@@ -21,15 +21,6 @@ spec:
         resources:
           requests:
             storage: 1Gi
-  # How long to keep workflows around after they have completed https://argoproj.github.io/argo-workflows/fields/#ttlstrategy
-  # ttlStrategy:
-  #   # 30 seconds
-  #   secondsAfterCompletion: 30
-  #   secondsAfterSuccess: 30
-  #   secondsAfterFailure: 30
-  # podGC:
-  #   deleteDelayDuration: 15s
-  #   strategy: "OnWorkflowCompletion"
   templates:
     - name: artgc-dag-wf-stopped-main
       dag:
@@ -72,6 +63,9 @@ spec:
           - --namespace=argo
           - --loglevel=debug
     - name: artgc-dag-artifact-creator
+      metadata:
+        labels:
+          template: "artgc-dag-artifact-creator"
       container:
         image: alpine:latest
         volumeMounts: