From df9b851fbadaa7c652f343c2facc2bd0a9dd22ca Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Mon, 20 Mar 2023 12:29:24 +0530 Subject: [PATCH] chore: load all external artifacts earlier Load all external artifacts early in the build process so that the binaries are available for e2e tests. Signed-off-by: Noel Georgi --- .drone.jsonnet | 2 +- Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 1db5ad392..c03b8e1eb 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -133,7 +133,7 @@ local setup_ci = { commands: [ 'setup-ci', - 'make ./_out/kubectl ./_out/kubestr ./_out/clusterctl', + 'make external-artifacts', ], environment: { BUILDKIT_FLAVOR: 'cross', diff --git a/Makefile b/Makefile index 7c1857024..6fe04da25 100644 --- a/Makefile +++ b/Makefile @@ -380,7 +380,9 @@ $(ARTIFACTS)/cilium: @curl -L "$(CILIUM_CLI_URL)" | tar xzf - -C $(ARTIFACTS) cilium @chmod +x $(ARTIFACTS)/cilium -e2e-%: $(ARTIFACTS)/$(INTEGRATION_TEST_DEFAULT_TARGET)-amd64 $(ARTIFACTS)/kubectl $(ARTIFACTS)/clusterctl $(ARTIFACTS)/kubestr $(ARTIFACTS)/helm $(ARTIFACTS)/cilium ## Runs the E2E test for the specified platform (e.g. e2e-docker). +external-artifacts: $(ARTIFACTS)/kubectl $(ARTIFACTS)/clusterctl $(ARTIFACTS)/kubestr $(ARTIFACTS)/helm $(ARTIFACTS)/cilium + +e2e-%: $(ARTIFACTS)/$(INTEGRATION_TEST_DEFAULT_TARGET)-amd64 external-artifacts ## Runs the E2E test for the specified platform (e.g. e2e-docker). @$(MAKE) hack-test-$@ \ PLATFORM=$* \ TAG=$(TAG) \