Skip to content

SRE-3734 ci: pass NO_PROXY and HTTPS_PROXY to functional tests #509

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

Merged
grom72 merged 2 commits into from
Apr 29, 2026
+10 −20
Merged

SRE-3734 ci: pass NO_PROXY and HTTPS_PROXY to functional tests #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dfe399
SRE-3734 ci: pass NO_PROXY and HTTPS_PROXY to functional tests
grom72 Apr 25, 2026
d77ef96
Remove of redundand code
grom72 Apr 27, 2026
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
12 changes: 4 additions & 8 deletions vars/buildRpm.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,10 @@ Map call(Map config = [:]) {
env_vars = ' CHROOT_NAME=' + config['chroot_name']
Comment thread
grom72 marked this conversation as resolved.
}

String https_proxy = ''
if (env.DAOS_HTTPS_PROXY) {
https_proxy = "${env.DAOS_HTTPS_PROXY}"
}
if (https_proxy) {
env_vars += ' HTTPS_PROXY=' + https_proxy
}

env_vars += (env.DAOS_HTTPS_PROXY ? \
' HTTPS_PROXY="' + env.DAOS_HTTPS_PROXY + '"' : '')
env_vars += (env.DAOS_NO_PROXY ? \
' NO_PROXY="' + env.DAOS_NO_PROXY + '"' : '')
String error_stage_result = 'FAILURE'
String error_build_result = 'FAILURE'
if (config['unstable']) {
Expand Down
7 changes: 2 additions & 5 deletions vars/dockerBuildArgs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,8 @@ String call(Map config = [:]) {
String https_proxy = ''
if (env.DAOS_HTTPS_PROXY) {
println "DAOS_HTTPS_PROXY: $DAOS_HTTPS_PROXY"
https_proxy = env.DAOS_HTTPS_PROXY
}
if (https_proxy) {
ret_str += ' --build-arg HTTPS_PROXY' + '="' + https_proxy + '"'
ret_str += ' --build-arg DAOS_HTTPS_PROXY' + '="' + https_proxy + '"'
ret_str += ' --build-arg HTTPS_PROXY' + '="' + env.DAOS_HTTPS_PROXY + '"'
ret_str += ' --build-arg DAOS_HTTPS_PROXY' + '="' + env.DAOS_HTTPS_PROXY + '"'
} else {
println "WARNING: Missing DAOS_HTTPS_PROXY variable in Docker build arguments"
}
Expand Down
9 changes: 2 additions & 7 deletions vars/provisionNodes.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,6 @@ Map call(Map config = [:]) {
default:
error "Unsupported distro type: ${distro_type}/distro: ${distro}"
}
String https_proxy = ''
if (env.DAOS_HTTPS_PROXY) {
https_proxy = "${env.DAOS_HTTPS_PROXY}"
} else if (env.HTTPS_PROXY) {
https_proxy = "${env.HTTPS_PROXY}"
}
provision_script += ' ' +
'NODESTRING=' + nodeString + ' ' +
'CONFIG_POWER_ONLY=' + config_power_only + ' ' +
Expand All @@ -181,7 +175,8 @@ Map call(Map config = [:]) {
// https://issues.jenkins.io/browse/JENKINS-55819
'CI_RPM_TEST_VERSION="' + (params.CI_RPM_TEST_VERSION ?: '') + '" ' +
'CI_PR_REPOS="' + (params.CI_PR_REPOS ?: '') + '" ' +
'HTTPS_PROXY="' + https_proxy + '" ' +
((env.DAOS_HTTPS_PROXY ?: env.HTTPS_PROXY) ?
'HTTPS_PROXY="' + (env.DAOS_HTTPS_PROXY ?: env.HTTPS_PROXY) + '" ' : '') +
'ci/provisioning/post_provision_config.sh'
new_config['post_restore'] = provision_script
try {
Expand Down
2 changes: 2 additions & 0 deletions vars/runTestFunctionalV2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Map call(Map config = [:]) {
'NODE_COUNT="' + config['node_count'] + '" ' +
'OPERATIONS_EMAIL="' + env.OPERATIONS_EMAIL + '" ' +
"WITH_VALGRIND=${stage_info.get('with_valgrind', '')} " +
(env.DAOS_HTTPS_PROXY ? 'DAOS_HTTPS_PROXY="' + env.DAOS_HTTPS_PROXY + '" ' : '') +
(env.DAOS_NO_PROXY ? 'DAOS_NO_PROXY="' + env.DAOS_NO_PROXY + '" ' : '') +
'ci/functional/test_main.sh'

String basedir = 'install/lib/daos/TESTING/ftest/avocado/job-results/'
Expand Down