From 2442d8f020ac3d7cf65cb47fe95b595cb28cf20b Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Tue, 14 Mar 2017 13:50:08 -0700 Subject: [PATCH] Only detect iso changes from merge-base on master When new iso changes are commited to master, don't count them as diffs with old PRs that haven't been rebased. That way, we don't rebuild the iso for PRs that don't contain the upstream fixes yet. --- hack/jenkins/minikube_cross_build_and_upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 026c4857b0..cc6eeef4bf 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -27,7 +27,7 @@ gsutil cp gs://minikube-builds/logs/index.html gs://minikube-builds/logs/${ghprb # If there are ISO changes, build and upload the ISO # then set the default to the newly built ISO for testing -if out="$(git diff origin/master --name-only | grep deploy/iso/minikube)" &> /dev/null; then +if out="$(git diff ${ghprbActualCommit} --name-only $(git merge-base origin/master ${ghprbActualCommit}) | grep deploy/iso/minikube)" &> /dev/null; then echo "ISO changes detected ... rebuilding ISO" export ISO_BUCKET="minikube-builds/${ghprbPullId}" export ISO_VERSION="testing"