weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

make: e2e-ci: export ARTIFACTS so that it goes to make/e2e.sh

Browse Source 
Signed-off-by: Maël Valais <mael@vls.dev>
This commit is contained in:
Maël Valais 2022-03-15 17:04:25 +01:00
parent 029db6258f
commit 0df0a2cf21
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/e2e-setup.mk
View File

@ -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

2
make/test.mk
View File

@ -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