Work around missing JENKINS_URL regression

This commit is contained in:
James Shubin
2016-01-29 10:08:41 -05:00
parent dee8cd97c5
commit cd663d2384
2 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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