From d694d4091999004ee495f7522684ce786177c1ba Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Tue, 8 Mar 2022 17:04:32 +0800 Subject: [PATCH] Support multiple skip option for E2E test The GINKGO_SKIP option is updated to string that can be separated by "." for "make test-e2e". Signed-off-by: Xun Jiang --- changelogs/unreleased/4725-jxun | 1 + test/e2e/Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/4725-jxun diff --git a/changelogs/unreleased/4725-jxun b/changelogs/unreleased/4725-jxun new file mode 100644 index 0000000000..f9e0e4d94a --- /dev/null +++ b/changelogs/unreleased/4725-jxun @@ -0,0 +1 @@ +Support multiple skip option for E2E test \ No newline at end of file diff --git a/test/e2e/Makefile b/test/e2e/Makefile index b49829ab68..01099282d2 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -47,6 +47,7 @@ KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize OUTPUT_DIR := _output/$(GOOS)/$(GOARCH)/bin GINKGO_FOCUS ?= GINKGO_SKIP ?= +SKIP_STR := $(foreach var, $(subst ., ,$(GINKGO_SKIP)),-skip "$(var)") VELERO_CLI ?=$$(pwd)/../../_output/bin/$(GOOS)/$(GOARCH)/velero VELERO_IMAGE ?= velero/velero:main VELERO_VERSION ?= $(VERSION) @@ -86,7 +87,7 @@ run: ginkgo (echo "Bucket to store the backups from E2E tests is required, please re-run with BSL_BUCKET="; exit 1 ) @[ "${CLOUD_PROVIDER}" ] && echo "Using cloud provider ${CLOUD_PROVIDER}" || \ (echo "Cloud provider for target cloud/plug-in provider is required, please rerun with CLOUD_PROVIDER="; exit 1) - @$(GINKGO) -v -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" . -- -velerocli=$(VELERO_CLI) \ + @$(GINKGO) -v -focus="$(GINKGO_FOCUS)" $(SKIP_STR) . -- -velerocli=$(VELERO_CLI) \ -velero-image=$(VELERO_IMAGE) \ -plugins=$(PLUGINS) \ -velero-version=$(VELERO_VERSION) \