diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-24 12:51:54 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-24 14:22:18 +0200 |
| commit | d86f6ebd9aa5d798d66ee51ffb277769a723234f (patch) | |
| tree | dfdc2da87be31abb663e2c6e7b5949b55c7db924 /docker | |
| parent | b2899a0bccee42955491bddc63a7fade386219f4 (diff) | |
Use dedicated log directory
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/.gitignore | 2 | ||||
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh | 4 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/docker/.gitignore b/docker/.gitignore index 05fe7c1eef8..712576eb374 100644 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -1,3 +1,3 @@ *.rpm -vespa-ci-*.log +logs/ tmp/ diff --git a/docker/ci/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index f3e56410f98..73e5e16e085 100755 --- a/docker/ci/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.sh @@ -76,7 +76,7 @@ set +o pipefail # Kill any remaining jobs, ignoring error when no jobs are running kill $(jobs -p) 2>/dev/null || true -cp ${LOG_DIR}/java.log /vespa/docker/vespa-ci-java-${TIMESTAMP}.log -cp ${LOG_DIR}/cpp.log /vespa/docker/vespa-ci-cpp-${TIMESTAMP}.log +cp ${LOG_DIR}/java.log /vespa/docker/logs/vespa-ci-java-${TIMESTAMP}.log +cp ${LOG_DIR}/cpp.log /vespa/docker/logs/vespa-ci-cpp-${TIMESTAMP}.log exit ${EXIT_CODE} diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index ff7af52d820..c9fefe96a21 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -14,9 +14,12 @@ cd $DIR GIT_COMMIT=$1 DOCKER_IMAGE="vespaengine/vespa-dev:latest" +INTERNAL_DIR=/vespa -docker run --rm -v ${DIR}/..:/vespa --entrypoint /vespa/docker/ci/vespa-ci-internal.sh "$DOCKER_IMAGE" "$GIT_COMMIT" \ - 2>&1 | tee vespa-ci-$(date +%Y-%m-%dT%H:%M:%S%z).log +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 # Needed because of piping docker run to tee above exit ${PIPESTATUS[0]} |