Work around missing JENKINS_URL regression
This commit is contained in:
4
test.sh
4
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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user