Skip to content

Commit f2d4a3f

Browse files
committed
SRE-3734 ci: ftest: force direct access to CI artifactory (#18048)
Configure NO_PROXY along with HTTPS_PROXY to redirect traffic directly to DAOS CI artifactory, bypassing the proxy. Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
1 parent 9bb7b12 commit f2d4a3f

7 files changed

Lines changed: 14 additions & 10 deletions

File tree

ci/functional/test_main_node.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ export REMOTE_ACCT=jenkins
1616
export WITH_VALGRIND="$WITH_VALGRIND"
1717
export STAGE_NAME="$STAGE_NAME"
1818

19-
DAOS_HTTPS_PROXY="${DAOS_HTTPS_PROXY:-}" \
20-
DAOS_NO_PROXY="${DAOS_NO_PROXY:-}" \
19+
export DAOS_HTTPS_PROXY="${DAOS_HTTPS_PROXY:-}"
20+
export DAOS_NO_PROXY="${DAOS_NO_PROXY:-}"
2121
/usr/lib/daos/TESTING/ftest/ftest.sh "$TEST_TAG" "$TNODES" "$FTEST_ARG"

ci/unit/test_main_node.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,5 @@ pip install /opt/daos/lib/daos/python/
9999

100100
HTTPS_PROXY="${DAOS_HTTPS_PROXY:-}" \
101101
NO_PROXY="${DAOS_NO_PROXY:-}" \
102-
no_proxy="${DAOS_NO_PROXY:-}" \
103102
utils/run_utest.py $RUN_TEST_VALGRIND \
104103
--no-fail-on-error $VDB_ARG --log_dir="$test_log_dir" $SUDO_ARG

ci/unit/test_nlt_node.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ prlimit -n
4747

4848
HTTPS_PROXY="${DAOS_HTTPS_PROXY:-}" \
4949
NO_PROXY="${DAOS_NO_PROXY:-}" \
50-
no_proxy="${DAOS_NO_PROXY:-}" \
5150
./utils/node_local_test.py --max-log-size 1950MiB \
5251
--dfuse-dir /localhome/jenkins/ --log-usage-save nltir.xml --log-usage-export nltr.json all

src/tests/ftest/dfuse/daos_build.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
(C) Copyright 2020-2024 Intel Corporation.
3-
(C) Copyright 2025 Hewlett Packard Enterprise Development LP
3+
(C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
44
(C) Copyright 2025 Google LLC
55
66
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -104,7 +104,8 @@ def run_build_test(self, cache_mode, il_lib=None, run_on_vms=False):
104104
remote_env['PATH'] = f"{os.path.join(mount_dir, 'venv', 'bin')}:$PATH"
105105
remote_env['VIRTUAL_ENV'] = os.path.join(mount_dir, 'venv')
106106
remote_env['COVFILE'] = os.environ['COVFILE']
107-
remote_env['HTTPS_PROXY'] = os.environ['HTTPS_PROXY']
107+
remote_env['HTTPS_PROXY'] = os.environ.get('HTTPS_PROXY', '')
108+
remote_env['NO_PROXY'] = os.environ.get('NO_PROXY', '')
108109

109110
if il_lib is not None:
110111
remote_env['LD_PRELOAD'] = os.path.join(self.prefix, 'lib64', il_lib)

src/tests/ftest/scripts/main.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,8 @@ if [ -n "$DAOS_HTTPS_PROXY" ]; then
102102
# shellcheck disable=SC2154
103103
export HTTPS_PROXY="${DAOS_HTTPS_PROXY:-""}"
104104
fi
105-
if [ -n "${DAOS_NO_PROXY:-}" ]; then
106-
export NO_PROXY="${DAOS_NO_PROXY}"
107-
export no_proxy="${DAOS_NO_PROXY}"
105+
if [ -n "$DAOS_NO_PROXY" ]; then
106+
export NO_PROXY="${DAOS_NO_PROXY:-""}"
108107
fi
109108

110109
launch_node_args="-ts ${TEST_NODES}"

utils/node_local_test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,9 @@ def get_base_env(clean=False):
442442
http_proxy = os.environ.get('HTTPS_PROXY')
443443
if http_proxy:
444444
env['HTTPS_PROXY'] = http_proxy
445+
no_proxy = os.environ.get('NO_PROXY')
446+
if no_proxy:
447+
env['NO_PROXY'] = no_proxy
445448

446449
# Enable this to debug memory errors, it has a performance impact but will scan the heap
447450
# for corruption. See DAOS-12735 for why this can cause problems in practice.

utils/run_utest.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33
Copyright 2023-2024 Intel Corporation.
44
Copyright 2025 Google LLC
5-
Copyright 2025 Hewlett Packard Enterprise Development LP
5+
Copyright 2025-2026 Hewlett Packard Enterprise Development LP
66
All rights reserved.
77
88
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -364,6 +364,9 @@ def __init__(self, suite, config, path_info, args):
364364
http_proxy = os.environ.get('HTTPS_PROXY')
365365
if http_proxy:
366366
self.env['HTTPS_PROXY'] = http_proxy
367+
no_proxy = os.environ.get('NO_PROXY')
368+
if no_proxy:
369+
self.env['NO_PROXY'] = no_proxy
367370

368371
def log_dir(self):
369372
"""Return the log directory"""

0 commit comments

Comments
 (0)