[trafficserver-ci] branch main updated: fix regression.sh script

[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 568f9ae  fix regression.sh script
     new 2d010e3  Merge pull request #265 from traeak/branch_regression
568f9ae is described below

commit 568f9aedaf0acc9d12b33aabbad9fa6faa4069f4
Author: Brian Olsen <bnol...@gmail.com>
AuthorDate: Wed Oct 25 13:55:18 2023 -0600

    fix regression.sh script
---
 jenkins/bin/autotools.sh         |  2 +-
 jenkins/bin/cmake.sh             | 12 ++++++------
 jenkins/bin/regression.sh        | 19 +++++++++++++++----
 jenkins/branch/os_build.pipeline |  2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/jenkins/bin/autotools.sh b/jenkins/bin/autotools.sh
index 32d3404..6f31766 100755
--- a/jenkins/bin/autotools.sh
+++ b/jenkins/bin/autotools.sh
@@ -61,7 +61,7 @@ set -x
 
 #../configure \
 ./configure \
-    --prefix="${ATS_BUILD_BASEDIR}/install" \
+    --prefix="/tmp/ats" \
     --enable-experimental-plugins \
     --enable-example-plugins \
     --with-user=jenkins \
diff --git a/jenkins/bin/cmake.sh b/jenkins/bin/cmake.sh
index 1ee10e3..3476eed 100755
--- a/jenkins/bin/cmake.sh
+++ b/jenkins/bin/cmake.sh
@@ -76,11 +76,11 @@ echo "${contents}" > CMakeUserPresets.json
 
 cmake -B build --preset ci-preset
 cmake --build build -j${NPROC} -v
+cmake --install build
 
-pushd build
-ctest -B build -j${NPROC} --output-on-failure --no-compress-output -T Test
-popd
+#pushd build
+#ctest -B build -j${NPROC} --output-on-failure --no-compress-output -T Test
+#popd
 
-cmake --install build
-chmod -R go+w /tmp/ats
-/tmp/ats/bin/traffic_server -K -k -R 1
+#chmod -R go+w /tmp/ats
+#/tmp/ats/bin/traffic_server -K -k -R 1
diff --git a/jenkins/bin/regression.sh b/jenkins/bin/regression.sh
index 674d8fd..e10ae93 100755
--- a/jenkins/bin/regression.sh
+++ b/jenkins/bin/regression.sh
@@ -22,17 +22,28 @@ NPROC=$(nproc)
 
 #cd "${ATS_BUILD_BASEDIR}/build"
 #cd "${ATS_BUILD_BASEDIR}"
-[ -d BUILDS ] && cd BUILDS
+#[ -d BUILDS ] && cd BUILDS
+
+#chmod -R go+w /tmp/ats
+#/tmp/ats/bin/traffic_server -K -k -R 1
 
 echo
 echo -n "Unit tests started at " && date
-${ATS_MAKE} -j${NPROC} check VERBOSE=Y V=1 || exit 1
+
+if [ -d cmake ]
+then
+  pushd build
+  ctest -B build -j${NPROC} --output-on-failure --no-compress-output -T Test
+  popd
+else
+  ${ATS_MAKE} -j${NPROC} check VERBOSE=Y V=1 || exit 1
+fi
+
 echo -n "Unit tests finished at " && date
-${ATS_MAKE} install || exit 1
 
 echo
 echo -n "Regression tests started at " && date
-"${ATS_BUILD_BASEDIR}/install/bin/traffic_server" -k -K -R 1
+/tmp/ats/bin/traffic_server -k -K -R 1
 rval=$?
 echo -n "Regression tests finished at " && date
 exit $rval
diff --git a/jenkins/branch/os_build.pipeline b/jenkins/branch/os_build.pipeline
index e4930e0..69c4a9f 100644
--- a/jenkins/branch/os_build.pipeline
+++ b/jenkins/branch/os_build.pipeline
@@ -81,7 +81,7 @@ pipeline {
                                        set -x
                                        set -e
                                        source ../ci/jenkins/bin/environment.sh
-                                       source ../ci/jenkins/bin/regression.sh
+                                       ../ci/jenkins/bin/regression.sh
                                        '''
                                }
                                echo 'Finished Tests'