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 2883393 split out cmake_quiche for branch builds
new 1d3fd55 Merge pull request #219 from traeak/branch_cmake_quiche
2883393 is described below
commit 2883393eab5075b8ea7cc146115bb2b642ea016c
Author: Brian Olsen <bnol...@gmail.com>
AuthorDate: Thu Sep 28 17:12:26 2023 +0000
split out cmake_quiche for branch builds
---
jenkins/bin/cmake.sh | 20 +-------------------
jenkins/bin/{cmake.sh => cmake_quiche.sh} | 18 +-----------------
jenkins/branch/cmake.pipeline | 2 +-
.../branch/{cmake.pipeline => cmake_quiche.pipeline} | 4 ++--
4 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/jenkins/bin/cmake.sh b/jenkins/bin/cmake.sh
index 8d73b45..ef84983 100755
--- a/jenkins/bin/cmake.sh
+++ b/jenkins/bin/cmake.sh
@@ -22,7 +22,7 @@ set -x
if [ "${ATS_BRANCH}" == "9.0.x" -o \
"${ATS_BRANCH}" == "9.1.x" -o \
- "${ATS_BRANCH}" == "9.2.x" -o ]
+ "${ATS_BRANCH}" == "9.2.x" ]
then
echo "CMake builds are not supported for the 9.x branch."
echo "No need to test it to show that it fails."
@@ -45,21 +45,3 @@ pushd cmake-build-release
ctest -j4 --output-on-failure --no-compress-output -T Test
/tmp/ats/bin/traffic_server -K -k -R 1
popd
-
-# quiche build
-cmake -B cmake-build-quiche \
- -GNinja \
- -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
- -DENABLE_QUICHE=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_EXPERIMENTAL_PLUGINS=ON \
- -Dquiche_ROOT=/opt/quiche \
- -DOPENSSL_ROOT_DIR=/opt/boringssl \
- -DCMAKE_INSTALL_PREFIX=/tmp/ats_quiche
-cmake --build cmake-build-quiche -j4 -v
-cmake --install cmake-build-quiche
-
-pushd cmake-build-quiche
-ctest -j4 --output-on-failure --no-compress-output -T Test
-/tmp/ats_quiche/bin/traffic_server -K -k -R 1
-popd
diff --git a/jenkins/bin/cmake.sh b/jenkins/bin/cmake_quiche.sh
similarity index 76%
copy from jenkins/bin/cmake.sh
copy to jenkins/bin/cmake_quiche.sh
index 8d73b45..f19c6f0 100755
--- a/jenkins/bin/cmake.sh
+++ b/jenkins/bin/cmake_quiche.sh
@@ -22,7 +22,7 @@ set -x
if [ "${ATS_BRANCH}" == "9.0.x" -o \
"${ATS_BRANCH}" == "9.1.x" -o \
- "${ATS_BRANCH}" == "9.2.x" -o ]
+ "${ATS_BRANCH}" == "9.2.x" ]
then
echo "CMake builds are not supported for the 9.x branch."
echo "No need to test it to show that it fails."
@@ -31,22 +31,6 @@ fi
cd "${WORKSPACE}/src"
-cmake -B cmake-build-release\
- -GNinja \
- -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_EXPERIMENTAL_PLUGINS=ON \
- -DOPENSSL_ROOT_DIR=/opt/openssl-quic \
- -DCMAKE_INSTALL_PREFIX=/tmp/ats
-cmake --build cmake-build-release -j4 -v
-cmake --install cmake-build-release
-
-pushd cmake-build-release
-ctest -j4 --output-on-failure --no-compress-output -T Test
-/tmp/ats/bin/traffic_server -K -k -R 1
-popd
-
-# quiche build
cmake -B cmake-build-quiche \
-GNinja \
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
diff --git a/jenkins/branch/cmake.pipeline b/jenkins/branch/cmake.pipeline
index 3d8098d..f4353b6 100644
--- a/jenkins/branch/cmake.pipeline
+++ b/jenkins/branch/cmake.pipeline
@@ -59,7 +59,7 @@ pipeline {
}
}
- stage('Build') {
+ stage('Build/Test') {
steps {
dir('src') {
echo "Building"
diff --git a/jenkins/branch/cmake.pipeline
b/jenkins/branch/cmake_quiche.pipeline
similarity index 96%
copy from jenkins/branch/cmake.pipeline
copy to jenkins/branch/cmake_quiche.pipeline
index 3d8098d..aceaa0a 100644
--- a/jenkins/branch/cmake.pipeline
+++ b/jenkins/branch/cmake_quiche.pipeline
@@ -59,7 +59,7 @@ pipeline {
}
}
- stage('Build') {
+ stage('Build/Test') {
steps {
dir('src') {
echo "Building"
@@ -68,7 +68,7 @@ pipeline {
set -e
export PATH=/opt/bin:${PATH}
source ../ci/jenkins/bin/environment.sh
- ../ci/jenkins/bin/cmake.sh
+ ../ci/jenkins/bin/cmake_quiche.sh
'''
}
}
