test: Use argoproj/argosay:v1 (#2917)

argoproj · May 1, 2020 · 1c45d5e · 1c45d5e
1 parent f311a5a
commit 1c45d5e
Show file tree

Hide file tree

Showing 43 changed files with 86 additions and 93 deletions.
diff --git a/Makefile b/Makefile
@@ -72,6 +72,7 @@ DB                    ?= postgres
 K3D                   := $(shell if [ "`kubectl config current-context`" = "k3s-default" ]; then echo true; else echo false; fi)
 # which components to start, useful if you want to disable them to debug
 COMPONENTS            := controller,argo-server
+LOG_LEVEL             := debug
 
 ifeq ($(CI),true)
 TEST_OPTS := -coverprofile=coverage.out
@@ -338,18 +339,9 @@ pull-build-images:
 	./hack/pull-build-images.sh
 
 .PHONY: test-images
-test-images: dist/cowsay-v1 dist/python-alpine3.6
-
-dist/cowsay-v1:
-	docker build -t cowsay:v1 test/e2e/images/cowsay
-ifeq ($(K3D),true)
-	k3d import-images cowsay:v1
-endif
-	touch dist/cowsay-v1
-
-dist/python-alpine3.6:
+test-images:
+	docker pull argoproj/argosay:v1
 	docker pull python:alpine3.6
-	touch dist/python-alpine3.6
 
 .PHONY: stop
 stop:
@@ -365,10 +357,10 @@ start-aux:
 	grep '127.0.0.1 *postgres' /etc/hosts
 	grep '127.0.0.1 *mysql' /etc/hosts
 ifneq ($(findstring controller,$(COMPONENTS)),)
-	ALWAYS_OFFLOAD_NODE_STATUS=true OFFLOAD_NODE_STATUS_TTL=30s WORKFLOW_GC_PERIOD=30s UPPERIO_DB_DEBUG=1 ARCHIVED_WORKFLOW_GC_PERIOD=30s ./dist/workflow-controller --executor-image argoproj/argoexec:$(VERSION) --namespaced --loglevel debug &
+	ALWAYS_OFFLOAD_NODE_STATUS=true OFFLOAD_NODE_STATUS_TTL=30s WORKFLOW_GC_PERIOD=30s UPPERIO_DB_DEBUG=1 ARCHIVED_WORKFLOW_GC_PERIOD=30s ./dist/workflow-controller --executor-image argoproj/argoexec:$(VERSION) --namespaced --loglevel $(LOG_LEVEL) &
 endif
 ifneq ($(findstring argo-server,$(COMPONENTS)),)
-	UPPERIO_DB_DEBUG=1 ./dist/argo -v server --namespaced --auth-mode client --secure &
+	UPPERIO_DB_DEBUG=1 ./dist/argo --loglevel $(LOG_LEVEL) server --namespaced --auth-mode client --secure &
 endif
 
 .PHONY: start

diff --git a/test/e2e/argo_server_test.go b/test/e2e/argo_server_test.go
@@ -220,7 +220,7 @@ func (s *ArgoServerSuite) TestPermission() {
         {
           "name": "run-workflow",
           "container": {
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "command": ["sh"],
             "args": ["-c", "sleep 1"]
           }
@@ -268,7 +268,7 @@ func (s *ArgoServerSuite) TestPermission() {
         {
           "name": "run-workflow",
           "container": {
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent",
             "command": ["sh"],
             "args": ["-c", "sleep 1"]
@@ -391,7 +391,7 @@ func (s *ArgoServerSuite) TestLintWorkflow() {
         {
           "name": "run-workflow",
           "container": {
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent"
           }
         }
@@ -422,7 +422,7 @@ func (s *ArgoServerSuite) TestCreateWorkflowDryRun() {
         {
           "name": "run-workflow",
           "container": {
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent"
           }
         }
@@ -456,7 +456,7 @@ func (s *ArgoServerSuite) TestWorkflowService() {
         {
           "name": "run-workflow",
           "container": {
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent",
             "command": ["sh"],
             "args": ["-c", "sleep 10"]
@@ -612,7 +612,7 @@ func (s *ArgoServerSuite) TestCronWorkflowService() {
           {
             "name": "whalesay",
             "container": {
-              "image": "cowsay:v1",
+              "image": "argoproj/argosay:v1",
               "imagePullPolicy": "IfNotPresent"
             }
           }
@@ -650,7 +650,7 @@ spec:
     templates:
       - name: whalesay
         container:
-          image: cowsay:v1
+          image: argoproj/argosay:v1
           imagePullPolicy: IfNotPresent
           command: ["sh", -c]
           args: ["echo hello"]
@@ -702,7 +702,7 @@ spec:
           {
             "name": "whalesay",
             "container": {
-              "image": "cowsay:v1",
+              "image": "argoproj/argosay:v1",
               "imagePullPolicy": "IfNotPresent"
             }
           }
@@ -859,7 +859,7 @@ spec:
   templates:
     - name: run-archie
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: [cowsay, ":) Hello Argo!"]
         imagePullPolicy: IfNotPresent`).
 		When().
@@ -881,7 +881,7 @@ spec:
   templates:
     - name: run-betty
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: [cowsay, ":) Hello Argo!"]
         imagePullPolicy: IfNotPresent`).
 		When().
@@ -1009,7 +1009,7 @@ func (s *ArgoServerSuite) TestWorkflowTemplateService() {
           "name": "run-workflow",
           "container": {
             "name": "",
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent"
           }
         }
@@ -1038,7 +1038,7 @@ func (s *ArgoServerSuite) TestWorkflowTemplateService() {
           "name": "run-workflow",
           "container": {
             "name": "",
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent"
           }
         }
@@ -1101,7 +1101,7 @@ func (s *ArgoServerSuite) TestWorkflowTemplateService() {
           "name": "run-workflow",
           "container": {
             "name": "",
-            "image": "cowsay:v2",
+            "image": "argoproj/argosay:v2",
             "imagePullPolicy": "IfNotPresent"
           }
         }
@@ -1114,7 +1114,7 @@ func (s *ArgoServerSuite) TestWorkflowTemplateService() {
 			Status(200).
 			JSON().
 			Path("$.spec.templates[0].container.image").
-			Equal("cowsay:v2")
+			Equal("argoproj/argosay:v2")
 	})
 
 	s.Run("Delete", func() {
@@ -1142,7 +1142,7 @@ func (s *ArgoServerSuite) TestSubmitWorkflowFromResource() {
           "name": "run-workflow",
           "container": {
             "name": "",
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent"
           }
         }
@@ -1184,7 +1184,7 @@ func (s *ArgoServerSuite) TestSubmitWorkflowFromResource() {
           {
             "name": "whalesay",
             "container": {
-              "image": "cowsay:v1",
+              "image": "argoproj/argosay:v1",
               "imagePullPolicy": "IfNotPresent"
             }
           }
@@ -1225,7 +1225,7 @@ func (s *ArgoServerSuite) TestSubmitWorkflowFromResource() {
           "name": "run-workflow",
           "container": {
             "name": "",
-            "image": "cowsay:v1",
+            "image": "argoproj/argosay:v1",
             "imagePullPolicy": "IfNotPresent"
           }
         }

diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go
@@ -379,7 +379,7 @@ func (s *CLISuite) TestWorkflowDelete() {
 	})
 	s.Run("DeleteCompleted", func() {
 		s.Given().
-			Workflow("@smoke/basic.yaml").
+			Workflow("@testdata/sleep-3s.yaml").
 			When().
 			SubmitWorkflow().
 			Given().
@@ -394,7 +394,7 @@ func (s *CLISuite) TestWorkflowDelete() {
 			Given().
 			RunCli([]string{"delete", "--completed", "-l", "argo-e2e"}, func(t *testing.T, output string, err error) {
 				if assert.NoError(t, err) {
-					assert.Contains(t, output, "Workflow 'basic' deleted")
+					assert.Contains(t, output, "deleted")
 				}
 			})
 	})

diff --git a/test/e2e/expectedfailures/dag-disable-failFast.yaml b/test/e2e/expectedfailures/dag-disable-failFast.yaml
@@ -7,7 +7,7 @@ spec:
   templates:
   - name: a
     container:
-      image:  cowsay:v1
+      image:  argoproj/argosay:v1
       command: [cowsay]
       args: ["hello world"]
   - name: b
@@ -26,7 +26,7 @@ spec:
       args: ["echo intentional failure; exit 2"]
   - name: d
     container:
-      image: cowsay:v1
+      image: argoproj/argosay:v1
       command: [cowsay]
       args: ["hello world"]
   - name: statis

diff --git a/test/e2e/expectedfailures/dag-disbale-failFast-2.yaml b/test/e2e/expectedfailures/dag-disbale-failFast-2.yaml
@@ -7,31 +7,31 @@ spec:
   templates:
   - name: a
     container:
-      image:  cowsay:v1
+      image:  argoproj/argosay:v1
       command: [cowsay]
       args: ["hello world"]
   - name: b
     retryStrategy:
       limit: 2
     container:
-      image: alpine:latest
+      image: argoproj/argosay:v1
       command: [sh, -c]
       args: ["sleep 30; echo haha"]
   - name: c
     retryStrategy:
       limit: 3
     container:
-      image: alpine:latest
+      image: argoproj/argosay:v1
       command: [sh, -c]
       args: ["echo intentional failure; exit 2"]
   - name: d
     container:
-      image: alpine:latest
+      image: argoproj/argosay:v1
       command: [sh, -c]
       args: ["echo intentional failure; exit 2"]
   - name: e
     container:
-      image: alpine:latest
+      image: argoproj/argosay:v1
       command: [sh, -c]
       args: ["sleep 30; echo haha"]
   - name: statis

diff --git a/test/e2e/expectedfailures/dag-noroot-branch-failed.yaml b/test/e2e/expectedfailures/dag-noroot-branch-failed.yaml
@@ -7,7 +7,7 @@ spec:
   templates:
   - name: a
     container:
-      image:  cowsay:v1
+      image:  argoproj/argosay:v1
       command: [cowsay]
       args: ["hello world"]
   - name: b
@@ -26,7 +26,7 @@ spec:
       args: ["echo intentional failure; exit 2"]
   - name: d
     container:
-      image: cowsay:v1
+      image: argoproj/argosay:v1
       command: [cowsay]
       args: ["hello world"]
   - name: statis

diff --git a/test/e2e/expectedfailures/empty-parameter-dag.yaml b/test/e2e/expectedfailures/empty-parameter-dag.yaml
@@ -25,6 +25,6 @@ spec:
         parameters:
           - name: message
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: [cowsay]
         args: ["{{inputs.parameters.message}}"]
diff --git a/test/e2e/expectedfailures/empty-parameter-steps.yaml b/test/e2e/expectedfailures/empty-parameter-steps.yaml
@@ -24,6 +24,6 @@ spec:
         parameters:
           - name: message
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: [cowsay]
         args: ["{{inputs.parameters.message}}"]
diff --git a/test/e2e/expectedfailures/failed-step-event.yaml b/test/e2e/expectedfailures/failed-step-event.yaml
@@ -12,5 +12,5 @@ spec:
   templates:
     - name: exit
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: [sh, -c, exit 1]
diff --git a/test/e2e/expectedfailures/output-artifact-not-optional.yaml b/test/e2e/expectedfailures/output-artifact-not-optional.yaml
@@ -14,7 +14,7 @@ spec:
 
     - name: whalesay
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: [sh, -c]
         args: ["cowsay hello world | tee /tmp/hello_world12.txt"]
       outputs:

diff --git a/test/e2e/expectedfailures/volumes-pvc-fail-event.yaml b/test/e2e/expectedfailures/volumes-pvc-fail-event.yaml
@@ -27,7 +27,7 @@ spec:
 
   - name: whalesay
     container:
-      image: cowsay:v1
+      image: argoproj/argosay:v1
       command: [sh, -c]
       args: ["echo generating message in volume; cowsay hello world | tee /mnt/vol/hello_world.txt"]
       volumeMounts:
@@ -36,7 +36,7 @@ spec:
 
   - name: print-message
     container:
-      image: cowsay:v1
+      image: argoproj/argosay:v1
       command: [sh, -c]
       args: ["echo getting message from volume; find /mnt/vol; cat /mnt/vol/hello_world.txt"]
       volumeMounts:

diff --git a/test/e2e/fixtures/given.go b/test/e2e/fixtures/given.go
@@ -75,7 +75,7 @@ func (g *Given) checkImages(templates []wfv1.Template) {
 	// downloaded or evicted. To keep tests fast and reliable you must use whitelisted images.
 	imageWhitelist := map[string]bool{
 		"argoexec:" + imageTag: true,
-		"cowsay:v1":            true,
+		"argoproj/argosay:v1":  true,
 		"python:alpine3.6":     true,
 	}
 	for _, t := range templates {

diff --git a/test/e2e/functional/artifact-input-output-samedir.yaml b/test/e2e/functional/artifact-input-output-samedir.yaml
@@ -34,7 +34,7 @@ spec:
   # generate a folder structure with directories
   - name: generate
     script:
-      image: cowsay:v1
+      image: argoproj/argosay:v1
       command: [sh, -xe]
       source: |
         sleep 1
@@ -61,7 +61,7 @@ spec:
       - name: hello
         path: /hello.txt
     container:
-      image: cowsay:v1
+      image: argoproj/argosay:v1
       command: [sh, -c]
       args: ["
         sleep 1 &&

diff --git a/test/e2e/functional/continue-on-failed.yaml b/test/e2e/functional/continue-on-failed.yaml
@@ -28,9 +28,9 @@ spec:
 
     - name: whalesay
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
 
     - name: whalesplosion
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: ["sh", "-c", "sleep 5 ; exit 1"]
diff --git a/test/e2e/functional/custom_template_variable.yaml b/test/e2e/functional/custom_template_variable.yaml
@@ -27,6 +27,6 @@ spec:
         parameters:
           - name: message
       container:
-        image: cowsay:v1
+        image: argoproj/argosay:v1
         command: [cowsay]
         args: ["{{custom.variable}}"]
diff --git a/test/e2e/functional/global-parameters-complex.yaml b/test/e2e/functional/global-parameters-complex.yaml
@@ -44,6 +44,6 @@ spec:
       - name: message3
       - name: message4
     container:
-      image: cowsay:v1
+      image: argoproj/argosay:v1
       command: [cowsay]
       args: ["Global 1: {{workflow.parameters.message1}} Input 1: {{inputs.parameters.message1}} Input 2/Steps Input 1/Global 1: {{inputs.parameters.message2}} Input 3/Global 2: {{inputs.parameters.message3}} Input4/Steps Input 2 internal/Global 1: {{inputs.parameters.message4}}"]