diff options
Diffstat (limited to 'docker/ci/build-and-test.sh')
-rw-r--r-- | docker/ci/build-and-test.sh | 20 |
1 files changed, 3 insertions, 17 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 |