diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-26 14:32:46 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-26 14:36:06 +0200 |
| commit | a9c37653f16037ae0c762bc04aed7ade82bd930e (patch) | |
| tree | ec3333a13baa5b988e2aed3870c0187fb050dc4d /docker | |
| parent | 12489cb6196a15fde9c75c2acfe5874ac6f457d7 (diff) | |
Use same prefix for all log files
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh | 10 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 5 |
2 files changed, 8 insertions, 7 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" diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index 2e48b737ff7..52e9fd34a39 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -15,11 +15,12 @@ cd "${DIR}" GIT_COMMIT=$1 DOCKER_IMAGE="vespaengine/vespa-dev:latest" INTERNAL_DIR=/vespa +LOG_PREFIX=vespa-ci-$(date +%Y-%m-%dT%H:%M:%S) mkdir -p logs -docker run --rm -v ${DIR}/..:${INTERNAL_DIR} --entrypoint "${INTERNAL_DIR}/docker/ci/vespa-ci-internal.sh" "$DOCKER_IMAGE" "$GIT_COMMIT" \ - 2>&1 | tee logs/vespa-ci-$(date +%Y-%m-%dT%H:%M:%S).log +docker run --rm -v ${DIR}/..:${INTERNAL_DIR} --entrypoint "${INTERNAL_DIR}/docker/ci/vespa-ci-internal.sh" "$DOCKER_IMAGE" \ + "$GIT_COMMIT" "$LOG_PREFIX" 2>&1 | tee logs/${LOG_PREFIX}.log # Needed because of piping docker run to tee above exit ${PIPESTATUS[0]} |