Add junit reports to e2e (#183)

Author: gssbzn

.evergreen.yml

@@ -79,8 +79,10 @@ functions:
           MCLI_PRIVATE_API_KEY: ${atlas_private_api_key}
           MCLI_PUBLIC_API_KEY: ${atlas_public_api_key}
           MCLI_SERVICE: cloud
+          E2E_CMD: gotestsum --junitfile e2e-tests.xml --
+          E2E_TAGS: e2e,atlas
           <<: *go_options
-        command: make e2e-test-atlas
+        command: make e2e-test
   "cloud manager e2e":
     - command: subprocess.exec
       type: test
@@ -96,8 +98,10 @@ functions:
           MCLI_PRIVATE_API_KEY: ${cloud_manager_private_api_key}
           MCLI_PUBLIC_API_KEY: ${cloud_manager_public_api_key}
           MCLI_SERVICE: cloud-manager
+          E2E_CMD: gotestsum --junitfile e2e-tests.xml --
+          E2E_TAGS: e2e,cloudmanager
           <<: *go_options
-        command: make e2e-test-cloud
+        command: make e2e-test
   "lint":
     - command: shell.exec
       type: test
@@ -382,15 +386,23 @@ tasks:
       - func: "lint"
   - name: atlas_e2e
     tags: ["e2e"]
+    depends_on:
+      - name: compile
+        variant: "code_health"
+        patch_optional: true
     commands:
       - func: "clone"
-      - func: "build"
+      - func: "install gotestsum"
       - func: "atlas e2e"
   - name: cloud_manager_e2e
     tags: ["e2e"]
+    depends_on:
+      - name: compile
+        variant: "code_health"
+        patch_optional: true
     commands:
       - func: "clone"
-      - func: "build"
+      - func: "install gotestsum"
       - func: "cloud manager e2e"
   - name: package_msi
     tags: ["packaging"]
@@ -952,9 +964,7 @@ buildvariants:
       go_root: "/opt/golang/go1.14"
       go_bin: "/opt/golang/go1.14/bin"
     tasks:
-      - name: compile
-      - name: unit_test
-      - name: lint
+      - name: .code_health
   - name: e2e
     display_name: "E2E"
     run_on:
@@ -963,8 +973,7 @@ buildvariants:
       go_root: "/opt/golang/go1.14"
       go_bin: "/opt/golang/go1.14/bin"
     tasks:
-      - name: atlas_e2e
-      - name: cloud_manager_e2e
+      - name: .e2e
   - name: goreleaser_snaphot
     display_name: "Packaging and Publishing (goreleaser, apt, yum)"
     run_on:

Makefile

@@ -9,6 +9,9 @@ COVERAGE=coverage.out
 VERSION=$(shell git describe --always --tags)
 LINKER_FLAGS=-X github.com/mongodb/mongocli/internal/version.Version=${VERSION}
 
+E2E_CMD?=go test
+E2E_TAGS?=e2e
+
 export PATH := ./bin:$(PATH)
 export GO111MODULE := on
 
@@ -88,25 +91,11 @@ build: ## Generate a binary in ./bin
 	@echo "==> Building binary"
 	go build -ldflags "${LINKER_FLAGS}" -o ${DESTINATION}
 
-.PHONY: e2e-test-atlas
-e2e-test-atlas: build ## Run Atlas E2E tests
-	@echo "==> Running Atlas E2E tests..."
-	# the target assumes the MCLI-* environment variables are exported
-	go test -v -p 1 -parallel 1 -tags=e2e ./e2e/atlas...
-	go test -v -p 1 -parallel 1 -tags=e2e ./e2e/iam...
-
-.PHONY: e2e-test-cloud
-e2e-test-cloud: build ## Run IAM E2E tests
-	@echo "==> Running Cloud Manger E2E tests..."
-	# the target assumes the MCLI-* environment variables are exported
-	go test -v -p 1 -parallel 1 -tags=e2e ./e2e/cloud_manager...
-	go test -v -p 1 -parallel 1 -tags=e2e ./e2e/iam...
-
 .PHONY: e2e-test
 e2e-test: build ## Run E2E tests
 	@echo "==> Running E2E tests..."
 	# the target assumes the MCLI-* environment variables are exported
-	go test -v -p 1 -parallel 1 -tags=e2e ./e2e...
+	$(E2E_CMD) -v -p 1 -parallel 1 -tags="$(E2E_TAGS)" ./e2e...
 
 .PHONY: install
 install: ## Install a binary in $GOPATH/bin

e2e/atlas/alertconfig_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,atlas
 
 package atlas_test
 

e2e/atlas/alerts_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,atlas
 
 package atlas_test
 

e2e/atlas/clusters_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,atlas
 
 package atlas_test
 

e2e/atlas/dbusers_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,atlas
 
 package atlas_test
 

e2e/atlas/events_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,atlas
 
 package atlas_test
 

e2e/atlas/whitelist_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,atlas
 
 package atlas_test
 

e2e/cloud_manager/alerts_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,cloudmanager
 
 package cloud_manager_test
 

e2e/cloud_manager/dbusers_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,cloudmanager
 
 package cloud_manager_test
 

e2e/cloud_manager/events_test.go

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build e2e
+// +build e2e,cloudmanager
 
 package cloud_manager_test