Skip to content

SRE-2257 - introduce NO_PROXY support for Dockers #472

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 6 commits into from
Jul 14, 2025
Merged

SRE-2257 - introduce NO_PROXY support for Dockers #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc76c01
sre-2257 - introduce no_proxy support for Dockers
grom72 Jun 28, 2025
99e8796
DAOS_NO_PROXY instead of NO_PROXY
grom72 Jun 28, 2025
890c5f0
Remove --proxy from all pip install
grom72 Jun 29, 2025
87cc1e5
Disable tests until SRE-3161 is fixed
grom72 Jun 29, 2025
d80c983
Disable tests until SRE-3162 is fixed
grom72 Jun 29, 2025
e6801a0
Use dedicated Jenkins variable for no_proxy
grom72 Jun 30, 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
17 changes: 15 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,9 @@ pipeline {
stage('publishToRepository RPM tests') {
when {
beforeAgent true
expression { env.NO_CI_TESTING != 'true' }
/* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed
expression { env.NO_CI_TESTING != 'true' } */
expression { false }
}
agent {
dockerfile {
Expand Down Expand Up @@ -264,7 +266,9 @@ pipeline {
stage('publishToRepository DEB tests') {
when {
beforeAgent true
expression { env.NO_CI_TESTING != 'true' }
/* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed
expression { env.NO_CI_TESTING != 'true' } */
expression { false }
}
agent {
dockerfile {
Expand Down Expand Up @@ -304,11 +308,14 @@ pipeline {
stage('provisionNodes on EL 9 with master Repo') {
when {
beforeAgent true
/* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed
expression {
env.NO_CI_TESTING != 'true' &&
cachedCommitPragma('Skip-el9-provisioning-test') != 'true' &&
daosLatestVersion('master') != ''
}
*/
expression { false }
}
agent {
label 'ci_vm1'
Expand Down Expand Up @@ -347,10 +354,13 @@ pipeline {
stage('provisionNodes on EL 8 with slurm') {
when {
beforeAgent true
/* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed
expression {
env.NO_CI_TESTING != 'true' &&
daosLatestVersion('master') != ''
}
*/
expression { false }
}
agent {
label 'ci_vm1'
Expand Down Expand Up @@ -379,10 +389,13 @@ pipeline {
stage('provisionNodes on Leap 15 with slurm') {
when {
beforeAgent true
/* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed
expression {
env.NO_CI_TESTING != 'true' &&
daosLatestVersion('master') != ''
}
*/
expression { false }
}
agent {
label 'ci_vm1'
Expand Down
5 changes: 5 additions & 0 deletions vars/dockerBuildArgs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ String call(Map config = [:]) {
}
}

if (env.DAOS_NO_PROXY) {
println "DAOS_NO_PROXY: $DAOS_NO_PROXY"
ret_str += ' --build-arg DAOS_NO_PROXY' + '="' + env.DAOS_NO_PROXY + '"'
}

String https_proxy = ''
if (env.DAOS_HTTPS_PROXY) {
https_proxy = env.DAOS_HTTPS_PROXY
Expand Down
9 changes: 0 additions & 9 deletions vars/functionalTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,7 @@ Map call(Map config = [:]) {
run_test_config['context'] = context
run_test_config['description'] = description

String https_proxy = ''
if (env.DAOS_HTTPS_PROXY) {
https_proxy = "${env.DAOS_HTTPS_PROXY}"
} else if (env.HTTPS_PROXY) {
https_proxy = "${env.HTTPS_PROXY}"
}
String script = 'if ! pip3 install'
if (https_proxy) {
script += ' --proxy "' + https_proxy + '"'
}
script += ''' --upgrade --upgrade-strategy only-if-needed launchable; then
set +e
echo "Failed to install launchable"
Expand Down
10 changes: 0 additions & 10 deletions vars/functionalTestPostV2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,9 @@ void call(Map config = [:]) {
script: 'ci/functional/launchable_analysis "' + fileName + '"')
}

String https_proxy = ''
if (env.DAOS_HTTPS_PROXY) {
https_proxy = "${env.DAOS_HTTPS_PROXY}"
} else if (env.HTTPS_PROXY) {
https_proxy = "${env.HTTPS_PROXY}"
}
String script = 'pip3 install'
if (https_proxy) {
script += ' --proxy "' + https_proxy + '"'
}
script += ' --user --upgrade launchable~=1.0'


sh(label: 'Install Launchable',
script: script)

Expand Down