diff options
Diffstat (limited to 'docker/ci/vespa-ci-internal.sh')
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/ci/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index eadb9e97318..8ba77a56a69 100755 --- a/docker/ci/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.sh @@ -2,13 +2,14 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e -if [ $# -ne 1 ]; then - echo "Usage: $0 <git commit>" +if [ $# -ne 2 ]; then + echo "Usage: $0 <git commit> <log prefix>" echo "This script should not be called manually." exit 1 fi GIT_COMMIT=$1 +LOG_PREFIX=$2 SOURCE_DIR=~/vespa BUILD_DIR=~/build MAPPED_DIR=/vespa @@ -25,6 +26,5 @@ git -c advice.detachedHead=false checkout ${GIT_COMMIT} NUM_THREADS=$(($(nproc --all) * 2)) bash "${MAPPED_DIR}/docker/ci/build-and-test.sh" "${SOURCE_DIR}" "${BUILD_DIR}" "${LOG_DIR}" ${NUM_THREADS} -TIMESTAMP=$(date +%Y-%m-%dT%H:%M:%S) -sudo cp "${LOG_DIR}/java.log" "${MAPPED_DIR}/docker/logs/vespa-ci-java-${TIMESTAMP}.log" -sudo cp "${LOG_DIR}/cpp.log" "${MAPPED_DIR}/docker/logs/vespa-ci-cpp-${TIMESTAMP}.log" +sudo cp "${LOG_DIR}/java.log" "${MAPPED_DIR}/docker/logs/${LOG_PREFIX}-java.log" +sudo cp "${LOG_DIR}/cpp.log" "${MAPPED_DIR}/docker/logs/${LOG_PREFIX}-cpp.log" |