[trafficserver] branch master updated: Fixes some cache-tests build issues

[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 432d38e  Fixes some cache-tests build issues
432d38e is described below

commit 432d38e83b6dc40e30132de49f61a1dd9dad4aee
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Fri May 10 15:27:16 2019 -0600

    Fixes some cache-tests build issues
---
 ci/jenkins/bin/cache-tests.sh | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/ci/jenkins/bin/cache-tests.sh b/ci/jenkins/bin/cache-tests.sh
index 9fece11..5ca9b55 100755
--- a/ci/jenkins/bin/cache-tests.sh
+++ b/ci/jenkins/bin/cache-tests.sh
@@ -16,16 +16,20 @@
 #  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"
+REMAP="${PREFIX}/etc/trafficserver/remap.config"
+RECORDS="${PREFIX}/etc/trafficserver/records.config"
+
+TWEAK=""
+[ "1" == "$enable_tweak" ] && TWEAK="-tweak"
 
+# Change to the build area (this is previously setup in extract.sh)
+set +x
 cd "${WORKSPACE}/${BUILD_NUMBER}/build"
 
 ./configure \
     --prefix=${PREFIX} \
     --with-user=jenkins \
-    --enable-debug \
     --enable-ccache
 
 # Not great, but these can fail on the "docs' builds for older versions, sigh
@@ -34,21 +38,35 @@ ${ATS_MAKE} -i install
 
 [ -x ${PREFIX}/bin/traffic_server ] || exit 1
 
+# Get NPM v10
+source /opt/rh/rh-nodejs10/enable
 
 # 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
+echo "map http://127.0.0.1:8080 http://192.168.3.13:8000" >> $REMAP
+
 ${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
+cat /CA/cache-tests/${ATS_BRANCH}.json
 
 ${PREFIX}/bin/trafficserver stop
 
-cat /CA/cache-tests/${ATS_BRANCH}.json
+
+# Now run it again, maybe, with the tweaked configs
+if [ "" != "$TWEAK" ]; then
+#    echo "CONFIG proxy.config.http.cache.required_headers INT 1" >> $RECORDS
+    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
+    echo "TWEAKED RESULTS"
+    cat /CA/cache-tests/${ATS_BRANCH}${TWEAK}.json
+
+    ${PREFIX}/bin/trafficserver stop
+fi
 
 # We should check the .json file here, but not yet
 exit 0