Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Jenkinsfile
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@hendersp/DAOS-19005') _

/* groovylint-disable-next-line CompileStatic */
job_status_internal = [:]
Expand Down
1 change: 1 addition & 0 deletions ci/functional/test_main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ if "$hardware_ok"; then
STAGE_NAME=\"${STAGE_NAME}\" \
DAOS_HTTPS_PROXY=\"${DAOS_HTTPS_PROXY:-}\" \
DAOS_NO_PROXY=\"${DAOS_NO_PROXY:-}\" \
TRUSTED_HOST=\"${TRUSTED_HOST:-}\" \
$(cat ci/functional/test_main_node.sh)"
else
./ftest.sh "$test_tag" "$tnodes" "${FTEST_ARG:-}"
Expand Down
2 changes: 1 addition & 1 deletion ci/functional/test_main_node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export TEST_RPMS=true
export REMOTE_ACCT=jenkins
export WITH_VALGRIND="$WITH_VALGRIND"
export STAGE_NAME="$STAGE_NAME"

export DAOS_HTTPS_PROXY="${DAOS_HTTPS_PROXY:-}"
export DAOS_NO_PROXY="${DAOS_NO_PROXY:-}"
export TRUSTED_HOST="${TRUSTED_HOST:-}"
/usr/lib/daos/TESTING/ftest/ftest.sh "$TEST_TAG" "$TNODES" "$FTEST_ARG"
1 change: 1 addition & 0 deletions ftest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ if ! clush "${CLUSH_ARGS[@]}" -B -l "${REMOTE_ACCT:-jenkins}" -R ssh -S \
DAOS_FTEST_VENV=$DAOS_FTEST_VENV
PYTHON_VERSION=${PYTHON_VERSION:-3.11}
PREFIX=$PREFIX
TRUSTED_HOST=${TRUSTED_HOST:-}
$(sed -e '1,/^$/d' "$SCRIPT_LOC"/setup_nodes.sh)"; then
echo "Cluster setup (i.e. provisioning) failed"
exit 1
Expand Down
9 changes: 9 additions & 0 deletions src/tests/ftest/scripts/setup_nodes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@ pip install ./pydaos
rm -rf pydaos
deactivate

# Set up uv (for SPDK installer) for the daos_build.py test
if [[ -n ${TRUSTED_HOST} ]]; then
sudo mkdir -p /etc/uv
cat <<EOF | sudo tee /etc/uv/uv.toml
index-url = "${TRUSTED_HOST}/artifactory/api/pypi/pypi-proxy/simple"
native-tls = true
EOF
fi

rm -rf "${TEST_TAG_DIR:?}/"
mkdir -p "$TEST_TAG_DIR/"
if [ -z "$JENKINS_URL" ]; then
Expand Down
Loading