diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.ci | 4 | ||||
| -rwxr-xr-x | docker/vespa-ci-internal.sh | 6 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci index 67a8dafdda5..0bd34978621 100644 --- a/docker/Dockerfile.ci +++ b/docker/Dockerfile.ci @@ -1,9 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. FROM vespabuild -COPY vespa-ci-internal.sh /vespa-ci-internal.sh COPY tmp/vespa.spec /vespa.spec - RUN yum-builddep -y /vespa.spec # Build using non-root user 'vespabuilder' @@ -13,3 +11,5 @@ USER vespabuilder # Java requires proper locale for unicode ENV LANG en_US.UTF-8 + +COPY vespa-ci-internal.sh /vespa-ci-internal.sh diff --git a/docker/vespa-ci-internal.sh b/docker/vespa-ci-internal.sh index c1de874d5ca..1e5446f2905 100755 --- a/docker/vespa-ci-internal.sh +++ b/docker/vespa-ci-internal.sh @@ -13,16 +13,16 @@ GIT_COMMIT=$1 SOURCE_DIR=~/vespa BUILD_DIR=~/build NUM_CORES=$(nproc --all) -NUM_THREADS=$((${NUM_CORES} + ${NUM_CORES}/2)) +NUM_THREADS=$((${NUM_CORES} * 2)) mkdir "${SOURCE_DIR}" mkdir "${BUILD_DIR}" git clone --no-checkout --local --no-hardlinks file:///vespa "${SOURCE_DIR}" cd "${SOURCE_DIR}" -git -c advice.detachedHead=false checkout --detach ${GIT_COMMIT} +git -c advice.detachedHead=false checkout ${GIT_COMMIT} source /opt/rh/devtoolset-6/enable || true sh ./bootstrap.sh full -MAVEN_OPTS="-Xms128m -Xmx512m" mvn install +MAVEN_OPTS="-Xms128m -Xmx512m" mvn -T ${NUM_THREADS} install cd "${BUILD_DIR}" cmake3 -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index 3e990bb2991..beb5944233b 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -23,4 +23,4 @@ cp -p ../dist/vespa.spec tmp/vespa.spec docker build -t "$CI_DOCKER_IMAGE" -f Dockerfile.ci . docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa-ci-internal.sh "$CI_DOCKER_IMAGE" "$GIT_COMMIT" \ - 2>&1 | tee vespa-ci-${GIT_COMMIT}-$(date +%Y-%m-%dT%H:%M:%S%z).log + 2>&1 | tee vespa-ci-$(date +%Y-%m-%dT%H:%M:%S%z).log |