Skip to content

Dbohning/sre 2832 release #16401

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
wants to merge 4 commits into
base: release/2.6
Choose a base branch
from
+418 −149
Draft

Dbohning/sre 2832 release #16401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9620284
SRE-2832 FC fixes to enable Functional Tests (#16224)
grom72 May 14, 2025
c1d8048
Merge branch 'release/2.6' into hendersp/SRE-2832
phender May 15, 2025
9340ec9
build type release
daltonbohning May 16, 2025
a53b00f
skip tests
daltonbohning May 16, 2025
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
25 changes: 18 additions & 7 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ pipeline {
// 'stages of this run (i.e. auto, auto_md_on_ssd, auto:-3DNAND, ' +
// '0000:81:00.0, etc.). Does not apply to MD on SSD stages.')
string(name: 'BuildType',
defaultValue: '',
defaultValue: 'release',
description: 'Type of build. Passed to scons as BUILD_TYPE. (I.e. dev, release, debug, etc.). ' +
'Defaults to release on an RC or dev otherwise.')
string(name: 'TestRepeat',
Expand All @@ -205,12 +205,15 @@ pipeline {
'stages. Specifies the default provider to use the daos_server ' +
'config file when running functional tests (the launch.py ' +
'--provider argument; i.e. "ucx+dc_x", "ofi+verbs", "ofi+tcp")')
booleanParam(name: 'CI_SKIP_CANCEL_PREV_BUILD',
booleanParam(name: 'CI_CANCEL_PREV_BUILD_SKIP',
defaultValue: false,
description: 'Do not cancel previous build.')
booleanParam(name: 'CI_BUILD_PACKAGES_ONLY',
defaultValue: false,
description: 'Only build RPM and DEB packages, Skip unit tests.')
string(name: 'CI_SCONS_ARGS',
defaultValue: '',
description: 'Arguments for scons when building DAOS')
string(name: 'CI_RPM_TEST_VERSION',
defaultValue: '',
description: 'Package version to use instead of building. example: 1.3.103-1, 1.2-2')
Expand Down Expand Up @@ -273,6 +276,9 @@ pipeline {
booleanParam(name: 'CI_TEST_LEAP15_RPMs',
defaultValue: true,
description: 'Run the Test RPMs on Leap 15 test stage')
booleanParam(name: 'CI_FUNCTIONAL_TEST_SKIP',
defaultValue: false,
description: 'Skip all functional test stages (Test)')
booleanParam(name: 'CI_MORE_FUNCTIONAL_PR_TESTS',
defaultValue: false,
description: 'Enable more distros for functional CI tests')
Expand All @@ -293,6 +299,9 @@ pipeline {
defaultValue: false,
description: 'Run the Functional on Ubuntu 20.04 test stage' +
' Requires CI_MORE_FUNCTIONAL_PR_TESTS')
booleanParam(name: 'CI_FUNCTIONAL_HARDWARE_TEST_SKIP',
defaultValue: false,
description: 'Skip Functional Hardware (Test Hardware) stage')
booleanParam(name: 'CI_medium_TEST',
defaultValue: true,
description: 'Run the Functional Hardware Medium test stage')
Expand Down Expand Up @@ -333,7 +342,7 @@ pipeline {
defaultValue: 'ci_nvme5',
description: 'Label to use for the Functional Hardware Medium (MD on SSD) stages')
string(name: 'FUNCTIONAL_HARDWARE_MEDIUM_VERBS_PROVIDER_LABEL',
defaultValue: 'ci_nvme5',
defaultValue: 'ci_ofed5',
description: 'Label to use for 5 node Functional Hardware Medium Verbs Provider (MD on SSD) stages')
string(name: 'FUNCTIONAL_HARDWARE_MEDIUM_VMD_LABEL',
defaultValue: 'ci_vmd5',
Expand Down Expand Up @@ -407,7 +416,7 @@ pipeline {
stage('Cancel Previous Builds') {
when {
beforeAgent true
expression { !paramsValue('CI_SKIP_CANCEL_PREV_BUILD', false) && !skipStage() }
expression { !paramsValue('CI_CANCEL_PREV_BUILD_SKIP', false) && !skipStage() }
}
steps {
cancelPreviousBuilds()
Expand Down Expand Up @@ -613,7 +622,7 @@ pipeline {
}
}
}
stage('Build on EL 8') {
stage('Build on EL 8.8') {
when {
beforeAgent true
expression { !params.CI_el8_NOBUILD && !skipStage() }
Expand Down Expand Up @@ -834,7 +843,9 @@ pipeline {
stage('Test') {
when {
beforeAgent true
expression { !skipStage() }
//expression { !paramsValue('CI_FUNCTIONAL_TEST_SKIP', false) && !skipStage() }
// Above not working, always skipping functional VM tests.
expression { !paramsValue('CI_FUNCTIONAL_TEST_SKIP', false) }
}
parallel {
stage('Functional on EL 8.8 with Valgrind') {
Expand Down Expand Up @@ -1098,7 +1109,7 @@ pipeline {
stage('Test Hardware') {
when {
beforeAgent true
expression { !skipStage() }
expression { !paramsValue('CI_FUNCTIONAL_HARDWARE_TEST_SKIP', false) && !skipStage() }
}
steps {
script {
Expand Down
12 changes: 10 additions & 2 deletions ci/functional/test_main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/bash
#
# Copyright 2020-2023 Intel Corporation.
# Copyright 2020-2024 Intel Corporation.
# Copyright 2025 Hewlett Packard Enterprise Development LP
#
# SPDX-License-Identifier: BSD-2-Clause-Patent

#
set -eux

if [ -z "$TEST_TAG" ]; then
Expand Down Expand Up @@ -47,6 +48,8 @@ test_cluster() {
NODELIST=${tnodes} \
BUILD_URL=\"${BUILD_URL:-Unknown in GHA}\" \
STAGE_NAME=\"$STAGE_NAME\" \
JENKINS_URL=\"${JENKINS_URL:-}\" \
DAOS_DEVOPS_EMAIL=\"${DAOS_DEVOPS_EMAIL:-}\" \
$(cat ci/functional/test_main_prep_node.sh)"
}

Expand All @@ -58,7 +61,11 @@ if ! test_cluster; then
if cluster_reboot; then
if test_cluster; then
hardware_ok=true
else
echo "Hardware test failed again after reboot"
fi
else
echo "Cluster reboot failed"
fi
else
hardware_ok=true
Expand Down Expand Up @@ -99,6 +106,7 @@ if "$hardware_ok"; then
FTEST_ARG=\"${FTEST_ARG:-}\" \
WITH_VALGRIND=\"${WITH_VALGRIND:-}\" \
STAGE_NAME=\"$STAGE_NAME\" \
HTTPS_PROXY=\"${HTTPS_PROXY:-}\" \
$(cat ci/functional/test_main_node.sh)"
else
./ftest.sh "$test_tag" "$tnodes" "$FTEST_ARG"
Expand Down
10 changes: 8 additions & 2 deletions ci/functional/test_main_node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!/bin/bash

#
# Copyright 2020-2022 Intel Corporation.
# Copyright 2025 Hewlett Packard Enterprise Development LP
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
set -eux

DAOS_TEST_SHARED_DIR=$(mktemp -d -p /mnt/share/)
Expand All @@ -11,4 +16,5 @@ export REMOTE_ACCT=jenkins
export WITH_VALGRIND="$WITH_VALGRIND"
export STAGE_NAME="$STAGE_NAME"

/usr/lib/daos/TESTING/ftest/ftest.sh "$TEST_TAG" "$TNODES" "$FTEST_ARG"
HTTPS_PROXY="${HTTPS_PROXY:-}" /usr/lib/daos/TESTING/ftest/ftest.sh \
"$TEST_TAG" "$TNODES" "$FTEST_ARG"
Loading
Loading