Repository: trafficserver Updated Branches: refs/heads/master 35f787284 -> caf514b25
Added SPDY support, and some other minor cleanup Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/caf514b2 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/caf514b2 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/caf514b2 Branch: refs/heads/master Commit: caf514b2593ad895b71c75a326f709e548284be2 Parents: 35f7872 Author: Leif Hedstrom <[email protected]> Authored: Thu Jun 5 17:06:37 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Thu Jun 5 17:06:37 2014 -0600 ---------------------------------------------------------------------- ci/jenkins/bin/build.sh | 8 ++++++-- ci/jenkins/bin/environment.sh | 3 +++ ci/jenkins/bin/in_tree.sh | 22 ++++++++++++++-------- ci/jenkins/bin/out_of_tree.sh | 32 ++++++++++++++------------------ ci/jenkins/bin/snapshot.sh | 6 ------ 5 files changed, 37 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/caf514b2/ci/jenkins/bin/build.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh index 55fce64..14f33e0 100755 --- a/ci/jenkins/bin/build.sh +++ b/ci/jenkins/bin/build.sh @@ -30,18 +30,22 @@ 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" -mkdir BUILDS && cd BUILDS +mkdir -p BUILDS && cd BUILDS ../configure \ --prefix="${WORKSPACE}/${BUILD_NUMBER}/install" \ --enable-experimental-plugins \ --enable-example-plugins \ --enable-test-tools \ + ${enable_spdy} \ ${enable_ccache} \ ${enable_werror} \ ${enable_debug} -${ATS_MAKE} -j4 V=1 +${ATS_MAKE} -j6 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/caf514b2/ci/jenkins/bin/environment.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh index 633a9c0..97ed4d8 100755 --- a/ci/jenkins/bin/environment.sh +++ b/ci/jenkins/bin/environment.sh @@ -34,6 +34,9 @@ export TODAY=$(/bin/date +'%m%d%Y') 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 export ATS_BRANCH # Decide on compilers, gcc is the default http://git-wip-us.apache.org/repos/asf/trafficserver/blob/caf514b2/ci/jenkins/bin/in_tree.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh index c78495e..dabc0c3 100755 --- a/ci/jenkins/bin/in_tree.sh +++ b/ci/jenkins/bin/in_tree.sh @@ -16,14 +16,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -source /home/jenkins/bin/environment.sh +# This does intentionally not run the regressions, it's primarily a "build" test -if test "${JOB_NAME#*type=in_tree}" != "${JOB_NAME}"; then - cd "${WORKSPACE}/src_in-tree" +source /home/jenkins/bin/environment.sh +cd "${WORKSPACE}/src" - # Just use the configure from the snapshot.sh - ${ATS_MAKE} -j4 - ${ATS_MAKE} check +autoreconf -fi +./configure \ + --enable-ccache \ + --enable-werror \ + --enable-experimental-plugins \ + --enable-cppapi \ + --enable-example-plugins \ + --enable-test-tools - ${ATS_MAKE} clean -fi +${ATS_MAKE} -j5 V=1 +${ATS_MAKE} check +${ATS_MAKE} clean http://git-wip-us.apache.org/repos/asf/trafficserver/blob/caf514b2/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 0e16529..f0f9a2a 100755 --- a/ci/jenkins/bin/out_of_tree.sh +++ b/ci/jenkins/bin/out_of_tree.sh @@ -16,24 +16,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -source /home/jenkins/bin/environment.sh - -if test "${JOB_NAME#*type=out_of_tree}" != "${JOB_NAME}"; then - cd "${WORKSPACE}/src_out-of-tree" +# This does intentionally not run the regressions, it's primarily a "build" test - # This runs its own configure, so don't use the one from snapshot.sh - ${ATS_MAKE} -i distclean - mkdir -p BUILDS && cd BUILDS - ../configure \ - --enable-ccache \ - --enable-debug \ - --enable-werror \ - --enable-experimental-plugins \ - --enable-example-plugins \ - --enable-test-tools +source /home/jenkins/bin/environment.sh +cd "${WORKSPACE}/src" - ${ATS_MAKE} -j4 - ${ATS_MAKE} check +autoreconf -fi +mkdir -p BUILDS && cd BUILDS +../configure \ + --enable-ccache \ + --enable-werror \ + --enable-experimental-plugins \ + --enable-example-plugins \ + --enable-test-tools - ${ATS_MAKE} clean -fi +${ATS_MAKE} -j5 V=1 +${ATS_MAKE} check +${ATS_MAKE} clean http://git-wip-us.apache.org/repos/asf/trafficserver/blob/caf514b2/ci/jenkins/bin/snapshot.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/snapshot.sh b/ci/jenkins/bin/snapshot.sh index b953bd4..f983f18 100755 --- a/ci/jenkins/bin/snapshot.sh +++ b/ci/jenkins/bin/snapshot.sh @@ -34,9 +34,3 @@ ${ATS_MAKE} asf-dist # Make an "atomic" copy of the artifact (and leave it here for the archive) 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 - -# Duplicate the current source tree, such that we can run verifications on this -# tree in parallel on the jenkins master. -cd "${WORKSPACE}" -rsync --delete --exclude '*.tar.bz2' -av src/ src_in-tree -rsync --delete --exclude '*.tar.bz2' -av src/ src_out-of-tree
