(trafficserver-ci) branch main updated: changes to get coverage to run

[bnolsen]

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 6f1690c  changes to get coverage to run
     new a45a53e  Merge pull request #275 from traeak/cmake_coverage
6f1690c is described below

commit 6f1690cf20745f6c0d3fcfd37a7e78bbe8378526
Author: Brian Olsen <bnol...@gmail.com>
AuthorDate: Mon Oct 30 11:35:45 2023 -0600

    changes to get coverage to run
---
 jenkins/bin/docs.sh              |  1 -
 jenkins/branch/CMakePresets.json | 10 ++++++++++
 jenkins/branch/coverage.pipeline | 12 +++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/jenkins/bin/docs.sh b/jenkins/bin/docs.sh
index 9b02d19..8a09dd2 100755
--- a/jenkins/bin/docs.sh
+++ b/jenkins/bin/docs.sh
@@ -48,7 +48,6 @@ sudo chmod -R ugo+w . || exit 1
 if [ -d cmake ]
 then
 
-
   docbuilddir="docbuild/doc/docbuild"
 
   # english
diff --git a/jenkins/branch/CMakePresets.json b/jenkins/branch/CMakePresets.json
index d9914c1..47c0fa2 100644
--- a/jenkins/branch/CMakePresets.json
+++ b/jenkins/branch/CMakePresets.json
@@ -124,6 +124,16 @@
         "BUILD_EXPERIMENTAL_PLUGINS": "ON",
         "ENABLE_EXAMPLE": "ON"
       }
+    },
+    {
+      "name": "coverage",
+      "displayName": "coverage defaults",
+      "description": "Defaults for coverage builds",
+      "inherits": ["autest"],
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS_DEBUG": "--coverage",
+        "CMAKE_C_FLAGS_DEBUG": "--coverage"
+      }
     }
   ]
 }
diff --git a/jenkins/branch/coverage.pipeline b/jenkins/branch/coverage.pipeline
index 13fb672..9b7adfc 100644
--- a/jenkins/branch/coverage.pipeline
+++ b/jenkins/branch/coverage.pipeline
@@ -85,16 +85,12 @@ pipeline {
                                                        echo "Building with 
CMake"      
 
                                                        
presetpath="../ci/jenkins/branch/CMakePresets.json"
-              [ -f "${presetpath}" ] && cp -f "${presetpath}" .
-
-                                                       echo "Currently 
skipping."
-                                                       exit 0
+              [ -f "${presetpath}" ] && /bin/cp -f "${presetpath}" .
 
                                                        cmake -B build --preset 
coverage -DCMAKE_INSTALL_PREFIX="/tmp/ats"
                                                        cmake --build build 
-j`nproc` -v
                                                        cmake --install build -v
 
-                                                       s
                                                else
                                                        echo "Building with 
autotools"
 
@@ -167,6 +163,8 @@ pipeline {
                                                set -x
                                                set -e
                                                [ "${RUN_REGRESSION_TESTS}" == 
"true" ] || exit 0
+                                               chmod -R go+w .
+                                               chmod -R go+w /tmp/ats/
                                                /tmp/ats/bin/traffic_server -K 
-k -R 1
                                         '''
                                }
@@ -239,8 +237,8 @@ pipeline {
                                                        
/tmp/lcov_tracefile_filtered.info
 
                                                cp -rf /tmp/lcov-report 
${WORKSPACE}/output/
-                                               sudo chmod -R 777 ${WORKSPACE}
-                                                '''
+                                               chmod -R 777 ${WORKSPACE}
+                                       '''
                                }
                        }
                }