[trafficserver] branch master updated: More fixes and cleanup of CI scripts

[zw...@apache.org]

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 80b82af  More fixes and cleanup of CI scripts
80b82af is described below

commit 80b82af6574867a9a81ad7a4338c8a97b49288b2
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Fri May 17 14:46:08 2019 -0600

    More fixes and cleanup of CI scripts
---
 ci/jenkins/bin/autest.sh         |  3 ++-
 ci/jenkins/bin/clang-analyzer.sh | 21 ++++++++++++---------
 ci/jenkins/bin/gh-mirror.sh      |  4 ++--
 ci/jenkins/bin/snapshot.sh       |  3 +++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ci/jenkins/bin/autest.sh b/ci/jenkins/bin/autest.sh
index c55fe6b..de0855e 100755
--- a/ci/jenkins/bin/autest.sh
+++ b/ci/jenkins/bin/autest.sh
@@ -20,7 +20,8 @@ set +x
 
 INSTALL="${WORKSPACE}/${BUILD_NUMBER}/install"
 URL="https://ci.trafficserver.apache.org/autest"
-AUSB="ausb-${ghprbPullId}.${BUILD_NUMBER}"
+JOB_ID=${ghprbPullId:-${ATS_BRANCH:-master}}
+AUSB="ausb-${JOB_ID}.${BUILD_NUMBER}"
 SANDBOX="/var/tmp/${AUSB}"
 
 # Optional settings
diff --git a/ci/jenkins/bin/clang-analyzer.sh b/ci/jenkins/bin/clang-analyzer.sh
index 9f011bd..c2ebb42 100755
--- a/ci/jenkins/bin/clang-analyzer.sh
+++ b/ci/jenkins/bin/clang-analyzer.sh
@@ -24,7 +24,7 @@ OUTPUT_BASE=${OUTPUT_BASE:-/home/jenkins/clang-analyzer}
 
 # Options
 options="--status-bugs --keep-empty"
-configure="--enable-experimental-plugins --enable-luajit"
+configure="--enable-experimental-plugins --with-luajit"
 
 # Additional checkers
 # Phil says these are all FP's: -enable-checker alpha.security.ArrayBoundV2
@@ -68,15 +68,18 @@ export CCC_CXX=${LLVM_BASE}/bin/clang++
 # This can be used to override any of those settings above
 [ -f ./.clang-analyzer ] && source ./.clang-analyzer
 
-# Don't do clang-analyzer runs on 7.1.x branch
-grep -q 700100 configure.ac && echo "7.1.x branch detected, stop here!" && exit 0
+# Don't do clang-analyzer runs on 7.1.x branch, for e.g. Github PRs
+grep -q 70010 configure.ac && echo "7.1.x branch detected, stop here!" && exit 0
+grep -q 80000 configure.ac && echo "8.0.x branch detected, stop here!" && exit 0
+grep -q 80010 configure.ac && echo "8.1.x branch detected, stop here!" && exit 0
 
 # 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${LLVM_BASE}/include/c++/v1 -std=c++17" \
-    LDFLAGS="-L${LLVM_BASE}/lib64 -Wl,-rpath=${LLVM_BASE}/lib64" || exit 1
+${LLVM_BASE}/bin/scan-build --keep-cc ./configure ${configure} \
+    CXXFLAGS="-stdlib=libc++ -I${LLVM_BASE}/include/c++/v1" \
+    LDFLAGS="-L${LLVM_BASE}/lib64 -Wl,-rpath=${LLVM_BASE}/lib64" \
+    || exit 1
 
 # Since we don't want the analyzer to look at yamlcpp, build it first
 # without scan-build. The subsequent make will then skip it.
@@ -84,14 +87,14 @@ ${LLVM_BASE}/bin/scan-build ./configure ${configure} \
 # by making yaml cpp a SUBDIRS in lib/Makefile.am.
 ${ATS_MAKE} -j $NPROCS -C lib all-local V=1 Q= || exit 1
 
-${LLVM_BASE}/bin/scan-build ${checkers} ${options} -o ${output} \
+${LLVM_BASE}/bin/scan-build --keep-cc ${checkers} ${options} -o ${output} \
     --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
+# Clean the work area unless NOCLEAN is set. This is just for debugging when you
 # need to see what the generated build did.
-if [ ! -z "$NOCLEAN" ]; then
+if [ -z "$NOCLEAN" ]; then
     ${ATS_MAKE} distclean
 fi
 [ "$output" != "/tmp" ] && echo "Results (if any) can be found at ${results_url}"
diff --git a/ci/jenkins/bin/gh-mirror.sh b/ci/jenkins/bin/gh-mirror.sh
index 8ed06fd..3f03fc6 100755
--- a/ci/jenkins/bin/gh-mirror.sh
+++ b/ci/jenkins/bin/gh-mirror.sh
@@ -69,7 +69,7 @@ function checkBuild() {
 REF_6_2=$(getRef "6.2.x")
 REF_7_1=$(getRef "7.1.x")
 REF_8_0=$(getRef "8.0.x")
-REF_8_1=$(getRef "8.1.x")
+#REF_8_1=$(getRef "8.1.x")
 REF_master=$(getRef "master")
 
 # Do the updates
@@ -80,5 +80,5 @@ ${GIT} update-server-info
 checkBuild "$REF_6_2" "6.2.x"
 checkBuild "$REF_7_1" "7.1.x"
 checkBuild "$REF_8_0" "8.0.x"
-checkBuild "$REF_8_1" "8.1.x"
+#checkBuild "$REF_8_1" "8.1.x"
 checkBuild "$REF_master" "master"
diff --git a/ci/jenkins/bin/snapshot.sh b/ci/jenkins/bin/snapshot.sh
index c0abbd9..aa493b4 100755
--- a/ci/jenkins/bin/snapshot.sh
+++ b/ci/jenkins/bin/snapshot.sh
@@ -33,3 +33,6 @@ ${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
+
+# Make sure we get a chance to synchronize the /CA/src directory to remote sites.
+sleep 5