Skip to content

Commit c588357

Browse files
committed
SRE-3534 ci: Upgrate NLT based tests to el9.7
Enable NLT and Fault Injection tests on el9.7 Switch Functional VM tests to EL 9 by default. Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com> Cancel-prev-build: false Skip-build-el8-gcc: false Skip-build-leap15-gcc: true Skip-build-leap15-icc: true Allow-unstable-test: true Skip-func-test-el8: true Skip-func-test-el9: true Skip-test-el-8.6-rpms: true Skip-test-leap-15-rpms: true Skip-func-hw-test: true Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
1 parent ffdf361 commit c588357

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

Jenkinsfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,10 @@ pipeline {
343343
defaultValue: false,
344344
description: 'Run the Functional on EL 8 with Valgrind test stage')
345345
booleanParam(name: 'CI_FUNCTIONAL_el8_TEST',
346-
defaultValue: true,
346+
defaultValue: false,
347347
description: 'Run the Functional on EL 8 test stage')
348348
booleanParam(name: 'CI_FUNCTIONAL_el9_TEST',
349-
defaultValue: false,
349+
defaultValue: true,
350350
description: 'Run the Functional on EL 9 test stage')
351351
booleanParam(name: 'CI_FUNCTIONAL_leap15_TEST',
352352
defaultValue: false,
@@ -774,7 +774,7 @@ pipeline {
774774
}
775775
}
776776
}
777-
stage('NLT on EL 8.8') {
777+
stage('NLT on EL 9.7') {
778778
when {
779779
beforeAgent true
780780
expression { params.CI_NLT_TEST && !skipStage() }
@@ -839,7 +839,7 @@ pipeline {
839839
}
840840
}
841841
} // stage('Unit Test with memcheck on EL 8.8')
842-
stage('Unit Test bdev with memcheck on EL 8.8') {
842+
stage('Unit Test bdev with memcheck on EL 9.7') {
843843
when {
844844
beforeAgent true
845845
expression { !skipStage() }
@@ -859,11 +859,11 @@ pipeline {
859859
always {
860860
unitTestPost artifacts: ['unit_test_memcheck_bdev_logs.tar.gz',
861861
'unit_test_memcheck_bdev_logs/**/*.log'],
862-
valgrind_stash: 'el8-gcc-unit-memcheck-bdev'
862+
valgrind_stash: 'el9-gcc-unit-memcheck-bdev'
863863
job_status_update()
864864
}
865865
}
866-
} // stage('Unit Test bdev with memcheck on EL 8')
866+
} // stage('Unit Test bdev with memcheck on EL 9.7')
867867
}
868868
}
869869
stage('Test') {
@@ -985,14 +985,14 @@ pipeline {
985985
}
986986
} // post
987987
} // stage('Functional on Ubuntu 20.04')
988-
stage('Fault injection testing on EL 8.8') {
988+
stage('Fault injection testing on EL 9.7') {
989989
when {
990990
beforeAgent true
991991
expression { !skipStage() }
992992
}
993993
agent {
994994
dockerfile {
995-
filename 'utils/docker/Dockerfile.el.8'
995+
filename 'utils/docker/Dockerfile.el.9'
996996
label 'docker_runner'
997997
additionalBuildArgs dockerBuildArgs(repo_type: 'stable',
998998
parallel_build: true,
@@ -1035,12 +1035,12 @@ pipeline {
10351035
stash name: 'fault-inject-valgrind',
10361036
includes: '*.memcheck.xml',
10371037
allowEmpty: true
1038-
archiveArtifacts artifacts: 'nlt_logs/el8.fault-injection/',
1038+
archiveArtifacts artifacts: 'nlt_logs/el9.fault-injection/',
10391039
allowEmptyArchive: true
10401040
job_status_update()
10411041
}
10421042
}
1043-
} // stage('Fault injection testing on EL 8.8')
1043+
} // stage('Fault injection testing on EL 9.7')
10441044
stage('Test RPMs on EL 8.6') {
10451045
when {
10461046
beforeAgent true

ci/unit/required_packages.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
#
88
set -eu
99

10-
# No longer used but provided by pipeline-lib
10+
# Provided by pipeline-lib
1111
# distro="$1"
1212
# quick_build="${2:-false}"
1313

1414
OPENMPI_VER=""
1515
PY_MINOR_VER=""
1616

17-
export DISTRO="el8" # should also work for el9
17+
DISTRO="${1:?ERROR: Missing distro argument. Usage: $0 <distro>}"
18+
export DISTRO="${DISTRO%%.*}"
19+
1820
pkgs="$(utils/rpms/package_version.sh argobots lib) \
1921
boost-python3$PY_MINOR_VER-devel \
2022
capstone \

0 commit comments

Comments
 (0)