Skip to content

Commit 47a00fd

Browse files
committed
Adding SKIP_UNIT_TEST variable
1 parent 8cc3c8d commit 47a00fd

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

travis-build-scripts/test.sh

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,35 @@
1515
# limitations under the License.
1616

1717
set -e
18+
#Adding SKIP_UNIT_TEST parameter which can be set in the environment to skip running the unit tests
1819

19-
if [ -z "$BUILD_INTERNAL_LEVEL" ] ; then
20-
if [ "$LTS" != true ] ; then
21-
echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r'
22-
make test-devserver
23-
echo -en 'travis_fold:end:test-devserver\\r'
24-
fi
25-
if [ "$BUILD_ALL" = true ] || [ "$LTS" = true ] ; then
20+
if [ ! "$SKIP_UNIT_TEST" ] ; then
21+
if [ -z "$BUILD_INTERNAL_LEVEL" ] ; then
22+
if [ "$LTS" != true ] ; then
23+
echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r'
24+
make test-devserver
25+
echo -en 'travis_fold:end:test-devserver\\r'
26+
fi
27+
if [ "$BUILD_ALL" = true ] || [ "$LTS" = true ] ; then
2628
if [[ "$ARCH" = "amd64" || "$ARCH" = "s390x" || "$ARCH" = "ppc64le" ]] ; then
2729
echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r'
2830
make test-advancedserver
2931
echo -en 'travis_fold:end:test-advancedserver\\r'
3032
fi
31-
fi
32-
else
33-
if [[ "$BUILD_INTERNAL_LEVEL" == *".DE"* ]]; then
34-
echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r'
35-
make test-devserver
36-
echo -en 'travis_fold:end:test-devserver\\r'
33+
fi
3734
else
38-
echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r'
39-
make test-advancedserver
40-
echo -en 'travis_fold:end:test-advancedserver\\r'
35+
if [[ "$BUILD_INTERNAL_LEVEL" == *".DE"* ]]; then
36+
echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r'
37+
make test-devserver
38+
echo -en 'travis_fold:end:test-devserver\\r'
39+
else
40+
echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r'
41+
make test-advancedserver
42+
echo -en 'travis_fold:end:test-advancedserver\\r'
43+
fi
4144
fi
45+
else
46+
echo "Skipping unit tests as SKIP_UNIT_TEST is set"
4247
fi
4348
echo 'Running gosec scan...' && echo -en 'travis_fold:start:gosec-scan\\r'
4449
if [ "$ARCH" = "amd64" ] ; then

0 commit comments

Comments
 (0)