diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-08-18 15:15:47 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-08-18 15:15:47 +0200 |
commit | 7cb55c3a0dfdc782b77ead6bdaaeb5f1645b987d (patch) | |
tree | 2729ffd508f5ad53db3275e4dad2693cc6d5bc50 /docker/ci | |
parent | d614749bdaf5d201ff02719a48bfd87c2cf585d2 (diff) |
Simplify vespa-ci build
Diffstat (limited to 'docker/ci')
-rw-r--r-- | docker/ci/build-and-test.sh | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/docker/ci/build-and-test.sh b/docker/ci/build-and-test.sh index 9a24178ffff..0f0b8be94df 100644 --- a/docker/ci/build-and-test.sh +++ b/docker/ci/build-and-test.sh @@ -1,7 +1,6 @@ #!/bin/bash # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e -set -m if [ $# -ne 4 ]; then echo "Usage: $0 <source dir> <build dir> <log dir> <num threads>" @@ -27,31 +26,5 @@ function build_cpp { } bash ${SOURCE_DIR}/bootstrap-cpp.sh ${SOURCE_DIR} ${BUILD_DIR} - -pids=() -set -o pipefail - -# Java build and test -# Should be waited for first, because it takes much shorter time than C++ build. -build_java 2>&1 | tee ${LOG_DIR}/java.log & -pids+=($!) - -# C++ build and test -build_cpp 2>&1 | tee ${LOG_DIR}/cpp.log & -pids+=($!) - -EXIT_CODE=0 -for pid in "${pids[@]}"; do - wait $pid || EXIT_CODE=$? - echo "$pid finished with status ${EXIT_CODE}" - if [[ "${EXIT_CODE}" != 0 ]]; then - echo "Exiting and killing remaining jobs." - break; - fi -done -set +o pipefail - -# Kill any remaining jobs, ignoring error when no jobs are running -kill $(jobs -p) 2>/dev/null || true - -exit ${EXIT_CODE} +build_java 2>&1 | tee ${LOG_DIR}/java.log +build_cpp 2>&1 | tee ${LOG_DIR}/cpp.log |