Skip to content

Incorporates the latest CI build changes #7251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Oct 8, 2020
Merged

Incorporates the latest CI build changes #7251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ci/jenkins/bin/autest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
set +x

cd src
sleep 30

if [ ! -z "$ghprbActualCommit" ]; then
git branch --contains ${ghprbActualCommit} > /dev/null
if [ $? = 0 -a ! -z "$ghprbActualCommit" ]; then
git diff ${ghprbActualCommit}^...${ghprbActualCommit} --name-only | egrep -E '^(build|iocore|proxy|tests|include|mgmt|plugins|proxy|src)/' > /dev/null
if [ $? = 1 ]; then
echo "No relevant files changed, skipping run"
Expand Down
8 changes: 7 additions & 1 deletion ci/jenkins/bin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@ CCACHE="--enable-ccache"
# When to enable -Werror
WERROR="--enable-werror"

# Optional settings
ASAN=""
[ "1" == "$enable_asan" ] && ASAN="--enable-asan"

echo "DEBUG: $DEBUG"
echo "CCACHE: $CCACHE"
echo "WERROR: $WERROR"
echo "ASAN: $ASAN"

# Change to the build area (this is previously setup in extract.sh)
cd "${ATS_BUILD_BASEDIR}/build"
Expand All @@ -46,7 +51,8 @@ set -x
--with-user=jenkins \
${CCACHE} \
${WERROR} \
${DEBUG}
${DEBUG} \
${ASAN}

echo
echo -n "Main build started at " && date
Expand Down
9 changes: 5 additions & 4 deletions ci/jenkins/bin/cache-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ ${ATS_MAKE} -i ${ATS_MAKE_FLAGS} V=1 Q=
${ATS_MAKE} -i install

[ -x ${PREFIX}/bin/traffic_server ] || exit 1
ldd ${PREFIX}/bin/traffic_server

# Get NPM v10
source /opt/rh/rh-nodejs10/enable
# Get NPM v12
source /opt/rh/rh-nodejs12/enable

# Setup and start ATS with the required remap rule
echo "map http://127.0.0.1:8080 http://192.168.3.1:8000" >> $REMAP
Expand All @@ -49,7 +50,7 @@ ${PREFIX}/bin/trafficserver start
set -x

cd /home/jenkins/cache-tests
npm run --silent cli --base=http://127.0.0.1:8080/ > /CA/cache-tests/${ATS_BRANCH}.json
npm run --silent cli --base=http://127.0.0.1:8080 > /CA/cache-tests/${ATS_BRANCH}.json
cat /CA/cache-tests/${ATS_BRANCH}.json

${PREFIX}/bin/trafficserver stop
Expand All @@ -61,7 +62,7 @@ if [ "" != "$TWEAK" ]; then
echo "CONFIG proxy.config.http.negative_caching_enabled INT 1" >> $RECORDS
${PREFIX}/bin/trafficserver start
cd /home/jenkins/cache-tests
npm run --silent cli --base=http://127.0.0.1:8080/ > /CA/cache-tests/${ATS_BRANCH}${TWEAK}.json
npm run --silent cli --base=http://127.0.0.1:8080 > /CA/cache-tests/${ATS_BRANCH}${TWEAK}.json
echo "TWEAKED RESULTS"
cat /CA/cache-tests/${ATS_BRANCH}${TWEAK}.json

Expand Down
6 changes: 0 additions & 6 deletions ci/jenkins/bin/clang-analyzer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ checkers="-enable-checker alpha.unix.cstring.BufferOverlap \
test -z "${ATS_MAKE}" && ATS_MAKE="make"
test ! -z "${WORKSPACE}" && cd "${WORKSPACE}/src"

# Check to see if this is a Github PR build (so not a github branch per-se)
test "${JOB_NAME#*-github}" != "${JOB_NAME}" && ATS_BRANCH="github"

# Where to store the results, special case for the CI
output="/tmp"

Expand Down Expand Up @@ -103,6 +100,3 @@ fi
if [ -x "/admin/bin/clean-clang.sh" ]; then
/admin/bin/clean-clang.sh
fi

# Exit with the scan-build exit code (thanks to --status-bugs)
exit $status
8 changes: 8 additions & 0 deletions ci/jenkins/bin/environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ export TODAY=$(/bin/date +'%m%d%Y')
# Extract the current branch (default to master). ToDo: Can we do this better ?
ATS_BRANCH=master

# Make sure to leave these, for the HTTP cache tests
test "${JOB_NAME#*-5.3.x}" != "${JOB_NAME}" && ATS_BRANCH=5.3.x
test "${JOB_NAME#*-6.2.x}" != "${JOB_NAME}" && ATS_BRANCH=6.2.x

# These should be maintained and cleaned up as needed.
test "${JOB_NAME#*-7.1.x}" != "${JOB_NAME}" && ATS_BRANCH=7.1.x
test "${JOB_NAME#*-8.0.x}" != "${JOB_NAME}" && ATS_BRANCH=8.0.x
test "${JOB_NAME#*-8.1.x}" != "${JOB_NAME}" && ATS_BRANCH=8.1.x
Expand All @@ -59,6 +64,9 @@ test "${JOB_NAME#*-10.1.x}" != "${JOB_NAME}" && ATS_BRANCH=10.1.x
test "${JOB_NAME#*-10.2.x}" != "${JOB_NAME}" && ATS_BRANCH=10.2.x
test "${JOB_NAME#*-10.3.x}" != "${JOB_NAME}" && ATS_BRANCH=10.3.x

# Special case for the full build of clang analyzer
test "${JOB_NAME}" == "clang-analyzer-full" && ATS_BRANCH=FULL

export ATS_BRANCH
echo "Branch is $ATS_BRANCH"

Expand Down