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 640d2ff Remove the cmake.pipeline script (#249)
640d2ff is described below
commit 640d2ffebd19c19ed6d09d40f6438a484adb29cc
Author: Brian Neradt <[email protected]>
AuthorDate: Wed Oct 18 20:15:15 2023 -0500
Remove the cmake.pipeline script (#249)
Since all jobs now run cmake, it's redundant to have a job dedicated to
building cmake.
---
jenkins/github/centos.pipeline | 8 +--
jenkins/github/cmake.pipeline | 89 ----------------------------------
jenkins/github/debian.pipeline | 8 +--
jenkins/github/freebsd.pipeline | 4 +-
jenkins/github/ghprb-toplevel.pipeline | 17 -------
jenkins/github/github_polling.pipeline | 17 -------
jenkins/github/toplevel.pipeline | 17 -------
7 files changed, 10 insertions(+), 150 deletions(-)
diff --git a/jenkins/github/centos.pipeline b/jenkins/github/centos.pipeline
index 3a7733b..e7582a9 100644
--- a/jenkins/github/centos.pipeline
+++ b/jenkins/github/centos.pipeline
@@ -55,10 +55,10 @@ pipeline {
# cmake for the centos image is installed in
/opt/bin.
export PATH=/opt/bin:${PATH}
- cmake -B cmake-build-release --preset ci -G "Unix
Makefiles" -DOPENSSL_ROOT_DIR=/opt/openssl-quic
- cmake --build cmake-build-release -j4 -v
- cmake --install cmake-build-release
- pushd cmake-build-release
+ cmake -B build --preset ci -G "Unix Makefiles"
-DOPENSSL_ROOT_DIR=/opt/openssl-quic
+ cmake --build build -j4 -v
+ cmake --install build
+ pushd build
ctest -j4 --output-on-failure --no-compress-output
-T Test
/tmp/ats/bin/traffic_server -K -k -R 1
popd
diff --git a/jenkins/github/cmake.pipeline b/jenkins/github/cmake.pipeline
deleted file mode 100644
index 98fb2ef..0000000
--- a/jenkins/github/cmake.pipeline
+++ /dev/null
@@ -1,89 +0,0 @@
-pipeline {
- agent {
- docker {
- image 'ci.trafficserver.apache.org/ats/fedora:38'
- registryUrl 'https://ci.trafficserver.apache.org/'
- label 'docker'
- args '-v ${HOME}/ccache:/tmp/ccache:rw'
- }
- }
- environment {
- CCACHE_DIR = "/tmp/ccache"
- CCACHE_BASEDIR = "${WORKSPACE}"
- }
- stages {
- stage('Clone') {
- steps {
- dir('src') {
- echo "${sha1}"
- checkout([$class: 'GitSCM',
- branches: [[name: sha1]],
- extensions: [
- // We have to set an idenity for the merge step
because Git requires
- // the user.name and user.email to be set to do a
merge.
- [$class: "UserIdentity",
- name: "ATS CI User",
- email: "[email protected]"
- ],
- [$class: "PreBuildMerge",
- options: [
- mergeTarget: "${GITHUB_PR_TARGET_BRANCH}",
- fastForwardMode: "NO_FF",
- mergeRemote: "origin",
- mergeStrategy: "DEFAULT"
- ]
- ],
- ],
- userRemoteConfigs: [[url: github_url, refspec:
'+refs/pull/*:refs/remotes/origin/pr/*']]])
- sh 'git show -n 10 --decorate --graph --oneline --no-patch'
- }
- echo 'Finished Cloning'
- }
- }
- stage('Build: cmake') {
- steps {
- echo 'Starting cmake build'
- dir('src') {
- sh '''#!/bin/bash
- set -x
- set -e
-
- if [ ! -d cmake ]
- then
- echo "CMake builds are not supported for this
branch."
- echo "No need to test it to show that it fails."
- exit 0
- fi
-
-
- export PATH=/opt/bin:${PATH}
-
- cmake -B cmake-build-release -GNinja
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_BUILD_TYPE=Debug
-DBUILD_EXPERIMENTAL_PLUGINS=ON -DOPENSSL_ROOT_DIR=/opt/openssl-quic
-DCMAKE_INSTALL_PREFIX=/tmp/ats
- cmake --build cmake-build-release -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
-
- 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 -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
-
- '''
- }
- echo 'Finished cmake build'
- }
- }
- }
-
- post {
- cleanup {
- cleanWs()
- }
- }
-}
diff --git a/jenkins/github/debian.pipeline b/jenkins/github/debian.pipeline
index b6a2fd7..20eb1bb 100644
--- a/jenkins/github/debian.pipeline
+++ b/jenkins/github/debian.pipeline
@@ -49,10 +49,10 @@ pipeline {
set -e
if [ -d cmake ]
then
- cmake -B cmake-build-release --preset ci-debian
-DOPENSSL_ROOT_DIR=/opt/openssl-quic
- cmake --build cmake-build-release -v
- cmake --install cmake-build-release
- pushd cmake-build-release
+ cmake -B build --preset ci-debian
-DOPENSSL_ROOT_DIR=/opt/openssl-quic
+ cmake --build build -v
+ cmake --install build
+ pushd build
ctest -j4 --output-on-failure --no-compress-output
-T Test
/tmp/ats/bin/traffic_server -K -k -R 1
popd
diff --git a/jenkins/github/freebsd.pipeline b/jenkins/github/freebsd.pipeline
index 41681fc..bb61f5c 100644
--- a/jenkins/github/freebsd.pipeline
+++ b/jenkins/github/freebsd.pipeline
@@ -40,8 +40,8 @@ pipeline {
if [ -d cmake ]
then
- cmake -B cmake-build-release
-DBUILD_EXPERIMENTAL_PLUGINS=ON -DCMAKE_INSTALL_PREFIX=/tmp/ats
- cmake --build cmake-build-release -v
+ cmake -B build -DBUILD_EXPERIMENTAL_PLUGINS=ON
-DCMAKE_INSTALL_PREFIX=/tmp/ats
+ cmake --build build -v
else
# Pre 10.x branches only support autotools.
autoreconf -fiv
diff --git a/jenkins/github/ghprb-toplevel.pipeline
b/jenkins/github/ghprb-toplevel.pipeline
index db040d9..a679611 100644
--- a/jenkins/github/ghprb-toplevel.pipeline
+++ b/jenkins/github/ghprb-toplevel.pipeline
@@ -185,23 +185,6 @@ pipeline {
}
}
- stage('CMake Build') {
- when {
- anyOf {
- environment name: 'ghprbCommentBody', value:
'[approve ci]'
- expression { ghprbCommentBody ==~ /.*cmake.*/ }
- }
- }
- steps {
- script {
- result = buildJob('CMake', 'Github_Builds/cmake')
- if (result == 'FAILURE') {
- error('CMake build failed')
- }
- }
- }
- }
-
//stage('FreeBSD Build') {
// when {
// anyOf {
diff --git a/jenkins/github/github_polling.pipeline
b/jenkins/github/github_polling.pipeline
index b82b6cf..65ec740 100644
--- a/jenkins/github/github_polling.pipeline
+++ b/jenkins/github/github_polling.pipeline
@@ -182,23 +182,6 @@ pipeline {
}
}
- stage('CMake Build') {
- when {
- anyOf {
- environment name:
'GITHUB_PR_COMMENT_BODY_MATCH', value: ''
- expression {
GITHUB_PR_COMMENT_BODY_MATCH ==~ /.*cmake.*/ }
- }
- }
- steps {
- script {
- result =
buildJob('CMake', 'Github_Builds/cmake')
- if (result ==
'FAILURE') {
- error('CMake
build failed')
- }
- }
- }
- }
-
stage('OSX Build') {
when {
anyOf {
diff --git a/jenkins/github/toplevel.pipeline b/jenkins/github/toplevel.pipeline
index 5cab83a..1c2ea2d 100644
--- a/jenkins/github/toplevel.pipeline
+++ b/jenkins/github/toplevel.pipeline
@@ -182,23 +182,6 @@ pipeline {
}
}
- stage('CMake Build') {
- when {
- anyOf {
- environment name:
'GITHUB_PR_COMMENT_BODY_MATCH', value: ''
- expression {
GITHUB_PR_COMMENT_BODY_MATCH ==~ /.*cmake.*/ }
- }
- }
- steps {
- script {
- result =
buildJob('CMake', 'Github_Builds/cmake')
- if (result ==
'FAILURE') {
- error('CMake
build failed')
- }
- }
- }
- }
-
stage('OSX Build') {
when {
anyOf {
