DAOS-18348 build: Enable code coverage

ci/provisioning/post_provision_config_common_functions.sh

@@ -2,7 +2,7 @@
 #
 #  Copyright 2022-2023 Intel Corporation.
 #  Copyright 2025 Google LLC
-#  Copyright 2025 Hewlett Packard Enterprise Development LP
+#  Copyright 2025-2026 Hewlett Packard Enterprise Development LP
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -60,6 +60,18 @@ add_repo() {
     fi
 }
 
+add_inst_repo() {
+    local repo="$1"
+    local branch="$2"
+    local build_number="$3"
+    local repo_url="${ARTIFACTS_URL:-${JENKINS_URL}job/}"daos-stack/job/"$repo"/job/"${branch//\//%252F}"/"$build_number"/artifact/artifacts/$DISTRO_NAME/
+    dnf -y config-manager --add-repo="$repo_url"
+    repo="$(url_to_repo "$repo_url")"
+    # PR-repos: should always be able to upgrade modular packages
+    dnf -y config-manager --save --setopt "$repo.module_hotfixes=true" "$repo"
+    disable_gpg_check "$repo_url"
+}
+
 disable_gpg_check() {
     local url="$1"
 
@@ -377,16 +389,7 @@ post_provision_config_nodes() {
                 branch="${branch%:*}"
             fi
         fi
-        local subdir
-        if ! $COVFN_DISABLED; then
-            subdir="bullseye/"
-        fi
-        local repo_url="${ARTIFACTS_URL:-${JENKINS_URL}job/}"daos-stack/job/"$repo"/job/"${branch//\//%252F}"/"$build_number"/artifact/artifacts/"${subdir:-}"$DISTRO_NAME/
-        dnf -y config-manager --add-repo="$repo_url"
-        repo="$(url_to_repo "$repo_url")"
-        # PR-repos: should always be able to upgrade modular packages
-        dnf -y config-manager --save --setopt "$repo.module_hotfixes=true" "$repo"
-        disable_gpg_check "$repo_url"
+        add_inst_repo "${repo}" "${branch}" "${build_number}"
     done
 
     # start with everything fully up-to-date

ci/rpm/build_deps.sh

@@ -1,3 +1,16 @@
 #!/bin/bash
+#
+#  Copyright 2025-2026 Hewlett Packard Enterprise Development LP
+#
+# Build DAOS dependencies
+code_coverage="${1:-false}"
+bullseye_key="${2:-}"
+mydir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
 cd /home/daos/pre || exit 1
 scons install --build-deps=only USE_INSTALLED=all PREFIX=/opt/daos TARGET_TYPE=release -j 32
+
+if [[ "${code_coverage}" == "true" ]] ; then
+    pushd "${mydir}/../.." || exit 1
+    utils/rpms/bullseye_build.sh "${bullseye_key}"
+fi

ci/rpm/gen_rpms.sh

@@ -16,20 +16,21 @@ if [ -e "${ci_envs}" ]; then
   source "${ci_envs}"
 fi
 
-env
+env | sort -n
 
 pushd "${mydir}/../.." || exit 1
 export DISTRO="${1}"
 export DAOS_RELVAL="${2}"
+code_coverage="${3:-false}"
 rm -f ./*.rpm
 rm -rf /home/daos/rpms/*
-utils/rpms/build_packages.sh deps
+utils/rpms/build_packages.sh deps "${code_coverage}"
 if ls -1 ./*.rpm; then
   mkdir -p /home/daos/rpms/deps
   cp ./*.rpm /home/daos/rpms/deps
   rm -f ./*.rpm
 fi
-utils/rpms/build_packages.sh daos
+utils/rpms/build_packages.sh daos "${code_coverage}"
 mkdir -p /home/daos/rpms/daos
 cp ./*.rpm /home/daos/rpms/daos
 popd || exit 1

ci/rpm/install_deps.sh

@@ -21,6 +21,7 @@ env
 pushd "${mydir}/../.." || exit 1
 export DISTRO="${1}"
 export DAOS_RELVAL="${2}"
+code_coverage="${3:-false}"
 libfabric_pkg="$(utils/rpms/package_version.sh libfabric dev)"
 mercury_pkg="$(utils/rpms/package_version.sh mercury dev)"
 argobots_pkg="$(utils/rpms/package_version.sh argobots dev)"
@@ -38,4 +39,10 @@ sudo dnf install --allowerasing -y "${fused_pkg}" || echo "${fused_pkg} not avai
 sudo dnf install --allowerasing -y "${pmdk_pkg}" || echo "${pmdk_pkg} not available"
 sudo dnf install --allowerasing -y "${isal_pkg}" || echo "${isal_pkg} not available"
 sudo dnf install --allowerasing -y "${isal_crypto_pkg}" || echo "${isal_crypto_pkg} not available"
+
+if [[ "${code_coverage}" == "true" ]] ; then
+  bullseye_pkg="$(utils/rpms/package_version.sh bullseye normal)"
+  sudo dnf install --allowerasing -y "${bullseye_pkg}" || echo "${bullseye_pkg} not available"
+fi
+
 popd || exit 1

ci/summary/bullseye_report.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+#  Copyright 2026 Hewlett Packard Enterprise Development LP
+#
+# Script for generating a bullseye code coverage report summary
+set -uex
+
+if [ ! -d '/opt/BullseyeCoverage/bin' ]; then
+  echo 'Bullseye not found.'
+  exit 1
+fi
+export COVFILE="${WORKSPACE:-/tmp}/test.cov"
+export PATH="/opt/BullseyeCoverage/bin:$PATH"
+
+# Merge all coverage files
+cp /opt/BullseyeCoverage/daos/test.cov "${COVFILE}"
+readarray -t cov_files < <(find "${WORKSPACE}" -name test.cov)
+if [ ${#cov_files[@]} -gt 0 ]; then
+  covmerge --no-banner --file "${COVFILE}" "${cov_files[@]}"
+fi
+
+if [ ! -e "$COVFILE" ]; then
+  echo "Coverage file ${COVFILE} is missing"
+  exit 1
+else
+  ls -al "${COVFILE}"
+  # covdir -m
+fi
+
+# Generate the html report
+rm -fr bullseye_code_coverage_report || true
+mkdir bullseye_code_coverage_report
+cp /opt/BullseyeCoverage/bin/bullseye_sources.tar.gz .
+tar -xf bullseye_sources.tar.gz
+covhtml --srcdir . --file test.cov bullseye_code_coverage_report
+ls -al bullseye_code_coverage_report
+
+# rm -fr bullseye_code_coverage_report || true
+# mkdir bullseye_code_coverage_report
+# java -jar bullshtml.jar bullseye_code_coverage_report
+# ls -al bullseye_code_coverage_report
+

ci/summary/install_pkgs.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+#  Copyright 2026 Hewlett Packard Enterprise Development LP
+#
+# Script for installing packages used for CI summary steps
+set -uex
+
+id
+if [ "$(id -u)" = "0" ]; then
+    echo "Should not be run as root"
+    exit 1
+fi
+
+mydir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+files=("$mydir/../parse_ci_envs.sh")
+files+=("$mydir/../provision/post_provision_config_common_functions.sh")
+for src_file in "${files[@]}"; do
+    if [ -e "${src_file}" ]; then
+        # shellcheck source=parse_ci_envs.sh disable=SC1091
+        source "${src_file}"
+    fi
+done
+
+env | sort -n
+
+# Add a repo for this build
+add_inst_repo "daos" "${BRANCH_NAME}" "${BUILD_NUMBER}"
+
+# Install bullseye
+bullseye_pkg="$(utils/rpms/package_version.sh bullseye normal)"
+sudo dnf install --allowerasing -y "${bullseye_pkg}" || echo "${bullseye_pkg} not available"
+
+# # Install bullshtml
+# bullshtml_vers=1.0.5
+# bullshtml_src=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/bullshtml
+# bullshtml_tar="bullshtml_${bullshtml_vers}.tar.gz"
+# if [ -n "${DAOS_HTTPS_PROXY:-}" ]; then
+#     export https_proxy="${DAOS_HTTPS_PROXY}"
+# fi
+# sudo dnf install -y wget
+# wget "${bullshtml_src}/${bullshtml_tar}"
+# tar --strip-components=1 -xf "${bullshtml_tar}"
+
+# bullshtml_pkg="$(utils/rpms/package_version.sh bullshtml normal)"
+# sudo dnf install --allowerasing -y "${bullshtml_pkg}" || echo "${bullshtml_pkg} not available"

ci/unit/required_packages.sh

@@ -2,45 +2,63 @@
 
 set -eu
 
-# No longer used but provided by pipeline-lib
-# distro="$1"
-# quick_build="${2:-false}"
+distro="${1:-el8}"
+code_coverage="${2:-false}"
 
 OPENMPI_VER=""
 PY_MINOR_VER=""
 
-export DISTRO="el8" # should also work for el9
-pkgs="$(utils/rpms/package_version.sh argobots lib)                  \
-      boost-python3$PY_MINOR_VER-devel                               \
-      capstone                                                       \
-      $(utils/rpms/package_version.sh argobots lib)                  \
-      $(utils/rpms/package_version.sh argobots debug)                \
-      $(utils/rpms/package_version.sh daos_spdk dev)                 \
-      $(utils/rpms/package_version.sh daos_spdk debug)               \
-      $(utils/rpms/package_version.sh isal dev)                      \
-      $(utils/rpms/package_version.sh isal_crypto lib)               \
-      $(utils/rpms/package_version.sh isal_crypto debug)             \
-      $(utils/rpms/package_version.sh libfabric dev)                 \
-      $(utils/rpms/package_version.sh libfabric debug)               \
-      $(utils/rpms/package_version.sh mercury dev)                   \
-      $(utils/rpms/package_version.sh mercury debug)                 \
-      $(utils/rpms/package_version.sh pmdk lib pmemobj)              \
-      $(utils/rpms/package_version.sh pmdk debug pmemobj)            \
-      $(utils/rpms/package_version.sh pmdk debug pmem)               \
-      fuse3                                                          \
-      gotestsum                                                      \
-      hwloc-devel                                                    \
-      libasan                                                        \
-      libipmctl-devel                                                \
-      libyaml-devel                                                  \
-      numactl                                                        \
-      numactl-devel                                                  \
-      openmpi$OPENMPI_VER                                            \
-      patchelf                                                       \
-      pciutils-devel                                                 \
-      protobuf-c                                                     \
-      valgrind-devel"
+export DISTRO="${distro}"
+pkgs=("$(utils/rpms/package_version.sh argobots lib)")
+pkgs+=("boost-python3${PY_MINOR_VER}-devel")
+pkgs+=("capstone")
+pkgs+=("$(utils/rpms/package_version.sh argobots lib)")
+pkgs+=("$(utils/rpms/package_version.sh argobots debug)")
+pkgs+=("$(utils/rpms/package_version.sh daos_spdk dev)")
+pkgs+=("$(utils/rpms/package_version.sh daos_spdk debug)")
+pkgs+=("$(utils/rpms/package_version.sh isal dev)")
+pkgs+=("$(utils/rpms/package_version.sh isal_crypto lib)")
+pkgs+=("$(utils/rpms/package_version.sh isal_crypto debug)")
+pkgs+=("$(utils/rpms/package_version.sh libfabric dev)")
+pkgs+=("$(utils/rpms/package_version.sh libfabric debug)")
+pkgs+=("$(utils/rpms/package_version.sh mercury dev)")
+pkgs+=("$(utils/rpms/package_version.sh mercury debug)")
+pkgs+=("$(utils/rpms/package_version.sh pmdk lib pmemobj)")
+pkgs+=("$(utils/rpms/package_version.sh pmdk debug pmemobj)")
+pkgs+=("$(utils/rpms/package_version.sh pmdk debug pmem)")
+pkgs+=("fuse3")
+pkgs+=("gotestsum")
+pkgs+=("hwloc-devel")
+pkgs+=("libasan")
+pkgs+=("libipmctl-devel")
+pkgs+=("libyaml-devel")
+pkgs+=("numactl")
+pkgs+=("numactl-devel")
+pkgs+=("openmpi${OPENMPI_VER}")
+pkgs+=("patchelf")
+pkgs+=("pciutils-devel")
+pkgs+=("protobuf-c")
+pkgs+=("valgrind-devel")
+
+if [ "${code_coverage}" == "true" ] ; then
+    pkgs+=("$(utils/rpms/package_version.sh bullseye normal)")
+    case "${distro}" in
+        el*|centos*|rocky*|rhel*|alma*)
+            pkgs+=("java-1.8.0-openjdk")
+            ;;
+        ubuntu*)
+            pkgs+=("openjdk-8-jdk")
+            ;;
+        leap*|sles*)
+            pkgs+=("java-1_8_0-openjdk-devel")
+            ;;
+        *)
+            echo "Unknown java package for ${distro} with code coverage"
+            exit 1
+            ;;
+    esac
+fi
 
 # output with trailing newline suppressed
-echo  -e "$pkgs\c"
+printf "${pkgs[*]}"
 exit 0

ci/unit/test_main.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #  Copyright 2020-2023 Intel Corporation.
-#  Copyright 2025 Hewlett Packard Enterprise Development LP
+#  Copyright 2025-2026 Hewlett Packard Enterprise Development LP
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -19,24 +19,14 @@ rm -rf test_results
 mkdir test_results
 chmod 777 test_results
 
-# Check if this is a Bulleye stage
-USE_BULLSEYE=false
+# Check if this is a bdev stage
 BDEV_TEST=false
 case $STAGE_NAME in
-  *Bullseye**)
-  USE_BULLSEYE=true
-  ;;
   *bdev**)
   BDEV_TEST=true
   ;;
 esac
 
-if $USE_BULLSEYE; then
-  rm -rf bullseye
-  mkdir -p bullseye
-  tar -C bullseye --strip-components=1 -xf bullseye.tar
-fi
-
 NODE=${NODELIST%%,*}
 
 # Copy over the install tree and some of the build tree.