diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-08-18 15:11:02 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-08-18 15:11:02 +0200 |
| commit | d614749bdaf5d201ff02719a48bfd87c2cf585d2 (patch) | |
| tree | b65d0d8329fb93f22915f8ea8e3d4f5b7a71cd5b /docker | |
| parent | fd70bbb89474220e0556e27a9a8f1ed6edd9bbf6 (diff) | |
Use bootstrap-cpp.sh in vespa-ci scripts
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ci/build-and-test.sh | 20 | ||||
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh | 4 |
2 files changed, 5 insertions, 19 deletions
diff --git a/docker/ci/build-and-test.sh b/docker/ci/build-and-test.sh index cfebe09877b..9a24178ffff 100644 --- a/docker/ci/build-and-test.sh +++ b/docker/ci/build-and-test.sh @@ -14,24 +14,10 @@ BUILD_DIR=$2 LOG_DIR=$3 NUM_THREADS=$4 -function bootstrap { - source /opt/rh/devtoolset-6/enable || true - export MAVEN_OPTS="-Xms128m -Xmx512m" - cd "${SOURCE_DIR}" && sh ./bootstrap.sh full - cd "${BUILD_DIR}" && cmake3 \ - -DCMAKE_INSTALL_PREFIX=/opt/vespa \ - -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ - -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \ - -DCMAKE_BUILD_RPATH=/opt/vespa/lib64 \ - -DVALGRIND_UNIT_TESTS=no \ - "${SOURCE_DIR}" -} - function build_java { cd "${SOURCE_DIR}" - mvn install -nsu -B -T ${NUM_THREADS} -V # Should ideally split out test phase, but some unit tests fails on 'mvn test' + export MAVEN_OPTS="-Xms128m -Xmx512m" + mvn install -nsu -B -T ${NUM_THREADS} # Should ideally split out test phase, but some unit tests fails on 'mvn test' } function build_cpp { @@ -40,7 +26,7 @@ function build_cpp { ctest3 -j ${NUM_THREADS} } -bootstrap +bash ${SOURCE_DIR}/bootstrap-cpp.sh ${SOURCE_DIR} ${BUILD_DIR} pids=() set -o pipefail diff --git a/docker/ci/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index 8ba77a56a69..5067aecaa6a 100755 --- a/docker/ci/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.sh @@ -26,5 +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} -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" +cp "${LOG_DIR}/java.log" "${MAPPED_DIR}/docker/logs/${LOG_PREFIX}-java.log" +cp "${LOG_DIR}/cpp.log" "${MAPPED_DIR}/docker/logs/${LOG_PREFIX}-cpp.log" |