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 2015/08/01 00:05:27 UTC
[1/2] mesos git commit: Libprocess: Added missing
libevent_ssl_socket.hpp to Makefile.
Repository: mesos
Updated Branches:
refs/heads/master d018eb712 -> 57c0d02ba
Libprocess: Added missing libevent_ssl_socket.hpp to Makefile.
Review: https://reviews.apache.org/r/36999
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/41aca56a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/41aca56a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/41aca56a
Branch: refs/heads/master
Commit: 41aca56a060e96f45605701f8fa79f90ec21a9a8
Parents: d018eb7
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Fri Jul 31 15:03:33 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Jul 31 15:04:15 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/Makefile.am | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/41aca56a/3rdparty/libprocess/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am
index e9c42d7..44da603 100644
--- a/3rdparty/libprocess/Makefile.am
+++ b/3rdparty/libprocess/Makefile.am
@@ -79,6 +79,7 @@ endif
if ENABLE_SSL
libprocess_la_SOURCES += \
src/libevent_ssl_socket.cpp \
+ src/libevent_ssl_socket.hpp \
src/openssl.cpp \
src/openssl.hpp \
src/openssl_util.cpp \
[2/2] mesos git commit: Added 'CONFIGURATION' flag to jenkins_build
script.
Posted by vi...@apache.org.
Added 'CONFIGURATION' flag to jenkins_build script.
Also added libevent dependency to jenkins build.
In jenkins we can now provide 3 options for the `CONFIGURATION`
environment variable that are: ` ` for the default build,
`--enable-libevent` for libevent, and `--enable-libevent --enable-ssl`
for SSL.
Review: https://reviews.apache.org/r/36646
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/57c0d02b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/57c0d02b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/57c0d02b
Branch: refs/heads/master
Commit: 57c0d02bab734e9a0b23b92bc88e2a1008ea85e9
Parents: 41aca56
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Fri Jul 31 15:04:41 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Jul 31 15:04:41 2015 -0700
----------------------------------------------------------------------
support/jenkins_build.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/57c0d02b/support/jenkins_build.sh
----------------------------------------------------------------------
diff --git a/support/jenkins_build.sh b/support/jenkins_build.sh
index 7276fe2..1d00f4f 100755
--- a/support/jenkins_build.sh
+++ b/support/jenkins_build.sh
@@ -8,6 +8,7 @@ set -xe
# 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"}
# Change to the root of Mesos repo for docker build context.
MESOS_DIRECTORY=$( cd "$( dirname "$0" )/.." && pwd )
@@ -39,7 +40,7 @@ case $OS in
append_dockerfile "RUN yum groupinstall -y 'Development Tools'"
append_dockerfile "RUN yum install -y epel-release" # Needed for clang.
append_dockerfile "RUN yum install -y clang git maven"
- append_dockerfile "RUN yum install -y java-1.7.0-openjdk-devel python-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-utils-devel"
+ append_dockerfile "RUN yum install -y java-1.7.0-openjdk-devel python-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-utils-devel libevent-devel"
# Add an unprivileged user.
append_dockerfile "RUN adduser mesos"
@@ -53,7 +54,7 @@ case $OS in
# Install dependencies.
append_dockerfile "RUN apt-get update"
append_dockerfile "RUN apt-get -y install build-essential clang git maven autoconf libtool"
- append_dockerfile "RUN apt-get -y install openjdk-7-jdk python-dev python-boto libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev"
+ append_dockerfile "RUN apt-get -y install openjdk-7-jdk python-dev python-boto libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev"
# Add an unpriviliged user.
append_dockerfile "RUN adduser --disabled-password --gecos '' mesos"
@@ -97,8 +98,7 @@ append_dockerfile "RUN chown -R mesos /mesos"
append_dockerfile "USER mesos"
# Build and check Mesos.
-# TODO(vinod): Add support for non-default configuration options.
-append_dockerfile "CMD ./bootstrap && ./configure && GLOG_v=1 MESOS_VERBOSE=1 make -j8 distcheck"
+append_dockerfile "CMD ./bootstrap && ./configure $CONFIGURATION && DISTCHECK_CONFIGURE_FLAGS=\"$CONFIGURATION\" GLOG_v=1 MESOS_VERBOSE=1 make -j8 distcheck"
# Generate a random image tag.
TAG=mesos-`date +%s`-$RANDOM