diff options
author | verhoek <30193551+verhoek@users.noreply.github.com> | 2019-12-04 22:44:29 +0300 |
---|---|---|
committer | verhoek <30193551+verhoek@users.noreply.github.com> | 2019-12-04 23:19:51 +0300 |
commit | 99e647bdb886cf8793dfc95d61b3bbe8e2107690 (patch) | |
tree | 8bc3a38d3821387e4a14b01238ea3c3e3a166b99 /pipeline | |
parent | 791634082a8c367e8224a3e23857ac188aff8f23 (diff) |
Enhance travis output markers for testing.
Diffstat (limited to 'pipeline')
-rwxr-xr-x | pipeline/docker-run/runner.sh | 13 | ||||
-rwxr-xr-x | pipeline/stage_unittests/job.sh | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pipeline/docker-run/runner.sh b/pipeline/docker-run/runner.sh index b7f299c11..4ed08661c 100755 --- a/pipeline/docker-run/runner.sh +++ b/pipeline/docker-run/runner.sh @@ -13,16 +13,15 @@ function sync_dirs () { } function setup () { - if [ -f /sbin/apk ]; then - apk --update add $DOCKER_PACKAGES - return - fi + travis_mark_begin "INSTALLING PACKAGES IN DOCKER" - if [ -f /usr/bin/apt-get ]; then + if [ -f /sbin/apk ]; then + apk --update add $DOCKER_PACKAGES + elif [ -f /usr/bin/apt-get ]; then export DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y $DOCKER_PACKAGES - return - fi + fi + travis_mark_end "INSTALLING PACKAGES IN DOCKER" } function clean_up () { diff --git a/pipeline/stage_unittests/job.sh b/pipeline/stage_unittests/job.sh index d31ac509b..a3aef0823 100755 --- a/pipeline/stage_unittests/job.sh +++ b/pipeline/stage_unittests/job.sh @@ -31,6 +31,4 @@ function start_test () { done } -travis_mark_begin "UNIT TESTING" start_test -travis_mark_end "UNIT TESTING" |