This is an automated email from the ASF dual-hosted git repository.

bnolsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git


The following commit(s) were added to refs/heads/main by this push:
     new 6ac0bb1  fix cmake install directory and removed traffic_manager
     new 8cc638f  Merge pull request #276 from traeak/cmake_cache_tests
6ac0bb1 is described below

commit 6ac0bb1510e354a05eff8ee6d3dbf7a4d37e025e
Author: Brian Olsen <[email protected]>
AuthorDate: Tue Oct 31 07:17:56 2023 -0600

    fix cmake install directory and removed traffic_manager
---
 jenkins/branch/cache-tests.pipeline | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jenkins/branch/cache-tests.pipeline 
b/jenkins/branch/cache-tests.pipeline
index ad7e1dd..38b18fe 100644
--- a/jenkins/branch/cache-tests.pipeline
+++ b/jenkins/branch/cache-tests.pipeline
@@ -57,7 +57,7 @@ pipeline {
                                                        if [ -d cmake ]
                                                        then
                                                                cmake -B build \
-                                                                       
-DCMAKE_INSTALL_PREFIX=/tmp/ats
+                                                                       
-DCMAKE_INSTALL_PREFIX=/opt/ats
                                                                cmake --build 
build -j`nproc` -v
                                                                cmake --install 
build
                                                        else
@@ -79,7 +79,12 @@ pipeline {
                                                sh '''
                                                        cd /cache-tests
                                                        mkdir -p 
${WORKSPACE}/output
-                                                       
/opt/ats/bin/traffic_manager &
+                                                       if [ -x 
/opt/ats/bin/traffic_manager ]
+                                                       then
+                                                               
/opt/ats/bin/traffic_manager &
+                                                       else
+                                                               
/opt/ats/bin/trafficserver start
+                                                       fi
                                                        sleep 2
                                                        npm run --silent cli 
--base=http://localhost:8080/ > ${WORKSPACE}/output/ats-${GITHUB_BRANCH}.json
                                                        chmod 644 
${WORKSPACE}/output/ats-${GITHUB_BRANCH}.json

Reply via email to