From 0df0a2cf21f6b43264821c02bd641ec1e686f4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Valais?= Date: Tue, 15 Mar 2022 17:04:25 +0100 Subject: [PATCH] make: e2e-ci: export ARTIFACTS so that it goes to make/e2e.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maël Valais --- make/e2e-setup.mk | 4 +++- make/test.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/make/e2e-setup.mk b/make/e2e-setup.mk index 9d1749ec6..5f1e9e0f6 100644 --- a/make/e2e-setup.mk +++ b/make/e2e-setup.mk @@ -386,7 +386,9 @@ e2e-setup-traefik: load-$(call image-tar,traefik) make/config/traefik/traefik-va .PHONY: e2e-setup-vault e2e-setup-vault: load-$(call image-tar,vaultretagged) bin/scratch/kind-exists bin/tools/helm -ARTIFACTS = bin/artifacts +# Exported because it needs to flow down to make/e2e.sh. +export ARTIFACTS ?= bin/artifacts + .PHONY: kind-logs kind-logs: bin/scratch/kind-exists bin/tools/kind rm -rf $(ARTIFACTS)/cert-manager-e2e-logs diff --git a/make/test.mk b/make/test.mk index 14ede4931..2f7b06eb5 100644 --- a/make/test.mk +++ b/make/test.mk @@ -62,7 +62,7 @@ e2e: bin/scratch/kind-exists bin/tools/kubectl bin/tools/ginkgo .PHONY: e2e-ci e2e-ci: e2e-setup-kind e2e-setup - $(MAKE) --no-print-directory e2e FLAKE_ATTEMPTS=2 K8S_VERSION="$(K8S_VERSION)" || (make kind-logs && exit 1) + $(MAKE) --no-print-directory e2e FLAKE_ATTEMPTS=2 K8S_VERSION="$(K8S_VERSION)" || ($(MAKE) kind-logs && exit 1) test/integration/versionchecker/testdata/test_manifests.tar: bin/scratch/oldcrds.tar bin/yaml/cert-manager.yaml @# Remove the temp files if they exist