Repository: trafficserver Updated Branches: refs/heads/master c0fba0a6c -> 0c97776a2
Cleanup the Jenkins build scripts Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0c97776a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0c97776a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0c97776a Branch: refs/heads/master Commit: 0c97776a201b5b872be1b812378f0fddcbde1293 Parents: c0fba0a Author: Leif Hedstrom <[email protected]> Authored: Tue May 20 14:54:23 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue May 20 14:54:23 2014 -0600 ---------------------------------------------------------------------- ci/jenkins/bin/build.sh | 5 ++++- ci/jenkins/bin/clang-analyzer.sh | 5 ++++- ci/jenkins/bin/cleanup.sh | 4 ++++ ci/jenkins/bin/extract.sh | 2 ++ ci/jenkins/bin/in_tree.sh | 1 + ci/jenkins/bin/out_of_tree.sh | 1 + ci/jenkins/bin/rat.sh | 16 +++++++--------- ci/jenkins/bin/regression.sh | 4 ++++ ci/jenkins/bin/snapshot.sh | 6 +++--- 9 files changed, 30 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/ci/jenkins/bin/build.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh index 220462f..55fce64 100755 --- a/ci/jenkins/bin/build.sh +++ b/ci/jenkins/bin/build.sh @@ -16,6 +16,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh + # Check if it's a debug or release build enable_debug="" test "${JOB_NAME#*type=debug}" != "${JOB_NAME}" && enable_debug="--enable-debug" @@ -32,7 +34,8 @@ test "${NODE_NAME#RHEL 5}" != "${NODE_NAME}" && enable_werror="" # Change to the build area (this is previously setup in extract.sh) cd "${WORKSPACE}/${BUILD_NUMBER}/build" -./configure \ +mkdir BUILDS && cd BUILDS +../configure \ --prefix="${WORKSPACE}/${BUILD_NUMBER}/install" \ --enable-experimental-plugins \ --enable-example-plugins \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/ci/jenkins/bin/clang-analyzer.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/clang-analyzer.sh b/ci/jenkins/bin/clang-analyzer.sh index e39db0b..eac0fe2 100755 --- a/ci/jenkins/bin/clang-analyzer.sh +++ b/ci/jenkins/bin/clang-analyzer.sh @@ -16,8 +16,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh cd "${WORKSPACE}/src" autoreconf -fi ./configure --enable-experimental-plugins -scan-build -o /home/jenkins/clang-analyzer --html-title="ATS master branch" make -j6 +scan-build -o /home/jenkins/clang-analyzer --html-title="ATS master branch" ${ATS_MAKE} -j6 + +${ATS_MAKE} distclean http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/ci/jenkins/bin/cleanup.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/cleanup.sh b/ci/jenkins/bin/cleanup.sh index c3e689a..a305f7b 100755 --- a/ci/jenkins/bin/cleanup.sh +++ b/ci/jenkins/bin/cleanup.sh @@ -16,8 +16,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh + # Do a distclean, to verify that we can actually satisfy this (common) build target cd "${WORKSPACE}/${BUILD_NUMBER}/build" +[ -d BUILDS ] && cd BUILDS + ${ATS_MAKE} distclean # Final cleanup, this removes the build and install areas http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/ci/jenkins/bin/extract.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/extract.sh b/ci/jenkins/bin/extract.sh index e60b46f..fd86d6c 100755 --- a/ci/jenkins/bin/extract.sh +++ b/ci/jenkins/bin/extract.sh @@ -16,6 +16,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh + # Setup the build and install area for this build mkdir -p "${WORKSPACE}/${BUILD_NUMBER}/build" mkdir -p "${WORKSPACE}/${BUILD_NUMBER}/install" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/ci/jenkins/bin/in_tree.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh index 0dde26f..2668ff5 100755 --- a/ci/jenkins/bin/in_tree.sh +++ b/ci/jenkins/bin/in_tree.sh @@ -16,6 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh cd "${WORKSPACE}/src_in-tree" if test "${JOB_NAME#*type=in_tree}" != "${JOB_NAME}"; then http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/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 f9e0bd7..73598a7 100755 --- a/ci/jenkins/bin/out_of_tree.sh +++ b/ci/jenkins/bin/out_of_tree.sh @@ -16,6 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh cd "${WORKSPACE}/src_out-of-tree" if test "${JOB_NAME#*type=out_of_tree}" != "${JOB_NAME}"; then http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/ci/jenkins/bin/rat.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/rat.sh b/ci/jenkins/bin/rat.sh index aa1d504..18a0490 100755 --- a/ci/jenkins/bin/rat.sh +++ b/ci/jenkins/bin/rat.sh @@ -16,14 +16,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -cd "${WORKSPACE}/src_rat" +source /home/jenkins/bin/environment.sh +cd "${WORKSPACE}/src" -if test "${JOB_NAME#*type=RAT}" != "${JOB_NAME}"; then - # Just use the configure from the snapshot.sh - ${ATS_MAKE} rat | tee RAT.txt +autoreconf -if && ./configure +${ATS_MAKE} rat | tee RAT.txt +mv RAT.txt /home/jenkins/RAT/rat-${ATS_BRANCH}.txt.new +mv /home/jenkins/RAT/rat-${ATS_BRANCH}.txt.new /home/jenkins/RAT/rat-${ATS_BRANCH}.txt - mv RAT.txt /home/jenkins/RAT/rat-${ATS_BRANCH}.txt.new - mv /home/jenkins/RAT/rat-${ATS_BRANCH}.txt.new /home/jenkins/RAT/rat-${ATS_BRANCH}.txt - - grep 'Unknown Licenses' /home/jenkins/RAT/rat-${ATS_BRANCH}.txt #&& exit -1 -fi +grep 'Unknown Licenses' /home/jenkins/RAT/rat-${ATS_BRANCH}.txt #&& exit -1 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c97776a/ci/jenkins/bin/regression.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/regression.sh b/ci/jenkins/bin/regression.sh index 4721011..84c68d8 100755 --- a/ci/jenkins/bin/regression.sh +++ b/ci/jenkins/bin/regression.sh @@ -16,7 +16,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh + cd "${WORKSPACE}/${BUILD_NUMBER}/build" +[ -d BUILDS ] && cd BUILDS + ${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/0c97776a/ci/jenkins/bin/snapshot.sh ---------------------------------------------------------------------- diff --git a/ci/jenkins/bin/snapshot.sh b/ci/jenkins/bin/snapshot.sh index 0594a08..b953bd4 100755 --- a/ci/jenkins/bin/snapshot.sh +++ b/ci/jenkins/bin/snapshot.sh @@ -16,6 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +source /home/jenkins/bin/environment.sh cd "${WORKSPACE}/src" autoreconf -fi @@ -37,6 +38,5 @@ mv ${ATS_SRC_HOME}/trafficserver-${ATS_BRANCH}.tar.bz2.new ${ATS_SRC_HOME}/traff # Duplicate the current source tree, such that we can run verifications on this # tree in parallel on the jenkins master. cd "${WORKSPACE}" -rsync --exclude '*.tar.bz2' -av src/ src_in-tree -rsync --exclude '*.tar.bz2' -av src/ src_out-of-tree -rsync --exclude '*.tar.bz2' -av src/ src_rat +rsync --delete --exclude '*.tar.bz2' -av src/ src_in-tree +rsync --delete --exclude '*.tar.bz2' -av src/ src_out-of-tree
