[trafficserver-ci] branch main updated: cmake.sh: fix for changed location of ats install

[bnolsen]

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 014c009  cmake.sh: fix for changed location of ats install
     new e6353d9  Merge pull request #263 from traeak/more_cov_fixes
014c009 is described below

commit 014c009ed31c857d7da4337ea7a5d2cd7ad272c3
Author: Brian Olsen <bnol...@gmail.com>
AuthorDate: Wed Oct 25 12:59:10 2023 -0600

    cmake.sh: fix for changed location of ats install
---
 jenkins/bin/cmake.sh             | 6 +++---
 jenkins/branch/coverity.pipeline | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jenkins/bin/cmake.sh b/jenkins/bin/cmake.sh
index 53d9760..e99a10b 100755
--- a/jenkins/bin/cmake.sh
+++ b/jenkins/bin/cmake.sh
@@ -84,11 +84,11 @@ echo "${contents}" > CMakeUserPresets.json
 
 cmake -B builddir --preset ci-preset
 cmake --build builddir -j${NPROC} -v
-cmake --install builddir
 
 pushd builddir
 ctest -B builddir -j${NPROC} --output-on-failure --no-compress-output -T Test
 popd
 
-chmod -R go+w /tmp/ats/
-/tmp/ats/bin/traffic_server -K -k -R 1
+cmake --install builddir
+chmod -R go+w installdir
+installdir/bin/traffic_server -K -k -R 1
diff --git a/jenkins/branch/coverity.pipeline b/jenkins/branch/coverity.pipeline
index 425464d..0e36fe8 100644
--- a/jenkins/branch/coverity.pipeline
+++ b/jenkins/branch/coverity.pipeline
@@ -66,8 +66,8 @@ pipeline {
                                                set -x
 
                                                if [ -d cmake ]
-                                                       rm -rf build
                                                then
+                                                       rm -rf build
                                                else
                                                        make distclean
                                                fi