From 37b96a241b043f09f6cfee145c19b425e858f939 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Mon, 4 Jan 2021 16:50:35 -0500 Subject: [PATCH] ensure acceptance tests use existing snapshot dir Signed-off-by: Alex Goodman --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d9ec8a8ec..2c8372e52 100644 --- a/Makefile +++ b/Makefile @@ -176,8 +176,9 @@ $(SNAPSHOTDIR): ## Build snapshot release binaries and packages BUILD_GIT_TREE_STATE=$(GITTREESTATE) \ $(TEMPDIR)/goreleaser release --skip-publish --rm-dist --snapshot --config $(TEMPDIR)/goreleaser.yaml +# note: we cannot clean the snapshot directory since the pipeline builds the snapshot separately .PHONY: acceptance-mac -acceptance-mac: clean-snapshot $(SNAPSHOTDIR) ## Run acceptance tests on build snapshot binaries and packages (Mac) +acceptance-mac: $(SNAPSHOTDIR) ## Run acceptance tests on build snapshot binaries and packages (Mac) $(call title,Running acceptance test: Run on Mac) $(ACC_DIR)/mac.sh \ $(SNAPSHOTDIR) \ @@ -185,8 +186,9 @@ acceptance-mac: clean-snapshot $(SNAPSHOTDIR) ## Run acceptance tests on build s $(ACC_TEST_IMAGE) \ $(RESULTSDIR) +# note: we cannot clean the snapshot directory since the pipeline builds the snapshot separately .PHONY: acceptance-linux -acceptance-linux: clean-snapshot acceptance-test-deb-package-install acceptance-test-rpm-package-install ## Run acceptance tests on build snapshot binaries and packages (Linux) +acceptance-linux: acceptance-test-deb-package-install acceptance-test-rpm-package-install ## Run acceptance tests on build snapshot binaries and packages (Linux) # note: this is used by CI to determine if the inline-scan report cache should be busted for the inline-compare tests .PHONY: compare-fingerprint