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 a2dc839 Updates the CI build scripts, adds a new build for HTTP
cache-tests
a2dc839 is described below
commit a2dc839fc234f7697db637655d277b83fc4a5ea8
Author: Leif Hedstrom <[email protected]>
AuthorDate: Fri Dec 7 14:09:18 2018 -0700
Updates the CI build scripts, adds a new build for HTTP cache-tests
---
ci/jenkins/bin/cache-tests.sh | 50 +++++++++++++++++++++++++++++++++++++++++++
ci/jenkins/bin/environment.sh | 9 ++++++--
ci/jenkins/bin/gh-mirror.sh | 2 ++
3 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/ci/jenkins/bin/cache-tests.sh b/ci/jenkins/bin/cache-tests.sh
new file mode 100755
index 0000000..f285b99
--- /dev/null
+++ b/ci/jenkins/bin/cache-tests.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Change to the build area (this is previously setup in extract.sh)
+set +x
+PREFIX="${WORKSPACE}/${BUILD_NUMBER}/install"
+
+cd "${WORKSPACE}/${BUILD_NUMBER}/build"
+
+./configure \
+ --prefix=${PREFIX} \
+ --with-user=jenkins \
+ --enable-debug \
+ --enable-ccache
+
+${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q=
+${ATS_MAKE} install
+
+# Setup and start ATS with the required remap rule
+echo "map http://127.0.0.1:8080 http://192.168.3.13:8000"; >>
${PREFIX}/etc/trafficserver/remap.config
+${PREFIX}/bin/trafficserver start
+
+# Get NPM v10, and run the tests
+source /opt/rh/rh-nodejs10/enable
+set -x
+
+cd /home/jenkins/cache-tests
+npm run --silent cli --base=http://127.0.0.1:8080/ >
/CA/cache-tests/${ATS_BRANCH}.json
+
+${PREFIX}/bin/trafficserver stop
+
+cat /CA/cache-tests/${ATS_BRANCH}.json
+
+# We should check the .json file here, but not yet
+exit 0
diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index 079035f..2790694 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -44,13 +44,18 @@ ATS_IS_7="yes"
test "${JOB_NAME#*-6.2.x}" != "${JOB_NAME}" && ATS_BRANCH=6.2.x &&
ATS_IS_7="no"
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
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#*-8.3.x}" != "${JOB_NAME}" && ATS_BRANCH=8.3.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.1.x
+test "${JOB_NAME#*-9.2.x}" != "${JOB_NAME}" && ATS_BRANCH=9.2.x
+test "${JOB_NAME#*-9.3.x}" != "${JOB_NAME}" && ATS_BRANCH=9.3.x
+test "${JOB_NAME#*-10.0.x}" != "${JOB_NAME}" && ATS_BRANCH=10.0.x
+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
export ATS_BRANCH
echo "Branch is $ATS_BRANCH"
diff --git a/ci/jenkins/bin/gh-mirror.sh b/ci/jenkins/bin/gh-mirror.sh
index 48d22f0..4f9fab9 100755
--- a/ci/jenkins/bin/gh-mirror.sh
+++ b/ci/jenkins/bin/gh-mirror.sh
@@ -69,6 +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_master=$(getRef "master")
# Do the updates
@@ -79,4 +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_master" "master"
