Skip to content

Commit

Permalink
common: disable valgrind in builds that do not need them
Browse files Browse the repository at this point in the history
Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
  • Loading branch information
grom72 committed Mar 20, 2024
1 parent 25a130c commit fdf6900
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .github/actions/pmem_test_prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ inputs:
default: '0'
valgrind:
description: Build with Valgrind support
required: false
default: 1
required: true

runs:
using: composite
steps:
Expand Down
32 changes: 8 additions & 24 deletions .github/workflows/pmem_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
# Exclude all Valgrind tests. All tests employing Valgrind tooling are run
# in the dedicated workflows below.
force_enable: '["none"]'
valgrind: 0


# Test the default build with force-enabled Valgrind tooling for (persistent)
Expand All @@ -25,18 +26,18 @@ jobs:
uses: ./.github/workflows/pmem_test_matrix.yml
with:
force_enable: '["pmemcheck", "memcheck"]'

valgrind: 1

# Test the default build with force-enabled Valgrind tooling for thread error
# detection.
Thread:
uses: ./.github/workflows/pmem_test_matrix.yml
with:
force_enable: '["drd", "helgrind"]'
valgrind: 1
# 9h = 7h20m (the longest workflow execution time) + ~20% leeway.
timeout_minutes: 540


# Static builds are tested in this limited scope only.
static:
name: Static
Expand All @@ -52,6 +53,8 @@ jobs:

- name: Test prepare
uses: ./.github/actions/pmem_test_prepare
with:
valgrid: 1

- name: Test run
uses: ./.github/actions/pmem_test_run
Expand All @@ -73,6 +76,7 @@ jobs:
uses: ./.github/actions/pmem_test_prepare
with:
fault_injection: '1'
valgrind: 1

- name: Test run
uses: ./.github/actions/pmem_test_run
Expand All @@ -84,6 +88,8 @@ jobs:
# By default, PMDK is built with NDCTL in order to provide RAS features.
# This build is only viable as long as DAOS builds PMDK with NDCTL_ENABLE=n
# https://github.com/daos-stack/pmdk/pull/12
# It should be removed as soon as following PR is merged
# https://github.com/daos-stack/pmdk/pull/35
ndctl_enable_n:
name: Without ndctl
if: github.repository == 'pmem/pmdk'
Expand All @@ -96,28 +102,6 @@ jobs:
uses: ./.github/actions/pmem_test_prepare
with:
ndctl_enable: n

- name: Test run
uses: ./.github/actions/pmem_test_run
with:
build: nondebug # only the production build is considered

no_valgrind:
name: Without Valgrind
if: github.repository == 'pmem/pmdk'
runs-on: [self-hosted, "${{ matrix.os }}"]
strategy:
fail-fast: true
matrix:
os: [rhel, opensuse]

steps:
- uses: actions/checkout@v4

- name: Test prepare
uses: ./.github/actions/pmem_test_prepare
with:
ndctl_enable: y
valgrind: 0

- name: Test run
Expand Down

0 comments on commit fdf6900

Please sign in to comment.