CLOUDP-314764: Fix e2e cleanup (#3835)

Author: jeroenvervaeke

Makefile

@@ -26,6 +26,7 @@ DEBUG_FLAGS=all=-N -l
 
 TEST_CMD?=go test
 UNIT_TAGS?=unit
+E2E_TEST_PACKAGES?=./test/e2e..
 E2E_TAGS?=e2e
 E2E_TIMEOUT?=60m
 E2E_PARALLEL?=1
@@ -162,11 +163,11 @@ build-debug: ## Generate a binary in ./bin for debugging atlascli
 e2e-test: build-debug ## Run E2E tests
 # the target assumes the MCLI_* environment variables are exported
 	@echo "==> Running E2E tests..."
-	$(TEST_CMD) -v -p 1 -parallel $(E2E_PARALLEL) -v -timeout $(E2E_TIMEOUT) -tags="$(E2E_TAGS)" ./test/e2e... $(E2E_EXTRA_ARGS)
+	$(TEST_CMD) -v -p 1 -parallel $(E2E_PARALLEL) -v -timeout $(E2E_TIMEOUT) -tags="$(E2E_TAGS)" ${E2E_TEST_PACKAGES}. $(E2E_EXTRA_ARGS)
 
 .PHONY: e2e-test-snapshots
 e2e-test-snapshots: build-debug ## Run E2E tests
-	UPDATE_SNAPSHOTS=false E2E_SKIP_CLEANUP=true DO_NOT_TRACK=1 $(TEST_CMD) -v -timeout $(E2E_TIMEOUT) -tags="e2eSnap" ./test/e2e... $(E2E_EXTRA_ARGS)
+	UPDATE_SNAPSHOTS=false E2E_SKIP_CLEANUP=true DO_NOT_TRACK=1 $(TEST_CMD) -v -timeout $(E2E_TIMEOUT) -tags="e2eSnap" ${E2E_TEST_PACKAGES}. $(E2E_EXTRA_ARGS)
 
 .PHONY: unit-test
 unit-test: build-debug ## Run unit-tests

build/ci/evergreen.yml

@@ -122,6 +122,7 @@ functions:
           - MONGODB_ATLAS_PRIVATE_API_KEY
           - MONGODB_ATLAS_SERVICE
           - TEST_CMD
+          - E2E_TEST_PACKAGES
           - E2E_TAGS
           - E2E_TEST_BUCKET
           - E2E_CLOUD_ROLE_ID
@@ -1474,6 +1475,7 @@ tasks:
           MONGODB_ATLAS_OPS_MANAGER_URL: ${mcli_ops_manager_url}
           MONGODB_ATLAS_SERVICE: cloud
           E2E_TAGS: atlas,cleanup
+          E2E_TEST_PACKAGES: ./test/internal..
           E2E_PARALLEL: 16
           E2E_TIMEOUT: 3h
   - name: atlas_gov_cleanup_e2e
@@ -1497,6 +1499,7 @@ tasks:
           MONGODB_ATLAS_OPS_MANAGER_URL: ${mcli_cloud_gov_ops_manager_url}
           MONGODB_ATLAS_SERVICE: cloudgov
           E2E_TAGS: atlas,cleanup
+          E2E_TEST_PACKAGES: ./test/internal..
           E2E_TIMEOUT: 3h
           E2E_PARALLEL: 16
   - name: atlas_deployments_atlas_clusters_e2e