From 65b5c59bcbba66287cd5fbe94350cd7ec9bb6b17 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex_collins@intuit.com>
Date: Tue, 30 Jun 2020 11:17:30 -0700
Subject: [PATCH] test: Add e2e tags

---
 Makefile                                   | 21 +++++----------------
 test/e2e/argo_server_test.go               |  2 ++
 test/e2e/cli_test.go                       |  2 ++
 test/e2e/cli_with_server_test.go           |  2 ++
 test/e2e/cluster_workflow_template_test.go |  2 ++
 test/e2e/cron_test.go                      |  2 ++
 test/e2e/functional_test.go                |  2 ++
 test/e2e/metrics_test.go                   |  2 ++
 test/e2e/smoke_test.go                     |  2 ++
 test/e2e/workflow_template_test.go         |  2 ++
 10 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 15e622e1913e..101e1270557d 100644
--- a/Makefile
+++ b/Makefile
@@ -319,7 +319,7 @@ endif
 .PHONY: test
 test: server/static/files.go
 	@mkdir -p test-results
-	go test -v $(TEST_OPTS) `go list ./... | grep -v 'test/e2e'` 2>&1 | tee test-results/test.out
+	go test -v $(TEST_OPTS) ./... 2>&1 | tee test-results/test.out
 
 test-results/test-report.json: test-results/test.out
 	cat test-results/test.out | go tool test2json > test-results/test-report.json
@@ -430,30 +430,19 @@ mysql-cli:
 test-e2e: test-images cli
 	# Run E2E tests
 	@mkdir -p test-results
-	go test -timeout 15m -v -count 1 -p 1 --short ./test/e2e/... 2>&1 | tee test-results/test.out
+	go test -timeout 15m -v -count 1 --tags e2e -p 1 --short ./test/e2e 2>&1 | tee test-results/test.out
 
 .PHONY: test-e2e-cron
 test-e2e-cron: test-images cli
 	# Run E2E tests
 	@mkdir -p test-results
-	go test -timeout 5m -v -count 1 -parallel 10 -run CronSuite ./test/e2e 2>&1 | tee test-results/test.out
+	go test -timeout 5m -v -count 1 --tags e2e -parallel 10 -run CronSuite ./test/e2e 2>&1 | tee test-results/test.out
 
 .PHONY: smoke
 smoke: test-images
 	# Run smoke tests
 	@mkdir -p test-results
-	go test -timeout 1m -v -count 1 -p 1 -run SmokeSuite ./test/e2e 2>&1 | tee test-results/test.out
-
-.PHONY: test-api
-test-api:
-	# Run API tests
-	go test -timeout 1m -v -count 1 -p 1 -run ArgoServerSuite ./test/e2e
-
-.PHONY: test-cli
-test-cli: cli
-	# Run CLI tests
-	go test -timeout 2m -v -count 1 -p 1 -run CLISuite ./test/e2e
-	go test -timeout 2m -v -count 1 -p 1 -run CLIWithServerSuite ./test/e2e
+	go test -timeout 1m -v -count 1 --tags e2e -p 1 -run SmokeSuite ./test/e2e 2>&1 | tee test-results/test.out
 
 # clean
 
@@ -523,7 +512,7 @@ docs: swagger
 # pre-push
 
 .PHONY: pre-commit
-pre-commit: test lint codegen manifests start smoke test-api test-cli
+pre-commit: test lint codegen start
 
 # release - targets only available on release branch
 ifneq ($(findstring release,$(GIT_BRANCH)),)
diff --git a/test/e2e/argo_server_test.go b/test/e2e/argo_server_test.go
index 16888e93b213..53845847f138 100644
--- a/test/e2e/argo_server_test.go
+++ b/test/e2e/argo_server_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go
index 1a7790007de0..98decdbc78c0 100644
--- a/test/e2e/cli_test.go
+++ b/test/e2e/cli_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/cli_with_server_test.go b/test/e2e/cli_with_server_test.go
index 941863d51139..5e5c34fc0f24 100644
--- a/test/e2e/cli_with_server_test.go
+++ b/test/e2e/cli_with_server_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/cluster_workflow_template_test.go b/test/e2e/cluster_workflow_template_test.go
index 56c8fa434351..5122b9e43a76 100644
--- a/test/e2e/cluster_workflow_template_test.go
+++ b/test/e2e/cluster_workflow_template_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/cron_test.go b/test/e2e/cron_test.go
index 8fa7948139e4..dce1d1daab65 100644
--- a/test/e2e/cron_test.go
+++ b/test/e2e/cron_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/functional_test.go b/test/e2e/functional_test.go
index e09f13764095..31f74b049cf7 100644
--- a/test/e2e/functional_test.go
+++ b/test/e2e/functional_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/metrics_test.go b/test/e2e/metrics_test.go
index d4491a81bb8e..26300b57ef28 100644
--- a/test/e2e/metrics_test.go
+++ b/test/e2e/metrics_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/smoke_test.go b/test/e2e/smoke_test.go
index 774caa98e561..04670e269cd2 100644
--- a/test/e2e/smoke_test.go
+++ b/test/e2e/smoke_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
diff --git a/test/e2e/workflow_template_test.go b/test/e2e/workflow_template_test.go
index 0277e6bc3257..e22a004f534e 100644
--- a/test/e2e/workflow_template_test.go
+++ b/test/e2e/workflow_template_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (