[trafficserver] branch master updated: Use devtoolset-3 for ATS 7 and later, when available

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  dd72dd5   Use devtoolset-3 for ATS 7 and later, when available
dd72dd5 is described below

commit dd72dd539ac6d719435b9273f23de0cc5c908107
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Fri Jul 22 15:07:02 2016 -0600

    Use devtoolset-3 for ATS 7 and later, when available
---
 ci/jenkins/bin/build.sh       |  4 ----
 ci/jenkins/bin/environment.sh | 22 ++++++++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh
index 9d18600..9c5d1ee 100755
--- a/ci/jenkins/bin/build.sh
+++ b/ci/jenkins/bin/build.sh
@@ -28,10 +28,6 @@ test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}" && enable_ccache=""
 enable_werror="--enable-werror"
 test "${NODE_NAME#RHEL 5}" != "${NODE_NAME}" && enable_werror=""
 
-# When to enable SPDY (this expects a spdylday installation in e.g. /opt/spdylay)
-enable_spdy=""
-test "${JOB_NAME#*type=spdy}" != "${JOB_NAME}" && enable_spdy="--enable-spdy"
-
 # Change to the build area (this is previously setup in extract.sh)
 cd "${WORKSPACE}/${BUILD_NUMBER}/build"
 
diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index a15c185..1c92466 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -32,12 +32,14 @@ export TODAY=$(/bin/date +'%m%d%Y')
 
 # Extract the current branch (default to master). ToDo: Can we do this better ?
 ATS_BRANCH=master
-test "${JOB_NAME#*-4.2.x}" != "${JOB_NAME}" && ATS_BRANCH=4.2.x
-test "${JOB_NAME#*-5.3.x}" != "${JOB_NAME}" && ATS_BRANCH=5.3.x
-test "${JOB_NAME#*-6.0.x}" != "${JOB_NAME}" && ATS_BRANCH=6.0.x
-test "${JOB_NAME#*-6.1.x}" != "${JOB_NAME}" && ATS_BRANCH=6.1.x
-test "${JOB_NAME#*-6.2.x}" != "${JOB_NAME}" && ATS_BRANCH=6.2.x
-test "${JOB_NAME#*-6.3.x}" != "${JOB_NAME}" && ATS_BRANCH=6.3.x
+ATS_IS_7="yes"
+
+test "${JOB_NAME#*-4.2.x}" != "${JOB_NAME}" && ATS_BRANCH=4.2.x && ATS_IS_7="no"
+test "${JOB_NAME#*-5.3.x}" != "${JOB_NAME}" && ATS_BRANCH=5.3.x && ATS_IS_7="no"
+test "${JOB_NAME#*-6.0.x}" != "${JOB_NAME}" && ATS_BRANCH=6.0.x && ATS_IS_7="no"
+test "${JOB_NAME#*-6.1.x}" != "${JOB_NAME}" && ATS_BRANCH=6.1.x && ATS_IS_7="no"
+test "${JOB_NAME#*-6.2.x}" != "${JOB_NAME}" && ATS_BRANCH=6.2.x && ATS_IS_7="no"
+test "${JOB_NAME#*-6.3.x}" != "${JOB_NAME}" && ATS_BRANCH=6.3.x && ATS_IS_7="no"
 test "${JOB_NAME#*-7.0.x}" != "${JOB_NAME}" && ATS_BRANCH=7.0.x
 test "${JOB_NAME#*-7.1.x}" != "${JOB_NAME}" && ATS_BRANCH=7.1.x
 test "${JOB_NAME#*-7.2.x}" != "${JOB_NAME}" && ATS_BRANCH=7.2.x
@@ -58,6 +60,14 @@ if test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}"; then
     export WITH_LIBCPLUSPLUS="yes"
 fi
 
+# I can't figure out how to deal with scl enable devtoolset-3 bash and the sub-shell with Jenkins,
+# so hacking this up for now.
+if test "$ATS_IS_7" == "yes" -a -x "/opt/rh/devtoolset-3/root/usr/bin/gcc"; then
+    export CC="/opt/rh/devtoolset-3/root/usr/bin/gcc"
+    export CXX="/opt/rh/devtoolset-3/root/usr/bin/g++"
+    export PATH="/opt/rh/devtoolset-3/root/usr/bin:${PATH}"
+fi
+
 # Figure out parallelism for regular builds / bots
 ATS_MAKE_FLAGS="-j4"
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].