From feb70fd5c9e2fb3f300e953dd83053f0830f3895 Mon Sep 17 00:00:00 2001
From: Tibor Vass <tibor@docker.com>
Date: Mon, 4 Feb 2019 19:05:10 +0000
Subject: [PATCH] hack: no need to git fetch in CI

CIs are assumed to do a git fetch and git merge before running tests.
Therefore, no need for a git fetch inside our validate scripts in CI.

If VALIDATE_ORIGIN_BRANCH is set, then git fetch is skipped and
VALIDATE_ORIGIN_BRANCH is used in validate scripts.

Otherwise, behavior is unchanged.

Signed-off-by: Tibor Vass <tibor@docker.com>
---
 Makefile                | 2 ++
 hack/validate/.validate | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2cc8d5a576..67f6c3dab1 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ export DOCKER_GITCOMMIT
 # against these are used in hack/validate/.validate to check what changed in the PR.
 export VALIDATE_REPO
 export VALIDATE_BRANCH
+export VALIDATE_ORIGIN_BRANCH
 
 # env vars passed through directly to Docker's build scripts
 # to allow things like `make KEEPBUNDLE=1 binary` easily
@@ -54,6 +55,7 @@ DOCKER_ENVS := \
 	-e TIMEOUT \
 	-e VALIDATE_REPO \
 	-e VALIDATE_BRANCH \
+	-e VALIDATE_ORIGIN_BRANCH \
 	-e HTTP_PROXY \
 	-e HTTPS_PROXY \
 	-e NO_PROXY \
diff --git a/hack/validate/.validate b/hack/validate/.validate
index acc985d41b..6ed3a59a73 100644
--- a/hack/validate/.validate
+++ b/hack/validate/.validate
@@ -11,8 +11,11 @@ if [ -z "$VALIDATE_UPSTREAM" ]; then
 
 	VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
 
-	git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"
-	VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"
+	if [ -z "$VALIDATE_ORIGIN_BRANCH" ]; then
+		git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"
+		VALIDATE_ORIGIN_BRANCH=FETCH_HEAD
+	fi
+	VALIDATE_UPSTREAM="$(git rev-parse --verify $VALIDATE_ORIGIN_BRANCH)"
 
 	VALIDATE_COMMIT_LOG="$VALIDATE_UPSTREAM..$VALIDATE_HEAD"
 	VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"