You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2017/11/03 22:36:40 UTC
mesos git commit: Allowed override of parallel jobs in docker build.
Repository: mesos
Updated Branches:
refs/heads/master ac0fa2814 -> fe0bda753
Allowed override of parallel jobs in docker build.
Use JOBS env variable to control `make -j` parameter.
By default `JOBS=6`.
Review: https://reviews.apache.org/r/63315/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fe0bda75
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fe0bda75
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fe0bda75
Branch: refs/heads/master
Commit: fe0bda75370bf29be3f4276784d5ff08861abcdf
Parents: ac0fa28
Author: Tomasz Janiszewski <ja...@gmail.com>
Authored: Fri Nov 3 15:36:19 2017 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Nov 3 15:36:19 2017 -0700
----------------------------------------------------------------------
support/docker-build.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fe0bda75/support/docker-build.sh
----------------------------------------------------------------------
diff --git a/support/docker-build.sh b/support/docker-build.sh
index 060194a..9d69fb5 100755
--- a/support/docker-build.sh
+++ b/support/docker-build.sh
@@ -11,6 +11,7 @@ set -xe
: ${COMPILER:?"Environment variable 'COMPILER' must be set (e.g., COMPILER=gcc)"}
: ${CONFIGURATION:?"Environment variable 'CONFIGURATION' must be set (e.g., CONFIGURATION='--enable-libevent --enable-ssl')"}
: ${ENVIRONMENT:?"Environment variable 'ENVIRONMENT' must be set (e.g., ENVIRONMENT='GLOG_v=1 MESOS_VERBOSE=1')"}
+: ${JOBS:=6}
# Change to the root of Mesos repo for docker build context.
MESOS_DIRECTORY=$( cd "$( dirname "$0" )/.." && pwd )
@@ -151,12 +152,12 @@ if [ -n "$COVERITY_TOKEN" ]
append_dockerfile "ENV MESOS_VERSION $(grep "AC_INIT" configure.ac | sed 's/AC_INIT[(]\[mesos\], \[\(.*\)\][)]/\1/')"
append_dockerfile "RUN wget https://scan.coverity.com/download/linux64 --post-data \"token=$COVERITY_TOKEN&project=Mesos\" -O coverity_tool.tgz"
append_dockerfile "RUN tar xvf coverity_tool.tgz; mv cov-analysis-linux* cov-analysis"
- append_dockerfile "CMD ./bootstrap && ./configure $CONFIGURATION && cov-analysis/bin/cov-build -dir cov-int make -j6 && tar czcf mesos.tgz cov-int && tail cov-int/build-log.txt && curl --form \"token=$COVERITY_TOKEN\" --form \"email=dev@mesos.apache.org\" --form \"file=@mesos.tgz\" --form \"version=$MESOS_VERSION\" --form \"description='Continious Coverity Build'\" https://scan.coverity.com/builds?project=Mesos"
+ append_dockerfile "CMD ./bootstrap && ./configure $CONFIGURATION && cov-analysis/bin/cov-build -dir cov-int make -j$JOBS && tar czcf mesos.tgz cov-int && tail cov-int/build-log.txt && curl --form \"token=$COVERITY_TOKEN\" --form \"email=dev@mesos.apache.org\" --form \"file=@mesos.tgz\" --form \"version=$MESOS_VERSION\" --form \"description='Continious Coverity Build'\" https://scan.coverity.com/builds?project=Mesos"
else
# Build and check Mesos.
case $BUILDTOOL in
autotools)
- append_dockerfile "CMD ./bootstrap && ./configure $CONFIGURATION && make -j6 distcheck 2>&1"
+ append_dockerfile "CMD ./bootstrap && ./configure $CONFIGURATION && make -j$JOBS distcheck 2>&1"
;;
cmake)
# Transform autotools-like parameters to cmake-like.
@@ -180,7 +181,7 @@ else
# MESOS-5433: `distcheck` is not supported.
# MESOS-5624: In source build is not supported.
- append_dockerfile "CMD mkdir build && cd build && cmake $CONFIGURATION .. && make -j6 check"
+ append_dockerfile "CMD mkdir build && cd build && cmake $CONFIGURATION .. && make -j$JOBS check"
;;
*)
echo "Unknown build tool $BUILDTOOL"