From 7f0fe6d26a8a7be265d917d2111f07665c401692 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Fri, 5 Jan 2024 11:02:30 -0500 Subject: [PATCH] DAOS-14480 test: Extend Python code to support UCX with ud_x (#13568) Support running functional UCX tests with either ucx+dc_x or ucx+ud_x and default to using ucx+ud_x. Signed-off-by: Phil Henderson --- Jenkinsfile | 5 ++++- src/tests/ftest/util/network_utils.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4536019bc48..a32526b0d1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1223,7 +1223,10 @@ pipeline { functionalTest( inst_repos: daosRepos(), inst_rpms: functionalPackages(1, next_version, 'client-tests-openmpi'), - test_function: 'runTestFunctionalV2')) + test_function: 'runTestFunctionalV2', + ftest_arg: getFunctionalArgs( + pragma_suffix: '-hw-medium-ucx-provider', + provider: cachedCommitPragma('Test-provider-ucx', 'ucx+ud_x'))['ftest_arg'])) } post { always { diff --git a/src/tests/ftest/util/network_utils.py b/src/tests/ftest/util/network_utils.py index f9e9ad82d95..de940ed835c 100644 --- a/src/tests/ftest/util/network_utils.py +++ b/src/tests/ftest/util/network_utils.py @@ -1,5 +1,5 @@ """ - (C) Copyright 2022-2023 Intel Corporation. + (C) Copyright 2022-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -16,6 +16,7 @@ "ofi+cxi", "ofi+verbs;ofi_rxm", "ucx+dc_x", + "ucx+ud_x", "ofi+tcp;ofi_rxm", "ofi+opx" )