diff --git a/Makefile b/Makefile index 2eb5bd2d6..76b49a82e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,17 @@ MYGOBIN := $(shell go env GOPATH)/bin SHELL := /bin/bash export PATH := $(MYGOBIN):$(PATH) -MODULES := "cmd/config" "api/" "kustomize/" "kyaml/" +MODULES := '"cmd/config" "api/" "kustomize/" "kyaml/"' + +# Provide defaults for REPO_OWNER and REPO_NAME if not present. +# Typically these values would be provided by Prow. +ifndef REPO_OWNER +REPO_OWNER := "kubernetes-sigs" +endif + +ifndef REPO_NAME +REPO_NAME := "kustomize" +endif .PHONY: all all: verify-kustomize @@ -236,11 +246,14 @@ test-go-mod: # https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables .PHONY: test-multi-module test-multi-module: $(MYGOBIN)/prchecker - $(MYGOBIN)/prchecker \ - -owner=$(REPO_OWNER) \ - -repo=$(REPO_NAME) \ - -pr=$(PULL_NUMBER) \ - $(MODULES) + ( \ + export MYGOBIN=$(MYGOBIN); \ + export REPO_OWNER=$(REPO_OWNER); \ + export REPO_NAME=$(REPO_NAME); \ + export PULL_NUMBER=$(PULL_NUMBER); \ + export MODULES=$(MODULES); \ + ./scripts/check-multi-module.sh; \ + ) .PHONY: test-examples-e2e-kustomize: $(MYGOBIN)/mdrip $(MYGOBIN)/kind diff --git a/scripts/check-multi-module.sh b/scripts/check-multi-module.sh new file mode 100755 index 000000000..3100d6da7 --- /dev/null +++ b/scripts/check-multi-module.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +if [[ "$PULL_NUMBER" -ne "" ]]; then + cmd="$MYGOBIN/prchecker + -owner=$REPO_OWNER + -repo=$REPO_NAME + -pr=$PULL_NUMBER + $MODULES" + + + echo $MYGOBIN + echo $REPO_OWNER + echo $REPO_NAME + echo $PULL_NUMBER + echo $MODULES + eval $cmd +else + echo "Multi-module check skipped. No PULL_NUMBER provided. + +To run this check locally set PULL_NUMBER to the PR ID from GitHub." +fi \ No newline at end of file