diff --git a/Makefile b/Makefile index 34fc79c2ac..fdff00b7dd 100644 --- a/Makefile +++ b/Makefile @@ -75,6 +75,7 @@ YQ := $(TOOLS_BIN_DIR)/yq KPROMO := $(TOOLS_BIN_DIR)/kpromo RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes GORELEASER := $(TOOLS_BIN_DIR)/goreleaser +PROWJOB_GEN := $(TOOLS_BIN_DIR)/prowjob-gen CLUSTERAWSADM_SRCS := $(call rwildcard,.,cmd/clusterawsadm/*.*) @@ -423,6 +424,14 @@ generate-test-flavors: $(KUSTOMIZE) ## Generate test template flavors ./hack/gen-test-flavors.sh withoutclusterclass ./hack/gen-test-flavors.sh withclusterclass +.PHONY: generate-test-infra-prowjobs +generate-test-infra-prowjobs: $(PROWJOB_GEN) ## Generates the prowjob configurations in test-infra + @if [ -z "${TEST_INFRA_DIR}" ]; then echo "TEST_INFRA_DIR is not set"; exit 1; fi + $(PROWJOB_GEN) \ + -config "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-prowjob-gen.yaml" \ + -templates-dir "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-aws/templates" \ + -output-dir "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-aws" + .PHONY: e2e-image e2e-image: docker-pull-prerequisites $(TOOLS_BIN_DIR)/start.sh $(TOOLS_BIN_DIR)/restart.sh ## Build an e2e test image docker build --build-arg builder_image=$(GO_CONTAINER_IMAGE) -f Dockerfile --tag="gcr.io/k8s-staging-cluster-api/capa-manager:e2e" . diff --git a/hack/tools/Makefile b/hack/tools/Makefile index 0f3e6fe0bb..186dd81b60 100644 --- a/hack/tools/Makefile +++ b/hack/tools/Makefile @@ -106,6 +106,10 @@ KUSTOMIZE := $(BIN_DIR)/kustomize $(KUSTOMIZE): $(BIN_DIR) go.mod go.sum # Build kustomize from tools folder. CGO_ENABLED=0 go build -tags=tools -o $@ sigs.k8s.io/kustomize/kustomize/v5 +PROWJOB_GEN := $(BIN_DIR)/prowjob-gen +$(PROWJOB_GEN): $(BIN_DIR) go.mod go.sum + go build -tags=tools -o $@ sigs.k8s.io/cluster-api/hack/tools/prowjob-gen + MDBOOK_SHARE := $(SHARE_DIR)/mdbook$(MDBOOK_ARCHIVE_EXT) $(MDBOOK_SHARE): ../../versions.mk $(SHARE_DIR) curl -sL -o $(MDBOOK_SHARE) "https://github.com/rust-lang/mdBook/releases/download/$(MDBOOK_VERSION)/mdBook-$(MDBOOK_VERSION)-x86_64-$(RUST_TARGET)$(MDBOOK_ARCHIVE_EXT)" diff --git a/hack/tools/tools.go b/hack/tools/tools.go index c7d675a39c..d7f5c33620 100644 --- a/hack/tools/tools.go +++ b/hack/tools/tools.go @@ -36,6 +36,7 @@ import ( _ "sigs.k8s.io/cluster-api/hack/tools/conversion-verifier" _ "sigs.k8s.io/cluster-api/hack/tools/mdbook/embed" _ "sigs.k8s.io/cluster-api/hack/tools/mdbook/releaselink" + _ "sigs.k8s.io/cluster-api/hack/tools/prowjob-gen" _ "sigs.k8s.io/controller-runtime/tools/setup-envtest" _ "sigs.k8s.io/controller-tools/cmd/controller-gen" _ "sigs.k8s.io/kind"