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 <git@frezbo.dev>
This commit is contained in:
Noel Georgi 2023-03-20 12:29:24 +05:30
parent 2dd0964c5f
commit df9b851fba
No known key found for this signature in database
GPG Key ID: 21A9F444075C9E36
2 changed files with 4 additions and 2 deletions

View File

@ -133,7 +133,7 @@ local setup_ci = {
commands: [ commands: [
'setup-ci', 'setup-ci',
'make ./_out/kubectl ./_out/kubestr ./_out/clusterctl', 'make external-artifacts',
], ],
environment: { environment: {
BUILDKIT_FLAVOR: 'cross', BUILDKIT_FLAVOR: 'cross',

View File

@ -380,7 +380,9 @@ $(ARTIFACTS)/cilium:
@curl -L "$(CILIUM_CLI_URL)" | tar xzf - -C $(ARTIFACTS) cilium @curl -L "$(CILIUM_CLI_URL)" | tar xzf - -C $(ARTIFACTS) cilium
@chmod +x $(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-$@ \ @$(MAKE) hack-test-$@ \
PLATFORM=$* \ PLATFORM=$* \
TAG=$(TAG) \ TAG=$(TAG) \