Repository: trafficserver Updated Branches: refs/heads/master 658138f06 -> 79068efb9
Allow for the make command to be configurable Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/79068efb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/79068efb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/79068efb Branch: refs/heads/master Commit: 79068efb978085b74f0b7220dbee1d035a151aaf Parents: 658138f Author: Leif Hedstrom <[email protected]> Authored: Tue May 6 17:35:48 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue May 6 17:35:48 2014 -0600 ---------------------------------------------------------------------- ci/jenkins/bin/build.sh | 5 ++++- ci/jenkins/bin/cleanup.sh | 2 +- ci/jenkins/bin/environment.sh | 5 +++++ ci/jenkins/bin/in_tree.sh | 6 +++--- ci/jenkins/bin/out_of_tree.sh | 6 +++--- ci/jenkins/bin/rat.sh | 4 ++-- ci/jenkins/bin/regression.sh | 2 +- ci/jenkins/bin/snapshot.sh | 2 +- 8 files changed, 20 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/build.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh index 3e6099d..2246661 100755 --- a/ci/jenkins/bin/build.sh +++ b/ci/jenkins/bin/build.sh @@ -20,6 +20,9 @@ enable_debug="" test "${JOB_NAME#*type=debug}" != "${JOB_NAME}" && enable_debug="--enable-debug" +# Check if we're doing Debian style hardening +test "${JOB_NAME#*type=hardening}" != "${JOB_NAME}" && export DEB_BUILD_HARDENING + # When to turn on ccache, disabled for all clang / llvm builds enable_ccache="--enable-ccache" test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}" && enable_ccache="" @@ -41,4 +44,4 @@ cd "${WORKSPACE}/${BUILD_NUMBER}/build" ${enable_werror} \ ${enable_debug} -make -j4 V=1 +${ATS_MAKE} -j4 V=1 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/cleanup.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/cleanup.sh b/ci/jenkins/bin/cleanup.sh index 14ad70f..c3e689a 100755 --- a/ci/jenkins/bin/cleanup.sh +++ b/ci/jenkins/bin/cleanup.sh @@ -18,7 +18,7 @@ # Do a distclean, to verify that we can actually satisfy this (common) build target cd "${WORKSPACE}/${BUILD_NUMBER}/build" -make distclean +${ATS_MAKE} distclean # Final cleanup, this removes the build and install areas cd "${WORKSPACE}" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/environment.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh index a80f1b5..5ff2cc5 100755 --- a/ci/jenkins/bin/environment.sh +++ b/ci/jenkins/bin/environment.sh @@ -19,6 +19,11 @@ # Shouldn't have to tweak this export ATS_SRC_HOME="/home/jenkins/src" +# Check if we need to use a different "make" +ATS_MAKE=make +test "${JOB_NAME#freebsd*}" != "${JOB_NAME}" && ATS_MAKE="gmake" +export ATS_MAKE + # 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 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/in_tree.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh index ffa7777..b157d57 100755 --- a/ci/jenkins/bin/in_tree.sh +++ b/ci/jenkins/bin/in_tree.sh @@ -27,8 +27,8 @@ if test "${JOB_NAME#*type=in_tree}" != "${JOB_NAME}"; then --enable-example-plugins \ --enable-test-tools - make -j8 V=1 - make check + ${ATS_MAKE} -j8 V=1 + ${ATS_MAKE} check - make distclean + ${ATS_MAKE} distclean fi http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/out_of_tree.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/out_of_tree.sh b/ci/jenkins/bin/out_of_tree.sh index 8385c2b..cdbb041 100755 --- a/ci/jenkins/bin/out_of_tree.sh +++ b/ci/jenkins/bin/out_of_tree.sh @@ -28,8 +28,8 @@ if test "${JOB_NAME#*type=out_of_tree}" != "${JOB_NAME}"; then --enable-example-plugins \ --enable-test-tools - make -j8 V=1 - make check + ${ATS_MAKE} -j8 V=1 + ${ATS_MAKE} check - make distclean + ${ATS_MAKE} distclean fi http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/rat.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/rat.sh b/ci/jenkins/bin/rat.sh index 82debec..e223425 100755 --- a/ci/jenkins/bin/rat.sh +++ b/ci/jenkins/bin/rat.sh @@ -20,8 +20,8 @@ cd "${WORKSPACE}/src" if test "${JOB_NAME#*type=RAT}" != "${JOB_NAME}"; then ./configure - make rat | tee RAT.txt + ${ATS_MAKE} rat | tee RAT.txt cp RAT.txt /home/jenkins/RAT/rat-${ATS_BRANCH}.txt grep 'Unknown Licenses' RAT.txt# && exit -1 - make distclean + ${ATS_MAKE} distclean fi http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/regression.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/regression.sh b/ci/jenkins/bin/regression.sh index 8d07acc..4721011 100755 --- a/ci/jenkins/bin/regression.sh +++ b/ci/jenkins/bin/regression.sh @@ -17,6 +17,6 @@ # limitations under the License. cd "${WORKSPACE}/${BUILD_NUMBER}/build" -make test && make install +${ATS_MAKE} test && ${ATS_MAKE} install "${WORKSPACE}/${BUILD_NUMBER}/install/bin/traffic_server" -R 1 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79068efb/ci/jenkins/bin/snapshot.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/snapshot.sh b/ci/jenkins/bin/snapshot.sh index 5e16e1f..18d502a 100755 --- a/ci/jenkins/bin/snapshot.sh +++ b/ci/jenkins/bin/snapshot.sh @@ -20,7 +20,7 @@ cd "${WORKSPACE}/src" autoreconf -fi ./configure -make asf-dist +${ATS_MAKE} asf-dist cp trafficserver-*.tar.bz2 ${ATS_SRC_HOME}/trafficserver-${ATS_BRANCH}.tar.bz2.new mv ${ATS_SRC_HOME}/trafficserver-${ATS_BRANCH}.tar.bz2.new ${ATS_SRC_HOME}/trafficserver-${ATS_BRANCH}.tar.bz2
