[trafficserver-ci] branch main updated: change branch build install loc

[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 1c03ea8  change branch build install loc
     new b238011  Merge pull request #264 from traeak/cmake_regression
1c03ea8 is described below

commit 1c03ea8177c32f38d3fafe45c731a17250781d39
Author: Brian Olsen <bnol...@gmail.com>
AuthorDate: Wed Oct 25 13:30:23 2023 -0600

    change branch build install loc
---
 jenkins/bin/cmake.sh             | 24 ++++++++----------------
 jenkins/branch/CMakePresets.json |  2 +-
 jenkins/branch/os_build.pipeline |  2 ++
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/jenkins/bin/cmake.sh b/jenkins/bin/cmake.sh
index e99a10b..1ee10e3 100755
--- a/jenkins/bin/cmake.sh
+++ b/jenkins/bin/cmake.sh
@@ -74,21 +74,13 @@ EOF
 
 echo "${contents}" > CMakeUserPresets.json
 
-#cmake -B cmake-build-release\
-#  -GNinja \
-#  -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
-#  -DCMAKE_BUILD_TYPE=Release \
-#  -DBUILD_EXPERIMENTAL_PLUGINS=ON \
-#  -DCMAKE_INSTALL_PREFIX=/tmp/ats
-#  -DOPENSSL_ROOT_DIR=/opt/openssl-quic
-
-cmake -B builddir --preset ci-preset
-cmake --build builddir -j${NPROC} -v
-
-pushd builddir
-ctest -B builddir -j${NPROC} --output-on-failure --no-compress-output -T Test
+cmake -B build --preset ci-preset
+cmake --build build -j${NPROC} -v
+
+pushd build
+ctest -B build -j${NPROC} --output-on-failure --no-compress-output -T Test
 popd
 
-cmake --install builddir
-chmod -R go+w installdir
-installdir/bin/traffic_server -K -k -R 1
+cmake --install build
+chmod -R go+w /tmp/ats
+/tmp/ats/bin/traffic_server -K -k -R 1
diff --git a/jenkins/branch/CMakePresets.json b/jenkins/branch/CMakePresets.json
index 7404f69..f4f4c1d 100644
--- a/jenkins/branch/CMakePresets.json
+++ b/jenkins/branch/CMakePresets.json
@@ -14,7 +14,7 @@
       "binaryDir": "${sourceDir}/builddir",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/installdir",
+        "CMAKE_INSTALL_PREFIX": "/tmp/ats",
         "ENABLE_CCACHE": "ON",
         "BUILD_EXPERIMENTAL_PLUGINS": "ON",
         "BUILD_REGRESSION_TESTING": "ON",
diff --git a/jenkins/branch/os_build.pipeline b/jenkins/branch/os_build.pipeline
index a82fa61..e4930e0 100644
--- a/jenkins/branch/os_build.pipeline
+++ b/jenkins/branch/os_build.pipeline
@@ -62,8 +62,10 @@ pipeline {
 
                                        if [ -d cmake ]
                                        then
+                                               echo "Building with CMake."
                                                ../ci/jenkins/bin/cmake.sh
                                        else
+                                               echo "Building with autotools."
                                                ../ci/jenkins/bin/autotools.sh
                                        fi
                                        '''