Skip to content

Commit e3cb666

Browse files
authored
Merge pull request #1179 from lukaszstolarczuk/sles15-ci
[CI] Enable SLES in multi numa workflow
2 parents 9abb40d + a234364 commit e3cb666

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/scripts/get_system_info.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function check_L0_version {
1515
fi
1616

1717
if command -v zypper &> /dev/null; then
18-
zypper se level-zero && return
18+
zypper -n se level-zero || true
1919
fi
2020

2121
echo "level-zero not installed"

.github/workflows/reusable_multi_numa.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Runs tests on multi-numa machine
1+
# Runs tests on multi-numa machines
22
name: MultiNuma
33

44
on: [workflow_call]
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: [ubuntu-22.04, rhel-9.1]
23+
os: [ubuntu-22.04, rhel-9.1, sles-15]
2424
build_type: [Debug, Release]
2525
shared_library: ['ON', 'OFF']
2626
runs-on: ["DSS-MULTI-NUMA", "DSS-${{matrix.os}}"]
@@ -31,9 +31,6 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333

34-
- name: Get information about platform
35-
run: .github/scripts/get_system_info.sh
36-
3734
- name: Configure build
3835
run: >
3936
cmake
@@ -53,24 +50,24 @@ jobs:
5350
run: cmake --build ${{github.workspace}}/build -j $(nproc)
5451

5552
- name: Run tests
56-
if: matrix.os != 'rhel-9.1'
53+
if: (matrix.os != 'rhel-9.1') && (matrix.os != 'sles-15')
5754
working-directory: ${{github.workspace}}/build
5855
run: ctest --output-on-failure --test-dir test
5956

60-
# On RHEL, hwloc version is just a little too low.
57+
# On RHEL/SLES, hwloc version is just a little too low.
6158
# Skip some tests until we upgrade hwloc and update CMake to properly handle local hwloc installation.
6259
# TODO: fix issue #560
6360
# TODO: add issue for -E test_init_teardown - it is not clear why it fails
64-
- name: Run tests (on RHEL)
65-
if: matrix.os == 'rhel-9.1'
61+
- name: Run tests (on RHEL/SLES)
62+
if: (matrix.os == 'rhel-9.1') || (matrix.os == 'sles-15')
6663
working-directory: ${{github.workspace}}/build
6764
run: |
6865
ctest --output-on-failure --test-dir test -E "test_provider_os_memory_multiple_numa_nodes|test_init_teardown"
6966
./test/test_provider_os_memory_multiple_numa_nodes \
7067
--gtest_filter="-*checkModeLocal/*:*checkModePreferredEmptyNodeset/*:testNuma.checkModeInterleave"
7168
7269
- name: Run NUMA tests under valgrind
73-
if: matrix.os != 'rhel-9.1'
70+
if: (matrix.os != 'rhel-9.1') && (matrix.os != 'sles-15')
7471
run: |
7572
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} memcheck "${{env.NUMA_TESTS}}"
7673
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} drd "${{env.NUMA_TESTS}}"
@@ -91,3 +88,7 @@ jobs:
9188
with:
9289
name: ${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}
9390
path: ${{env.COVERAGE_DIR}}
91+
92+
- name: Get information about platform
93+
if: always()
94+
run: .github/scripts/get_system_info.sh

0 commit comments

Comments
 (0)