Merge pull request #2796 from Ankitasw/e2e-fix

Download the e2e restart scripts outside the dockerfile

Dockerfile

@@ -36,10 +36,6 @@ RUN  --mount=type=cache,target=/root/.local/share/golang \
 # Copy the sources
 COPY ./ ./
 
-RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
-  wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \
-  chmod +x /start.sh && chmod +x /restart.sh
-
 # Build
 ARG package=.
 ARG ARCH

Makefile

@@ -189,7 +189,7 @@ test-e2e-eks: $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks
 	time $(GINKGO) -tags=e2e $(GINKGO_ARGS) ./test/e2e/suites/managed/... -- -config-path="$(E2E_EKS_CONF_PATH)" --source-template="$(EKS_SOURCE_TEMPLATE)" $(E2E_ARGS) $(EKS_E2E_ARGS)
 
 .PHONY: e2e-image
-e2e-image: docker-pull-prerequisites
+e2e-image: docker-pull-prerequisites $(TOOLS_BIN_DIR)/start.sh $(TOOLS_BIN_DIR)/restart.sh
 	docker build -f Dockerfile --tag="gcr.io/k8s-staging-cluster-api/capa-manager:e2e" .
 
 CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)

hack/tools/Makefile

@@ -58,6 +58,11 @@ $(SHARE_DIR):
 $(GTAR):
 	@$(GTAR) --version > /dev/null || (echo Install GNU Tar with brew install gnu-tar && exit -1)
 
+$(BIN_DIR)/start.sh:
+	curl https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh -o $@
+
+$(BIN_DIR)/restart.sh:
+	curl https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh -o $@
 
 GO_APIDIFF := $(BIN_DIR)/go-apidiff
 $(GO_APIDIFF): $(BIN_DIR) go.mod go.sum