diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-24 12:58:10 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-24 14:22:18 +0200 |
| commit | fc73c2beb6eebcb03e5cd0b7f13599db129d0480 (patch) | |
| tree | 12117fd831a192d2730c77fa5dededeb1b265069 /docker | |
| parent | d86f6ebd9aa5d798d66ee51ffb277769a723234f (diff) | |
Add variable for mapped directory
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/ci/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index 73e5e16e085..ba34d5a2ccc 100755 --- a/docker/ci/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.sh @@ -11,6 +11,7 @@ if [ $# -ne 1 ]; then fi GIT_COMMIT=$1 +MAPPED_DIR=/vespa SOURCE_DIR=~/vespa BUILD_DIR=~/build LOG_DIR=~/log @@ -41,7 +42,7 @@ mkdir "${SOURCE_DIR}" mkdir "${BUILD_DIR}" mkdir "${LOG_DIR}" -git clone --no-checkout --no-hardlinks file:///vespa "${SOURCE_DIR}" +git clone --no-checkout --no-hardlinks file://${MAPPED_DIR} "${SOURCE_DIR}" cd "${SOURCE_DIR}" git -c advice.detachedHead=false checkout ${GIT_COMMIT} source /opt/rh/devtoolset-6/enable || true @@ -76,7 +77,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/logs/vespa-ci-java-${TIMESTAMP}.log -cp ${LOG_DIR}/cpp.log /vespa/docker/logs/vespa-ci-cpp-${TIMESTAMP}.log +cp ${LOG_DIR}/java.log ${MAPPED_DIR}/docker/logs/vespa-ci-java-${TIMESTAMP}.log +cp ${LOG_DIR}/cpp.log ${MAPPED_DIR}/docker/logs/vespa-ci-cpp-${TIMESTAMP}.log exit ${EXIT_CODE} |