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 2016/01/29 23:11:59 UTC
[1/3] mesos git commit: Updated docker_build.sh to make build
environment configurable.
Repository: mesos
Updated Branches:
refs/heads/master 56ebde541 -> 691776ce7
Updated docker_build.sh to make build environment configurable.
Review: https://reviews.apache.org/r/42929
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/691776ce
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/691776ce
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/691776ce
Branch: refs/heads/master
Commit: 691776ce7e0f2efc9ca9e7b7f5cae09eb98d4cc9
Parents: 397f0b7
Author: Vinod Kone <vi...@gmail.com>
Authored: Wed Jan 27 16:07:34 2016 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Jan 29 14:11:17 2016 -0800
----------------------------------------------------------------------
support/docker_build.sh | 20 ++++++++++++++------
support/verify_reviews.py | 7 ++++++-
2 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/691776ce/support/docker_build.sh
----------------------------------------------------------------------
diff --git a/support/docker_build.sh b/support/docker_build.sh
index f43f850..55d402e 100755
--- a/support/docker_build.sh
+++ b/support/docker_build.sh
@@ -6,9 +6,10 @@ set -xe
# a given OS and compiler combination.
# Require the following environment variables to be set.
-: ${OS:?"Environment variable 'OS' must be set"}
-: ${COMPILER:?"Environment variable 'COMPILER' must be set"}
-: ${CONFIGURATION:?"Environment variable 'CONFIGURATION' must be set"}
+: ${OS:?"Environment variable 'OS' must be set (e.g., OS=ubuntu14.04)"}
+: ${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')"}
# Change to the root of Mesos repo for docker build context.
MESOS_DIRECTORY=$( cd "$( dirname "$0" )/.." && pwd )
@@ -88,8 +89,6 @@ case $COMPILER in
;;
esac
-# Generate xml reports to be displayed by jenkins xUnit plugin.
-append_dockerfile "ENV GTEST_OUTPUT xml:report.xml"
# Set working directory.
append_dockerfile "WORKDIR mesos"
@@ -105,8 +104,17 @@ append_dockerfile "COPY . /mesos/"
append_dockerfile "RUN chown -R mesos /mesos"
append_dockerfile "USER mesos"
+# Generate xml reports to be displayed by jenkins xUnit plugin.
+append_dockerfile "ENV GTEST_OUTPUT xml:report.xml"
+
+# Ensure `make distcheck` inherits configure flags.
+append_dockerfile "ENV DISTCHECK_CONFIGURE_FLAGS $CONFIGURATION"
+
+# Set the environment for build.
+append_dockerfile "ENV $ENVIRONMENT"
+
# Build and check Mesos.
-append_dockerfile "CMD ./bootstrap && ./configure $CONFIGURATION && DISTCHECK_CONFIGURE_FLAGS=\"$CONFIGURATION\" GLOG_v=1 MESOS_VERBOSE=1 make -j8 distcheck"
+append_dockerfile "CMD ./bootstrap && ./configure $CONFIGURATION && make -j8 distcheck"
# Generate a random image tag.
TAG=mesos-`date +%s`-$RANDOM
http://git-wip-us.apache.org/repos/asf/mesos/blob/691776ce/support/verify_reviews.py
----------------------------------------------------------------------
diff --git a/support/verify_reviews.py b/support/verify_reviews.py
index 0e76620..25f3892 100755
--- a/support/verify_reviews.py
+++ b/support/verify_reviews.py
@@ -130,7 +130,12 @@ def verify_review(review_request):
# TODO(jojy): Launch docker_build in subprocess so that verifications
# can be run parallely for various configurations.
- configuration = "export OS=ubuntu:14.04;export CONFIGURATION=\"--verbose\";export COMPILER=gcc"
+ configuration = ("export "
+ "OS='ubuntu:14.04' "
+ "CONFIGURATION='--verbose' "
+ "COMPILER='gcc' "
+ "ENVIRONMENT='GLOG_v=1 MESOS_VERBOSE=1'")
+
command = "%s; ./support/docker_build.sh" % configuration
[2/3] mesos git commit: Updated docker_build.sh to generate xml
output for all OSes.
Posted by vi...@apache.org.
Updated docker_build.sh to generate xml output for all OSes.
Review: https://reviews.apache.org/r/42928
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/397f0b7e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/397f0b7e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/397f0b7e
Branch: refs/heads/master
Commit: 397f0b7e8d2730b8a81fc8b1770865d4259a9a3e
Parents: 01d0151
Author: Vinod Kone <vi...@gmail.com>
Authored: Wed Jan 27 13:25:08 2016 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Jan 29 14:11:17 2016 -0800
----------------------------------------------------------------------
support/docker_build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/397f0b7e/support/docker_build.sh
----------------------------------------------------------------------
diff --git a/support/docker_build.sh b/support/docker_build.sh
index da94be8..f43f850 100755
--- a/support/docker_build.sh
+++ b/support/docker_build.sh
@@ -66,9 +66,6 @@ case $OS in
# Disable any tests failing on Ubuntu.
append_dockerfile "ENV GTEST_FILTER -FsTest.FileSystemTableRead"
-
- # Generate xml reports to be displayed by jenkins xUnit plugin.
- append_dockerfile "ENV GTEST_OUTPUT xml:report.xml"
;;
*)
echo "Unknown OS $OS"
@@ -91,6 +88,9 @@ case $COMPILER in
;;
esac
+# Generate xml reports to be displayed by jenkins xUnit plugin.
+append_dockerfile "ENV GTEST_OUTPUT xml:report.xml"
+
# Set working directory.
append_dockerfile "WORKDIR mesos"
[3/3] mesos git commit: Deleted Dockerfile in favor of
`support/docker_build.sh`.
Posted by vi...@apache.org.
Deleted Dockerfile in favor of `support/docker_build.sh`.
Review: https://reviews.apache.org/r/42927
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/01d01512
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/01d01512
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/01d01512
Branch: refs/heads/master
Commit: 01d01512d204dd5d7cb5e818cd97504ea1366316
Parents: 56ebde5
Author: Vinod Kone <vi...@gmail.com>
Authored: Wed Jan 27 13:43:48 2016 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Jan 29 14:11:17 2016 -0800
----------------------------------------------------------------------
Dockerfile | 41 -----------------------------------------
1 file changed, 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/01d01512/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 35abf25..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Dockerfile for building Mesos from source
-#
-# Create snapshot builds with:
-# docker build -t mesos/mesos:git-`git rev-parse --short HEAD` .
-#
-# Run master/slave with:
-# docker run mesos/mesos:git-`git rev-parse --short HEAD` mesos-master [options]
-# docker run mesos/mesos:git-`git rev-parse --short HEAD` mesos-slave [options]
-#
-FROM ubuntu:14.04
-MAINTAINER Gabriel Monroy <ga...@opdemand.com>
-
-# build packages
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-RUN apt-get install -yq build-essential autoconf libtool zlib1g-dev
-RUN apt-get install -yq libcurl4-nss-dev libsasl2-dev
-RUN apt-get install -yq openjdk-6-jdk maven
-RUN apt-get install -yq python-dev python-boto
-RUN apt-get install -yq libsvn-dev libapr1-dev
-
-# export environment
-ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-amd64
-
-# include libmesos on library path
-ENV LD_LIBRARY_PATH /usr/local/lib
-
-# copy local checkout into /opt
-ADD . /opt
-
-WORKDIR /opt
-
-# configure
-RUN ./bootstrap
-RUN mkdir build && cd build && ../configure
-
-WORKDIR /opt/build
-
-# build and cleanup in a single layer
-RUN make -j4 install && cd / && rm -rf /opt