Skip to content

Commit

Permalink
rename no-arch to e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
bschimke95 committed Jul 3, 2024
1 parent 15f7b2a commit d809aa7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ docker-build-bootstrap-%:
DOCKER_BUILDKIT=1 docker build --build-arg builder_image=$(GO_CONTAINER_IMAGE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$* --build-arg package=./bootstrap/main.go --build-arg ldflags="$(LDFLAGS)" . -t ${BOOTSTRAP_IMG}:${BOOTSTRAP_IMG_TAG}-$*
docker-build-bootstrap: manager-bootstrap docker-build-bootstrap-amd64 docker-build-bootstrap-arm64

docker-build-bootstrap-no-arch: manager-bootstrap
docker-build-bootstrap-e2e: manager-bootstrap
DOCKER_BUILDKIT=1 docker build --build-arg builder_image=$(GO_CONTAINER_IMAGE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg package=./bootstrap/main.go --build-arg ldflags="$(LDFLAGS)" . -t ${BOOTSTRAP_IMG}:${BOOTSTRAP_IMG_TAG}

# Push the bootstrap multiarch image
Expand All @@ -269,8 +269,8 @@ test-controlplane: envtest generate-controlplane generate-controlplane-conversio
docker-build-e2e: ## Run docker-build-* targets for all the images with settings to be used for the e2e tests
# please ensure the generated image name matches image names used in the E2E_CONF_FILE
# and it also match the image tags in bootstrap/config/default and controlplane/config/default
$(MAKE) BOOTSTRAP_IMG_TAG=dev docker-build-bootstrap-no-arch
$(MAKE) CONTROLPLANE_IMG_TAG=dev docker-build-controlplane-no-arch
$(MAKE) BOOTSTRAP_IMG_TAG=dev docker-build-bootstrap-e2e
$(MAKE) CONTROLPLANE_IMG_TAG=dev docker-build-controlplane-e2e

.PHONY: test-e2e
test-e2e: $(GINKGO) $(KUSTOMIZE) ## Run the end-to-end tests
Expand Down Expand Up @@ -329,7 +329,7 @@ docker-build-controlplane-%:
DOCKER_BUILDKIT=1 docker build --build-arg builder_image=$(GO_CONTAINER_IMAGE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$* --build-arg package=./controlplane/main.go --build-arg ldflags="$(LDFLAGS)" . -t ${CONTROLPLANE_IMG}:${CONTROLPLANE_IMG_TAG}-$*
docker-build-controlplane: manager-controlplane docker-build-controlplane-amd64 docker-build-controlplane-arm64

docker-build-controlplane-no-arch: manager-controlplane
docker-build-controlplane-e2e: manager-controlplane
DOCKER_BUILDKIT=1 docker build --build-arg builder_image=$(GO_CONTAINER_IMAGE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=${ARCH} --build-arg package=./controlplane/main.go --build-arg ldflags="$(LDFLAGS)" . -t ${CONTROLPLANE_IMG}:${CONTROLPLANE_IMG_TAG}

# Push the controlplane multiarch image
Expand Down

0 comments on commit d809aa7

Please sign in to comment.