Skip to content

SRE-3459 test: run unit tests on EL 9.7 #17176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
osalyk wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −25
Draft

SRE-3459 test: run unit tests on EL 9.7 #17176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// To use a test branch (i.e. PR) until it lands to master
// I.e. for testing library changes
//@Library(value='pipeline-lib@your_branch') _
@Library(value='pipeline-lib@osalyk/SRE-3459') _

/* groovylint-disable-next-line CompileStatic */
job_status_internal = [:]
Expand Down Expand Up @@ -310,7 +311,7 @@ pipeline {
description: 'Continue testing if a previous stage is Unstable')
booleanParam(name: 'CI_UNIT_TEST',
defaultValue: true,
description: 'Run the Unit Test on EL 8 test stage')
description: 'Run the Unit Test on EL 9.6 test stage')
booleanParam(name: 'CI_NLT_TEST',
defaultValue: true,
description: 'Run the NLT test stage')
Expand Down Expand Up @@ -726,7 +727,7 @@ pipeline {
expression { !skipStage() }
}
parallel {
stage('Unit Test on EL 8.8') {
stage('Unit Test') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -735,11 +736,14 @@ pipeline {
label cachedCommitPragma(pragma: 'VM1-label', def_val: params.CI_UNIT_VM1_LABEL)
}
steps {
job_step_update(
unitTest(timeout_time: 60,
unstash_opt: true,
inst_repos: daosRepos(),
inst_rpms: unitPackages()))
job_step_update(
unitTest(timeout_time: 60,
unstash_opt: true,
inst_repos: daosRepos(),
inst_rpms: unitPackages([image_version: "el9"]),
image_version: 'el9.6',
)
)
}
post {
always {
Expand All @@ -748,7 +752,7 @@ pipeline {
}
}
}
stage('Unit Test bdev on EL 8.8') {
stage('Unit Test bdev') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -761,7 +765,8 @@ pipeline {
unitTest(timeout_time: 60,
unstash_opt: true,
inst_repos: daosRepos(),
inst_rpms: unitPackages()))
inst_rpms: unitPackages([image_version: "el9"]),
image_version: 'el9.6'))
}
post {
always {
Expand All @@ -785,7 +790,8 @@ pipeline {
test_script: 'ci/unit/test_nlt.sh',
unstash_opt: true,
unstash_tests: false,
inst_rpms: unitPackages()))
inst_rpms: unitPackages([image_version: "el8"]),
image_version: 'el8.8'))
// recordCoverage(tools: [[parser: 'COBERTURA', pattern:'nltir.xml']],
// skipPublishingChecks: true,
// id: 'tlc', name: 'Fault Injection Interim Report')
Expand All @@ -810,7 +816,7 @@ pipeline {
}
}
}
stage('Unit Test with memcheck on EL 8.8') {
stage('Unit Test with memcheck') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -824,18 +830,19 @@ pipeline {
unstash_opt: true,
ignore_failure: true,
inst_repos: daosRepos(),
inst_rpms: unitPackages()))
inst_rpms: unitPackages([image_version: "el9"]),
image_version: 'el9.6'))
}
post {
always {
unitTestPost artifacts: ['unit_test_memcheck_logs.tar.gz',
'unit_test_memcheck_logs/**/*.log'],
valgrind_stash: 'el8-gcc-unit-memcheck'
valgrind_stash: 'el9-gcc-unit-memcheck'
job_status_update()
}
}
} // stage('Unit Test with memcheck on EL 8.8')
stage('Unit Test bdev with memcheck on EL 8.8') {
} // stage('Unit Test with memcheck')
stage('Unit Test bdev with memcheck') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -849,17 +856,18 @@ pipeline {
unstash_opt: true,
ignore_failure: true,
inst_repos: daosRepos(),
inst_rpms: unitPackages()))
inst_rpms: unitPackages([image_version: "el9"]),
image_version: 'el9.6'))
}
post {
always {
unitTestPost artifacts: ['unit_test_memcheck_bdev_logs.tar.gz',
'unit_test_memcheck_bdev_logs/**/*.log'],
valgrind_stash: 'el8-gcc-unit-memcheck-bdev'
valgrind_stash: 'el9-gcc-unit-memcheck-bdev'
job_status_update()
}
}
} // stage('Unit Test bdev with memcheck on EL 8')
} // stage('Unit Test bdev with memcheck')
}
}
stage('Test') {
Expand Down
4 changes: 3 additions & 1 deletion ci/provisioning/post_provision_config_common_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ retry_dnf() {
if command -v dnf4; then
dnfx="dnf4"
fi
"$dnfx" config-manager --disable 'epel*' || true
if "$dnfx" repolist | grep -q '^epel'; then
"$dnfx" config-manager --disable 'epel*' || true
fi
fi
return 0
fi
Expand Down
5 changes: 4 additions & 1 deletion ci/provisioning/post_provision_config_nodes_EL.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ set +e
set -e
# Seems to be needed to fix some issues.
dnf -y reinstall sssd-common
# Seems to be required until https://daosio.atlassian.net/browse/DAOS-18358
# is fixed.
dnf -y remove clamav-lib
}

group_repo_post() {
Expand All @@ -30,7 +33,7 @@ distro_custom() {

# Use a more recent python version for unit testing, this allows us to also test installing
# pydaos into virtual environments.
dnf -y install python39 python39-devel
dnf -y install python3.9 python3.9-devel
dnf -y install python3.11 python3.11-devel
}

Expand Down
8 changes: 4 additions & 4 deletions ci/unit/required_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
set -eu

# No longer used but provided by pipeline-lib
# distro="$1"
# quick_build="${2:-false}"
# distro="$1"

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 \
export DISTRO="${1:-el8}"

pkgs="boost-python3$PY_MINOR_VER-devel \
capstone \
$(utils/rpms/package_version.sh argobots lib) \
$(utils/rpms/package_version.sh argobots debug) \
Expand Down
2 changes: 1 addition & 1 deletion src/rdb/raft
Open in desktop
Submodule raft updated 4 files
+1 −11 include/raft.h
+1 −1 include/raft_types.h
+3 −3 tests/log_fuzzer.py
+1 −1 tests/test_server.c
Loading