Port TestKubeletConfigRemediation to serial test package

This commit also removes dead code as a result of refactoring the serial tests into their own package and not needing a separate test runner.
ComplianceAsCode · Apr 13, 2023 · e629fd5 · e629fd5
1 parent 59e0de8
commit e629fd5
Show file tree

Hide file tree

Showing 10 changed files with 222 additions and 929 deletions.
diff --git a/Makefile b/Makefile
@@ -575,8 +575,11 @@ test-benchmark: ## Run the benchmark tests -- Note that this can only be ran for
 	@echo "The pprof files generated are: cpu.prof and mem.prof"
 
 .PHONY: e2e
-e2e: e2e-set-image prep-e2e ## Run full end-to-end tests that exercise content on an operational cluster.
-	@CONTENT_IMAGE=$(E2E_CONTENT_IMAGE_PATH) BROKEN_CONTENT_IMAGE=$(E2E_BROKEN_CONTENT_IMAGE_PATH) $(GO) test ./tests/e2e $(E2E_GO_TEST_FLAGS) -args $(E2E_ARGS) | tee tests/e2e-test.log
+e2e: e2e-set-image prep-e2e e2e-parallel e2e-test-wait e2e-serial ## Run full end-to-end tests that exercise content on an operational cluster.
+
+.PHONY: e2e
+e2e-test-wait:
+	./utils/e2e-test-wait.sh
 
 .PHONY: e2e-parallel
 e2e-parallel: e2e-set-image prep-e2e ## Run non-destructive end-to-end tests concurrently.

diff --git a/tests/e2e/constants.go b/tests/e2e/constants.go
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
diff --git a/tests/e2e/e2eutil/wait_util.go b/tests/e2e/e2eutil/wait_util.go