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 e1092bb updates to fix coverity pipeline, also do all branch builds
with make instead of ninja
new 47b4b7f Merge pull request #262 from traeak/coverity_fixes
e1092bb is described below
commit e1092bb821850c663e1f9657b7a5c6abbad3cb4a
Author: Brian Olsen <[email protected]>
AuthorDate: Wed Oct 25 12:48:29 2023 -0600
updates to fix coverity pipeline, also do all branch builds with make
instead of ninja
---
jenkins/bin/clang-analyzer.sh | 2 +-
jenkins/bin/cmake.sh | 2 +-
jenkins/bin/docs.sh | 4 ++--
jenkins/branch/CMakePresets.json | 2 +-
jenkins/branch/coverity.pipeline | 14 ++++++++++----
5 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/jenkins/bin/clang-analyzer.sh b/jenkins/bin/clang-analyzer.sh
index dac4707..c57611d 100755
--- a/jenkins/bin/clang-analyzer.sh
+++ b/jenkins/bin/clang-analyzer.sh
@@ -37,7 +37,7 @@ then
# copy in CMakePresets.json
presetpath="${WORKSPACE}/ci/jenkins/branch/CMakePresets.json"
- [ -f "${presetpath}" ] && cp -f "${presetpath}" .
+ [ -f "${presetpath}" ] && /usr/bin/cp -f "${presetpath}" .
cmake -B builddir --preset clang-analyzer
cmake --build builddir -v
diff --git a/jenkins/bin/cmake.sh b/jenkins/bin/cmake.sh
index 174f9b9..53d9760 100755
--- a/jenkins/bin/cmake.sh
+++ b/jenkins/bin/cmake.sh
@@ -39,7 +39,7 @@ fi
# copy in CMakePresets.json
presetpath="../ci/jenkins/branch/CMakePresets.json"
-[ -f "${presetpath}" ] && cp -f "${presetpath}" .
+[ -f "${presetpath}" ] && /usr/bin/cp -f "${presetpath}" .
# debug/release become a feature
btype="release"
diff --git a/jenkins/bin/docs.sh b/jenkins/bin/docs.sh
index 4c47d52..cde5b48 100755
--- a/jenkins/bin/docs.sh
+++ b/jenkins/bin/docs.sh
@@ -75,14 +75,14 @@ fi
make -j${NPROC} -e SPHINXOPTS="${sphinxopts}" html
mkdir -p "${enoutdir}"
-cp -rf docbuild/html/* "${enoutdir}"
+/usr/bin/cp -rf docbuild/html/* "${enoutdir}"
echo "Building JA Docs"
rm -rf docbuild/html
make -j${NPROC} -e SPHINXOPTS="-D language='ja'" html
mkdir -p "${jaoutdir}"
-cp -rf docbuild/html/* "${jaoutdir}"
+/usr/bin/cp -rf docbuild/html/* "${jaoutdir}"
_END_OF_DOC_
chmod 755 ${tmpfile}
diff --git a/jenkins/branch/CMakePresets.json b/jenkins/branch/CMakePresets.json
index d963b8c..7404f69 100644
--- a/jenkins/branch/CMakePresets.json
+++ b/jenkins/branch/CMakePresets.json
@@ -10,7 +10,7 @@
"name": "ci",
"displayName": "CI defaults",
"description": "Defaults for CI Pipeline builds",
- "generator": "Ninja",
+ "generator": "Unix Makefiles",
"binaryDir": "${sourceDir}/builddir",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
diff --git a/jenkins/branch/coverity.pipeline b/jenkins/branch/coverity.pipeline
index bec8922..425464d 100644
--- a/jenkins/branch/coverity.pipeline
+++ b/jenkins/branch/coverity.pipeline
@@ -15,6 +15,10 @@ pipeline {
stages {
stage('Initialization') {
steps {
+ dir('ci') {
+ git url:
'https://github.com/apache/trafficserver-ci',
+ branch: 'main'
+ }
dir('src') {
sh '''#!/bin/bash
set +x
@@ -36,17 +40,19 @@ pipeline {
if [ -d cmake ]
then
presetpath="../ci/jenkins/branch/CMakePresets.json"
- [ -f "${presetpath}" ]
&& cp -f "${presetpath}" .
- cmake -B . --preset
coverity
+ [ -f "${presetpath}" ]
&& /usr/bin/cp -f "${presetpath}" .
+ cmake -B build --preset
coverity
+ pushd build
+ ../cov_tools/bin/cov-build
--dir ../cov-int make -j`nproc`
+ popd
else
autoreconf -fiv
./configure \
--enable-experimental-plugins \
--enable-example-plugins
+ ./cov_tools/bin/cov-build
--dir cov-int make -j`nproc`
fi
- ./cov_tools/bin/cov-build --dir
cov-int make -j`nproc`
-
tar czvf trafficserver.tgz
cov-int
set +x
