[trafficserver-ci] branch main updated: fix for deb11, docs fix for clang output

[bn...@apache.org]

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 f76ec70  fix for deb11, docs fix for clang output
     new 53e2255  Merge pull request #271 from traeak/cmake_deb11
f76ec70 is described below

commit f76ec705326a59c6bca9b24e69b26e831286e5b2
Author: Brian Olsen <bn...@gmail.com>
AuthorDate: Thu Oct 26 14:15:43 2023 -0600

    fix for deb11, docs fix for clang output
---
 jenkins/bin/clang-analyzer.sh    |  2 +-
 jenkins/bin/cmake.sh             |  2 +-
 jenkins/bin/docs.sh              | 23 ++++++++++++++++++-----
 jenkins/branch/coverity.pipeline |  2 +-
 jenkins/branch/docs.pipeline     |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/jenkins/bin/clang-analyzer.sh b/jenkins/bin/clang-analyzer.sh
index c57611d..c6c8e2f 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}" ] && /usr/bin/cp -f "${presetpath}" .
+  [ -f "${presetpath}" ] && /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 3476eed..d4824ce 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}" ] && /usr/bin/cp -f "${presetpath}" .
+[ -f "${presetpath}" ] && /bin/cp -f "${presetpath}" .
 
 # debug/release become a feature
 btype="release"
diff --git a/jenkins/bin/docs.sh b/jenkins/bin/docs.sh
index cde5b48..0da63eb 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}"
-/usr/bin/cp -rf docbuild/html/* "${enoutdir}"
+/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}"
-/usr/bin/cp -rf docbuild/html/* "${jaoutdir}"
+/bin/cp -rf docbuild/html/* "${jaoutdir}"
 _END_OF_DOC_
 
   chmod 755 ${tmpfile}
@@ -95,10 +95,23 @@ fi
 
 # If we made it here, the doc build ran and succeeded. Let's copy out the
 # docbuild contents so it can be published.
-ls "${outputdir}"
-cd "${outputdir}"
+mkdir -p ${output_dir}
+docbuild_dir="docbuild"
+if [ -d docbuild ]
+then
+  docbuild_dir="docbuild"
+elif [ -d docs-build/doc/docbuild ]
+then
+  docbuild_dir="docs-build/doc/docbuild"
+else
+  echo "Could not find build docs."
+  exit 1
+fi
+
+cp -rf "${docbuild_dir}" "${output_dir}"
+ls "${output_dir}/docbuild"
 
-sudo chmod -R u=rwX,g=rX,o=rX . || exit 1
+sudo chmod -R u=rwX,g=rX,o=rX "${output_dir}" || exit 1
 
 #if [ "${PUBLISH_DOCS}" == "true" ]; then
 #  sudo cp -avx ja /home/docs
diff --git a/jenkins/branch/coverity.pipeline b/jenkins/branch/coverity.pipeline
index 0e36fe8..25d1577 100644
--- a/jenkins/branch/coverity.pipeline
+++ b/jenkins/branch/coverity.pipeline
@@ -40,7 +40,7 @@ pipeline {
 						if [ -d cmake ]
 						then
 							presetpath="../ci/jenkins/branch/CMakePresets.json"
-							[ -f "${presetpath}" ] && /usr/bin/cp -f "${presetpath}" .
+							[ -f "${presetpath}" ] && /bin/cp -f "${presetpath}" .
 							cmake -B build --preset coverity
 							pushd build
 						  ../cov_tools/bin/cov-build --dir ../cov-int make -j`nproc`
diff --git a/jenkins/branch/docs.pipeline b/jenkins/branch/docs.pipeline
index 71e5b2e..6ada3b5 100644
--- a/jenkins/branch/docs.pipeline
+++ b/jenkins/branch/docs.pipeline
@@ -58,7 +58,7 @@ pipeline {
 					set -x
 					set -e
 					source ../ci/jenkins/bin/environment.sh
-					bash -x ../ci/jenkins/bin/docs.sh
+					../ci/jenkins/bin/docs.sh
 					'''
 				}