You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2016/01/20 22:06:30 UTC
trafficserver git commit: Update CI builds for future versions,
and check # of CPUs on OmniOS for now
Repository: trafficserver
Updated Branches:
refs/heads/master 7b4967ff6 -> b6680179a
Update CI builds for future versions, and check # of CPUs on OmniOS for now
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b6680179
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b6680179
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b6680179
Branch: refs/heads/master
Commit: b6680179aa550bb5457f77a6d41fe786d5c1d108
Parents: 7b4967f
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Jan 20 14:06:01 2016 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Jan 20 14:06:06 2016 -0700
----------------------------------------------------------------------
ci/jenkins/bin/build.sh | 2 +-
ci/jenkins/bin/environment.sh | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b6680179/ci/jenkins/bin/build.sh
----------------------------------------------------------------------
diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh
index 86c926f..6f51a10 100755
--- a/ci/jenkins/bin/build.sh
+++ b/ci/jenkins/bin/build.sh
@@ -46,4 +46,4 @@ mkdir -p BUILDS && cd BUILDS
${enable_werror} \
${enable_debug}
-${ATS_MAKE} -j6 V=1 Q=
+${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q=
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b6680179/ci/jenkins/bin/environment.sh
----------------------------------------------------------------------
diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index 3442e19..d4b5776 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -33,9 +33,6 @@ 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.0.x}" != "${JOB_NAME}" && ATS_BRANCH=5.0.x
-test "${JOB_NAME#*-5.1.x}" != "${JOB_NAME}" && ATS_BRANCH=5.1.x
-test "${JOB_NAME#*-5.2.x}" != "${JOB_NAME}" && ATS_BRANCH=5.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
@@ -44,7 +41,12 @@ test "${JOB_NAME#*-6.3.x}" != "${JOB_NAME}" && ATS_BRANCH=6.3.x
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
-test "${JOB_NAME#*-7.3.x}" != "${JOB_NAME}" && ATS_BRANCH=7.3.x
+test "${JOB_NAME#*-8.0.x}" != "${JOB_NAME}" && ATS_BRANCH=8.0.x
+test "${JOB_NAME#*-8.1.x}" != "${JOB_NAME}" && ATS_BRANCH=8.1.x
+test "${JOB_NAME#*-8.2.x}" != "${JOB_NAME}" && ATS_BRANCH=8.2.x
+test "${JOB_NAME#*-9.0.x}" != "${JOB_NAME}" && ATS_BRANCH=9.0.x
+test "${JOB_NAME#*-9.1.x}" != "${JOB_NAME}" && ATS_BRANCH=9.1.x
+test "${JOB_NAME#*-9.2.x}" != "${JOB_NAME}" && ATS_BRANCH=9.2.x
export ATS_BRANCH
@@ -55,3 +57,7 @@ if test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}"; then
export CXXFLAGS="-Qunused-arguments -std=c++11"
export WITH_LIBCPLUSPLUS="yes"
fi
+
+# Figure out parallelism for regular builds / bots
+ATS_MAKE_FLAGS="-j 4"
+[ -x /usr/sbin/psrinfo ] && ATS_MAKE_FLAGS="-j $(/usr/sbin/psrinfo -p)" # Conservative on Solaris