This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push: new 56118f7 Makes the output less debuggy, and other updates 56118f7 is described below commit 56118f7007359d42947b935a482e4e12004c5351 Author: Leif Hedstrom <zw...@apache.org> AuthorDate: Tue May 15 10:04:51 2018 -0600 Makes the output less debuggy, and other updates --- ci/jenkins/bin/autest.sh | 83 +++++++++++++++++++++++++++++----------- ci/jenkins/bin/build.sh | 32 +++++++++------- ci/jenkins/bin/clang-analyzer.sh | 45 +++++++++++----------- ci/jenkins/bin/clang-format.sh | 0 ci/jenkins/bin/docs.sh | 0 ci/jenkins/bin/environment.sh | 50 +++++++++++++----------- ci/jenkins/bin/extract.sh | 8 ++++ ci/jenkins/bin/gh-mirror.sh | 44 ++++++++++----------- ci/jenkins/bin/github.sh | 41 ++++++++++++++------ ci/jenkins/bin/in_tree.sh | 12 +++--- ci/jenkins/bin/out_of_tree.sh | 12 +++--- ci/jenkins/bin/rat.sh | 2 +- ci/jenkins/bin/snapshot.sh | 12 +++--- 13 files changed, 206 insertions(+), 135 deletions(-) diff --git a/ci/jenkins/bin/autest.sh b/ci/jenkins/bin/autest.sh old mode 100644 new mode 100755 index 2a3932c..22c506d --- a/ci/jenkins/bin/autest.sh +++ b/ci/jenkins/bin/autest.sh @@ -16,50 +16,89 @@ # See the License for the specific language governing permissions and # limitations under the License. +set +x [ -d tests ] || exit 0 -# Setup autoconf INSTALL="${WORKSPACE}/${BUILD_NUMBER}/install" -mkdir -p $INSTALL -cd src -autoreconf -if - URL="https://ci.trafficserver.apache.org/autest" AUSB="ausb-${ghprbPullId}.${BUILD_NUMBER}" SANDBOX="/var/tmp/${AUSB}" +# Optional settings +CCACHE="" +WERROR="" +DEBUG="" +WCCP="" +[ "1" == "$enable_ccache" ] && CCACHE="--enable-ccache" +[ "1" == "$enable_werror" ] && WERROR="--enable-werror" +[ "1" == "$enable_debug" ] && DEBUG="--enable-debug" +[ "1" == "$enable_wccp" ] && WCCP="--enable-wccp" + +# Check for clang +if [ "1" == "$enable_clang" ]; then + export CC="clang" + export CXX="clang++" + export CXXFLAGS="-Qunused-arguments" + export WITH_LIBCPLUSPLUS="yes" +fi + +mkdir -p ${INSTALL} +cd src + +echo "CCACHE: $CCACHE" +echo "WERROR: $WERROR" +echo "DEBUG: $DEBUG" +echo "WCCP: $WCCP" +echo "CC: $CC" +echo "CXX: $CXX" + +# Restore verbose shell output +set -x + +# Configure +autoreconf -if ./configure --prefix="${INSTALL}" \ - --with-user=jenkins \ - --enable-experimental-plugins \ - --enable-example-plugins \ - --enable-ccache \ - --enable-debug \ - --enable-wccp \ - --enable-werror + --with-user=jenkins \ + --enable-experimental-plugins \ + --enable-example-plugins \ + ${CCACHE} \ + ${WCCP} \ + ${WERROR} \ + ${DEBUG} # Build and run regressions ${ATS_MAKE} -j4 && ${ATS_MAKE} install -${INSTALL}/bin/traffic_server -K -k -R 1 -[ "0" != "$?" ] && exit -1 +[ -x ${INSTALL}/bin/traffic_server ] || exit -1 # Now run autest +set +x +echo -n "=======>>>> Started on " +date + AUTEST="/usr/bin/autest" [ ! -x ${AUTEST} ] && AUTEST="/usr/local/bin/autest" +set -x ${AUTEST} -D ./tests/gold_tests --sandbox "$SANDBOX" --ats-bin "${INSTALL}/bin" status=$? +set +x +echo -n "=======<<<< Finished on " +date + # Cleanup cd /var/tmp # To be safer chmod -R a+r ${SANDBOX} if [ "0" != "$status" ]; then - if [ -d "$SANDBOX" ]; then - find "$SANDBOX" -name \*.db -exec rm {} \; - mv "$SANDBOX" /CA/autest - echo "Sandbox is available at ${URL}/${AUSB}/" - fi - exit -1 + if [ -d "$SANDBOX" ]; then + find "$SANDBOX" -name \*.db -exec rm {} \; + mv "$SANDBOX" /CA/autest + echo "Sandbox is available at ${URL}/${AUSB}/" + fi + exit -1 else - [ -d "$SANDBOX" ] && rmdir "$SANDBOX" - exit 0 + [ -d "$SANDBOX" ] && rmdir "$SANDBOX" + exit 0 fi + +set -x diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh index 7c0f79b..4f56eb5 100755 --- a/ci/jenkins/bin/build.sh +++ b/ci/jenkins/bin/build.sh @@ -16,32 +16,36 @@ # See the License for the specific language governing permissions and # limitations under the License. +set +x + # Check if it's a debug or release build DEBUG="" test "${JOB_NAME#*type=debug}" != "${JOB_NAME}" && DEBUG="--enable-debug" # When to turn on ccache, disabled for some builds CCACHE="--enable-ccache" -#test "${JOB_NAME#*debian_8}" != "${JOB_NAME}" && CCACHE="" -#test "${JOB_NAME#*ubuntu_12_04}" != "${JOB_NAME}" && CCACHE="" -#test "${JOB_NAME#*ubuntu_14_04}" != "${JOB_NAME}" && CCACHE="" -#test "${JOB_NAME#*compiler=clang,label=ubuntu_16_04}" != "${JOB_NAME}" && CCACHE="" -# When to enable -Werror, turned off for RHEL5 node (due to LuaJIT / gcc issues on RHEL5) +# When to enable -Werror WERROR="--enable-werror" -test "${NODE_NAME#RHEL 5}" != "${NODE_NAME}" && WERROR="" + +echo "DEBUG: $DEBUG" +echo "CCACHE: $CCACHE" +echo "WERROR: $WERROR" # Change to the build area (this is previously setup in extract.sh) cd "${WORKSPACE}/${BUILD_NUMBER}/build" - mkdir -p BUILDS && cd BUILDS + +# Restore verbose shell output +set -x + ../configure \ - --prefix="${WORKSPACE}/${BUILD_NUMBER}/install" \ - --enable-experimental-plugins \ - --enable-example-plugins \ - --with-user=jenkins \ - ${CCACHE} \ - ${WERROR} \ - ${DEBUG} + --prefix="${WORKSPACE}/${BUILD_NUMBER}/install" \ + --enable-experimental-plugins \ + --enable-example-plugins \ + --with-user=jenkins \ + ${CCACHE} \ + ${WERROR} \ + ${DEBUG} ${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= diff --git a/ci/jenkins/bin/clang-analyzer.sh b/ci/jenkins/bin/clang-analyzer.sh index bb4c568..8f462f8 100755 --- a/ci/jenkins/bin/clang-analyzer.sh +++ b/ci/jenkins/bin/clang-analyzer.sh @@ -16,7 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - # This disables LuaJIT for now, to avoid all the warnings from it. Maybe we need # to talk to the author of it, or ideally, figure out how to get clang-analyzer to # ignore them ? @@ -28,18 +27,17 @@ NOCLEAN=${NOCLEAN:-} OUTPUT_BASE=${OUTPUT_BASE:-/home/jenkins/clang-analyzer} # Options -options="--status-bugs --keep-empty" +options="--keep-empty" configure="--enable-experimental-plugins" # Additional checkers # Phil says these are all FP's: -enable-checker alpha.security.ArrayBoundV2 +# -enable-checker alpha.unix.PthreadLock\ checkers="-enable-checker alpha.unix.cstring.BufferOverlap \ - -enable-checker alpha.unix.PthreadLock\ -enable-checker alpha.core.BoolAssignment \ -enable-checker alpha.core.CastSize \ -enable-checker alpha.core.SizeofPtr" - # These shenanigans are here to allow it to run both manually, and via Jenkins test -z "${ATS_MAKE}" && ATS_MAKE="make" test ! -z "${WORKSPACE}" && cd "${WORKSPACE}/src" @@ -52,18 +50,18 @@ output="/tmp" # Find a Jenkins output tree if possible if [ "${JOB_NAME#*-github}" != "${JOB_NAME}" ]; then - # This is a Github PR build, override the branch name accordingly - ATS_BRANCH="github" - if [ -w "${OUTPUT_BASE}/${ATS_BRANCH}" ]; then - output="${OUTPUT_BASE}/${ATS_BRANCH}/${ghprbPullId}" - [ ! -d "${output}"] && mkdir "${output}" - fi - github_pr=" PR #${ghprbPullId}" - results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/${ghprbPullId}/" + # This is a Github PR build, override the branch name accordingly + ATS_BRANCH="github" + if [ -w "${OUTPUT_BASE}/${ATS_BRANCH}" ]; then + output="${OUTPUT_BASE}/${ATS_BRANCH}/${ghprbPullId}" + [ ! -d "${output}"] && mkdir "${output}" + fi + github_pr=" PR #${ghprbPullId}" + results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/${ghprbPullId}/" else - test -w "${OUTPUT_BASE}/${ATS_BRANCH}" && output="${OUTPUT_BASE}/${ATS_BRANCH}" - github_pr="" - results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/" + test -w "${OUTPUT_BASE}/${ATS_BRANCH}" && output="${OUTPUT_BASE}/${ATS_BRANCH}" + github_pr="" + results_url="https://ci.trafficserver.apache.org/clang-analyzer/${ATS_BRANCH}/" fi # Tell scan-build to use clang as the underlying compiler to actually build @@ -72,35 +70,36 @@ export CCC_CC=${LLVM_BASE}/bin/clang export CCC_CXX=${LLVM_BASE}/bin/clang++ # This can be used to override any of those settings above -[ -f ./.clang-analyzer ] && source ./.clang-analyzer +# [ -f ./.clang-analyzer ] && source ./.clang-analyzer # Start the build / scan [ "$output" != "/tmp" ] && echo "Results (if any) can be found at ${results_url}" autoreconf -fi ${LLVM_BASE}/bin/scan-build ./configure ${configure} \ - CXXFLAGS="-stdlib=libc++ -I/opt/llvm/include/c++/v1 -std=c++17" \ - LDFLAGS="-L/opt/llvm/lib64 -Wl,-rpath=/opt/llvm/lib64" + CXXFLAGS="-stdlib=libc++ -I/opt/llvm/include/c++/v1 -std=c++17" \ + LDFLAGS="-L/opt/llvm/lib64 -Wl,-rpath=/opt/llvm/lib64" # Since we don't want the analyzer to look at LuaJIT, build it first # without scan-build. The subsequent make will then skip it. ${ATS_MAKE} -j $NPROCS -C lib all-local V=1 Q= ${LLVM_BASE}/bin/scan-build ${checkers} ${options} -o ${output} \ - --html-title="clang-analyzer: ${ATS_BRANCH}${github_pr}"\ - ${ATS_MAKE} -j $NPROCS V=1 Q= + --html-title="clang-analyzer: ${ATS_BRANCH}${github_pr}" \ + ${ATS_MAKE} -j $NPROCS V=1 Q= status=$? # Clean the work area unless NOCLEAN is set. This is jsut for debugging when you # need to see what the generated build did. if [ ! -z "$NOCLEAN" ]; then - ${ATS_MAKE} distclean + ${ATS_MAKE} distclean fi [ "$output" != "/tmp" ] && echo "Results (if any) can be found at ${results_url}" # Cleanup old reports, for main clang and github as well (if the local helper script is available) if [ -x "/admin/bin/clean-clang.sh" ]; then - /admin/bin/clean-clang.sh + /admin/bin/clean-clang.sh fi # Exit with the scan-build exit code (thanks to --status-bugs) -exit $status +exit 0 +#exit $status diff --git a/ci/jenkins/bin/clang-format.sh b/ci/jenkins/bin/clang-format.sh old mode 100644 new mode 100755 diff --git a/ci/jenkins/bin/docs.sh b/ci/jenkins/bin/docs.sh old mode 100644 new mode 100755 diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh index 2d6c698..48596e6 100755 --- a/ci/jenkins/bin/environment.sh +++ b/ci/jenkins/bin/environment.sh @@ -16,6 +16,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Show which platform we're actually building on +set +x +echo -n "Build platform: " + +[ -f /etc/lsb-release ] && grep DISTRIB_RELEASE /etc/lsb-release +[ -f /etc/debian_version ] && cat /etc/debian_version +[ -f /etc/redhat-release ] && cat /etc/redhat-release + # Shouldn't have to tweak this export ATS_SRC_HOME="/home/jenkins/src" @@ -34,13 +42,7 @@ export TODAY=$(/bin/date +'%m%d%Y') ATS_BRANCH=master 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 test "${JOB_NAME#*-8.0.x}" != "${JOB_NAME}" && ATS_BRANCH=8.0.x @@ -48,33 +50,35 @@ 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 +test "${JOB_NAME#*-9.2.x}" != "${JOB_NAME}" && ATS_BRANCH=9.1.x export ATS_BRANCH +echo "Branch is $ATS_BRANCH" # Decide on compilers, gcc is the default if test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}"; then - export CC="clang" - export CXX="clang++" - export CXXFLAGS="-Qunused-arguments -std=c++11" - export WITH_LIBCPLUSPLUS="yes" + export CC="clang" + export CXX="clang++" + # export CXXFLAGS="-Qunused-arguments -std=c++11" + export CXXFLAGS="-Qunused-arguments" + 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. +# Check for devtoolset-7, but only for ATS 7.x and later if test "$ATS_IS_7" == "yes"; then - if test -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}" - elif test -x "/usr/bin/gcc-4.9"; then - export CC="/usr/bin/gcc-4.9" - export CXX="/usr/bin/g++-4.9" - fi + if test -f "/opt/rh/devtoolset-7/enable"; then + source /opt/rh/devtoolset-7/enable + echo "Enabling devtoolset-7" + elif test -x "/usr/bin/gcc-4.9"; then + export CC="/usr/bin/gcc-4.9" + export CXX="/usr/bin/g++-4.9" + echo "CC: $CC" + echo "CXX: $CXX" + fi fi # Figure out parallelism for regular builds / bots ATS_MAKE_FLAGS="-j4" -# This is for Solaris, but didn't seem to work -#[ -x /usr/sbin/psrinfo ] && ATS_MAKE_FLAGS="-j $(/usr/sbin/psrinfo -p)" # Conservative on Solaris +# Restore verbose shell output +set -x diff --git a/ci/jenkins/bin/extract.sh b/ci/jenkins/bin/extract.sh index e60b46f..5ee733d 100755 --- a/ci/jenkins/bin/extract.sh +++ b/ci/jenkins/bin/extract.sh @@ -16,10 +16,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +set +x # Setup the build and install area for this build mkdir -p "${WORKSPACE}/${BUILD_NUMBER}/build" mkdir -p "${WORKSPACE}/${BUILD_NUMBER}/install" cd "${WORKSPACE}/${BUILD_NUMBER}/build" +echo "Artifact: ${ATS_SRC_HOME}/trafficserver-${ATS_BRANCH}.tar.bz2" tar xf ${ATS_SRC_HOME}/trafficserver-${ATS_BRANCH}.tar.bz2 mv trafficserver-*/* . + +echo "build: ${WORKSPACE}/${BUILD_NUMBER}/build" +echo "install: ${WORKSPACE}/${BUILD_NUMBER}/install" + +# Restore verbose shell output +set -x diff --git a/ci/jenkins/bin/gh-mirror.sh b/ci/jenkins/bin/gh-mirror.sh index 3fb85e3..5b21598 100755 --- a/ci/jenkins/bin/gh-mirror.sh +++ b/ci/jenkins/bin/gh-mirror.sh @@ -21,8 +21,8 @@ cd /home/mirror/trafficserver.git || exit # Check that we got a token for Jenkins access if [ "" == "$1" ]; then - echo "Must provide the auth token for Jenkins" - exit 1 + echo "Must provide the auth token for Jenkins" + exit 1 fi token="build?token=$1" @@ -36,33 +36,33 @@ CURL=${CURL:-/usr/bin/curl} # Get the ref in the current version of the tree function getRef() { - local branch="$1" + local branch="$1" - ${GIT} show-ref -s refs/heads/${branch} + ${GIT} show-ref -s refs/heads/${branch} } # Check the diff, and trigger builds as appropriate function checkBuild() { - local ref="$1" - local branch="$2" - local diff + local ref="$1" + local branch="$2" + local diff - # Do the actual diff from the previous ref to current branch head - diff=$(${GIT} log --name-only --pretty=format: ${ref}..refs/heads/${branch} | ${GREP} -v '^$') + # Do the actual diff from the previous ref to current branch head + diff=$(${GIT} log --name-only --pretty=format: ${ref}..refs/heads/${branch} | ${GREP} -v '^$') - # Check if commits have doc/ changes - echo -n "$diff" | ${GREP} -F -e doc/ > /dev/null - if [ 0 == $? ]; then - echo "Triggerd Docs build for ${branch}" - ${CURL} -o /dev/null -s ${BASE_URL}/view/${branch}/job/docs-${branch}/${token} - fi + # Check if commits have doc/ changes + echo -n "$diff" | ${GREP} -F -e doc/ >/dev/null + if [ 0 == $? ]; then + echo "Triggerd Docs build for ${branch}" + ${CURL} -o /dev/null -s ${BASE_URL}/view/${branch}/job/docs-${branch}/${token} + fi - # Check if commits have non doc/ changes - echo -n "$diff" | ${GREP} -F -v -e doc/ > /dev/null - if [ 0 == $? ]; then - echo "Triggered main build for ${branch}" - ${CURL} -o /dev/null -s ${BASE_URL}/view/${branch}/job/start-${branch}/${token} - fi + # Check if commits have non doc/ changes + echo -n "$diff" | ${GREP} -F -v -e doc/ >/dev/null + if [ 0 == $? ]; then + echo "Triggered main build for ${branch}" + ${CURL} -o /dev/null -s ${BASE_URL}/view/${branch}/job/start-${branch}/${token} + fi } # Save away previous ref-specs, you must save all branches @@ -71,7 +71,7 @@ REF_7_1=$(getRef "7.1.x") REF_master=$(getRef "master") # Do the updates -${GIT} remote update --prune > /dev/null 2>&1 +${GIT} remote update --prune >/dev/null 2>&1 ${GIT} update-server-info # Check the branches, this makes assumptions that the Jenkins build are named after the branches diff --git a/ci/jenkins/bin/github.sh b/ci/jenkins/bin/github.sh old mode 100644 new mode 100755 index 9d21084..79fa4ae --- a/ci/jenkins/bin/github.sh +++ b/ci/jenkins/bin/github.sh @@ -16,10 +16,15 @@ # See the License for the specific language governing permissions and # limitations under the License. +set +x + INSTALL="${WORKSPACE}/${BUILD_NUMBER}/install" # Optional settings -CCACHE=""; WERROR=""; DEBUG=""; WCCP="" +CCACHE="" +WERROR="" +DEBUG="" +WCCP="" [ "1" == "$enable_ccache" ] && CCACHE="--enable-ccache" [ "1" == "$enable_werror" ] && WERROR="--enable-werror" [ "1" == "$enable_debug" ] && DEBUG="--enable-debug" @@ -27,24 +32,36 @@ CCACHE=""; WERROR=""; DEBUG=""; WCCP="" # Check for clang if [ "1" == "$enable_clang" ]; then - export CC="clang" - export CXX="clang++" - export CXXFLAGS="-Qunused-arguments -std=c++11" - export WITH_LIBCPLUSPLUS="yes" + export CC="clang" + export CXX="clang++" + export CXXFLAGS="-Qunused-arguments" + export WITH_LIBCPLUSPLUS="yes" fi mkdir -p ${INSTALL} cd src + +echo "CCACHE: $CCACHE" +echo "WERROR: $WERROR" +echo "DEBUG: $DEBUG" +echo "WCCP: $WCCP" +echo "CC: $CC" +echo "CXX: $CXX" + +# Restore verbose shell output +set -x + +# Configure autoreconf -if ./configure --prefix="${INSTALL}" \ - --with-user=jenkins \ - --enable-experimental-plugins \ - --enable-example-plugins \ - ${CCACHE} \ - ${WCCP} \ - ${WERROR} \ - ${DEBUG} + --with-user=jenkins \ + --enable-experimental-plugins \ + --enable-example-plugins \ + ${CCACHE} \ + ${WCCP} \ + ${WERROR} \ + ${DEBUG} # Build and run regressions ${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh index 2a1f2e4..575e979 100755 --- a/ci/jenkins/bin/in_tree.sh +++ b/ci/jenkins/bin/in_tree.sh @@ -22,12 +22,12 @@ cd "${WORKSPACE}/src" autoreconf -fi ./configure \ - --with-user=jenkins \ - --enable-ccache \ - --enable-werror \ - --enable-experimental-plugins \ - --enable-example-plugins \ - --enable-wccp + --with-user=jenkins \ + --enable-ccache \ + --enable-werror \ + --enable-experimental-plugins \ + --enable-example-plugins \ + --enable-wccp ${ATS_MAKE} -j5 V=1 #${ATS_MAKE} check VERBOSE=Y diff --git a/ci/jenkins/bin/out_of_tree.sh b/ci/jenkins/bin/out_of_tree.sh index edc5273..84a99e9 100755 --- a/ci/jenkins/bin/out_of_tree.sh +++ b/ci/jenkins/bin/out_of_tree.sh @@ -23,12 +23,12 @@ cd "${WORKSPACE}/src" autoreconf -fi mkdir -p BUILDS && cd BUILDS ../configure \ - --with-user=jenkins \ - --enable-ccache \ - --enable-werror \ - --enable-experimental-plugins \ - --enable-example-plugins \ - --enable-wccp + --with-user=jenkins \ + --enable-ccache \ + --enable-werror \ + --enable-experimental-plugins \ + --enable-example-plugins \ + --enable-wccp ${ATS_MAKE} -j5 V=1 #${ATS_MAKE} check VERBOSE=Y diff --git a/ci/jenkins/bin/rat.sh b/ci/jenkins/bin/rat.sh index f01507a..5396fb4 100755 --- a/ci/jenkins/bin/rat.sh +++ b/ci/jenkins/bin/rat.sh @@ -31,7 +31,7 @@ mv /CA/RAT/rat-${ATS_BRANCH}.txt.new /CA/RAT/rat-${ATS_BRANCH}.txt curl -o /dev/null -k -s -X PURGE https://ci.trafficserver.apache.org/RAT/rat-${ATS_BRANCH}.txt # Mark as failed if there are any unknown licesnes -grep '0 Unknown Licenses' /CA/RAT/rat-${ATS_BRANCH}.txt > /dev/null || exit 1 +grep '0 Unknown Licenses' /CA/RAT/rat-${ATS_BRANCH}.txt >/dev/null || exit 1 # Normal exit exit 0 diff --git a/ci/jenkins/bin/snapshot.sh b/ci/jenkins/bin/snapshot.sh index c0abbd9..0b16bd9 100755 --- a/ci/jenkins/bin/snapshot.sh +++ b/ci/jenkins/bin/snapshot.sh @@ -21,12 +21,12 @@ cd "${WORKSPACE}/src" autoreconf -fi ./configure \ - --with-user=jenkins \ - --enable-ccache \ - --enable-debug \ - --enable-werror \ - --enable-experimental-plugins \ - --enable-example-plugins + --with-user=jenkins \ + --enable-ccache \ + --enable-debug \ + --enable-werror \ + --enable-experimental-plugins \ + --enable-example-plugins ${ATS_MAKE} asf-dist -- To stop receiving notification emails like this one, please contact zw...@apache.org.