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

bneradt 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 974823d  rocky:8 - Use cmake for PR CI jobs (#205)
974823d is described below

commit 974823d333e9e16ec23dfffdc5e3ddfba9c68241
Author: Brian Neradt <brian.ner...@gmail.com>
AuthorDate: Wed Aug 16 21:32:04 2023 -0500

    rocky:8 - Use cmake for PR CI jobs (#205)
    
    This affords us coverage of cmake 3.20 which we've committed to
    supporting for cmake.
---
 jenkins/github/rocky.pipeline | 51 ++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/jenkins/github/rocky.pipeline b/jenkins/github/rocky.pipeline
index ff60e71..44dd710 100644
--- a/jenkins/github/rocky.pipeline
+++ b/jenkins/github/rocky.pipeline
@@ -48,28 +48,45 @@ pipeline {
                         set -x
                         set -e
                         source /opt/rh/gcc-toolset-11/enable
-                        autoreconf -fiv
-                        ./configure \
-                          --with-quiche=/opt/quiche \
-                          --with-openssl=/opt/boringssl \
-                          --enable-experimental-plugins \
-                          --enable-example-plugins \
-                          --prefix=/tmp/ats/ \
-                          --enable-werror \
-                          --enable-debug \
-                          --enable-ccache
-                        make -j4 V=1 Q=
-                        make -j 2 check VERBOSE=Y V=1
-                        make install
-                        /tmp/ats/bin/traffic_server -K -k -R 1
+
+                        # We do not support CMake builds for the 9.x branch.
+                        if [ "${GITHUB_PR_TARGET_BRANCH}" == "9.0.x" -o \
+                             "${GITHUB_PR_TARGET_BRANCH}" == "9.1.x" -o \
+                             "${GITHUB_PR_TARGET_BRANCH}" == "9.2.x" ]
+                        then
+                            echo "CMake builds are not supported for the 9.x 
branch."
+                            echo "Falling back to automake."
+                            autoreconf -fiv
+                            ./configure \
+                                --with-quiche=/opt/quiche \
+                                --with-openssl=/opt/boringssl \
+                                --enable-experimental-plugins \
+                                --enable-example-plugins \
+                                --prefix=/tmp/ats/ \
+                                --enable-werror \
+                                --enable-debug \
+                                --enable-ccache
+                            make -j4 V=1 Q=
+                            make -j 2 check VERBOSE=Y V=1
+                            make install
+                            /tmp/ats/bin/traffic_server -K -k -R 1
+                        else
+                            cmake -B cmake-build-quiche -GNinja 
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DENABLE_QUICHE=ON -DCMAKE_BUILD_TYPE=Debug 
-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
+                        fi
                         '''
                 }
             }
         }
     }
-    
-    post { 
-        cleanup { 
+
+    post {
+        cleanup {
             cleanWs()
         }
     }

Reply via email to