From cd663d23841ad34673fa76101b4aba573651f13f Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Fri, 29 Jan 2016 10:08:41 -0500
Subject: [PATCH] Work around missing JENKINS_URL regression

---
 test.sh              | 4 ++--
 test/test-yamlfmt.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test.sh b/test.sh
index 229111d6..8daf8830 100755
--- a/test.sh
+++ b/test.sh
@@ -17,12 +17,12 @@ echo running go vet	# since it doesn't output an ok message on pass
 go vet && echo PASS
 
 # do these longer tests only when running on ci
-if env | grep -q -e '^TRAVIS=true$' -e '^JENKINS_URL='; then
+if env | grep -q -e '^TRAVIS=true$' -e '^JENKINS_URL=' -e '^BUILD_TAG=jenkins'; then
 	go test -race
 	./test/test-shell.sh
 fi
 
 # run omv tests on jenkins physical hosts only
-if env | grep -q -e '^JENKINS_URL='; then
+if env | grep -q -e '^JENKINS_URL=' -e '^BUILD_TAG=jenkins'; then
 	./test/test-omv.sh
 fi
diff --git a/test/test-yamlfmt.sh b/test/test-yamlfmt.sh
index 3b11b864..034eb757 100755
--- a/test/test-yamlfmt.sh
+++ b/test/test-yamlfmt.sh
@@ -5,7 +5,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if env | grep -q -e '^TRAVIS=true$' -e '^JENKINS_URL='; then
+if env | grep -q -e '^TRAVIS=true$' -e '^JENKINS_URL=' -e 'BUILD_TAG=jenkins'; then
 	echo "Travis and Jenkins give wonky results here, skipping test!"
 	exit 0
 fi