Skip to content

Commit ce829ac

Browse files
authored
SRE-2257 - introduce NO_PROXY support for Dockers (#472)
* sre-2257 - introduce no_proxy support for Dockers based on DAOS_NO_PROXY global variable * Remove --proxy from all pip install * Disable some tests until (SRE-3161)[https://daosio.atlassian.net/browse/SRE-3161] is fixed * Disable some tests until (SRE-3162)[https://daosio.atlassian.net/browse/SRE-3162] is fixed --------- Signed-off-by: Tomasz Gromadzki <[email protected]>
1 parent 4df343a commit ce829ac

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

Jenkinsfile

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,9 @@ pipeline {
224224
stage('publishToRepository RPM tests') {
225225
when {
226226
beforeAgent true
227-
expression { env.NO_CI_TESTING != 'true' }
227+
/* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed
228+
expression { env.NO_CI_TESTING != 'true' } */
229+
expression { false }
228230
}
229231
agent {
230232
dockerfile {
@@ -264,7 +266,9 @@ pipeline {
264266
stage('publishToRepository DEB tests') {
265267
when {
266268
beforeAgent true
267-
expression { env.NO_CI_TESTING != 'true' }
269+
/* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed
270+
expression { env.NO_CI_TESTING != 'true' } */
271+
expression { false }
268272
}
269273
agent {
270274
dockerfile {
@@ -304,11 +308,14 @@ pipeline {
304308
stage('provisionNodes on EL 9 with master Repo') {
305309
when {
306310
beforeAgent true
311+
/* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed
307312
expression {
308313
env.NO_CI_TESTING != 'true' &&
309314
cachedCommitPragma('Skip-el9-provisioning-test') != 'true' &&
310315
daosLatestVersion('master') != ''
311316
}
317+
*/
318+
expression { false }
312319
}
313320
agent {
314321
label 'ci_vm1'
@@ -347,10 +354,13 @@ pipeline {
347354
stage('provisionNodes on EL 8 with slurm') {
348355
when {
349356
beforeAgent true
357+
/* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed
350358
expression {
351359
env.NO_CI_TESTING != 'true' &&
352360
daosLatestVersion('master') != ''
353361
}
362+
*/
363+
expression { false }
354364
}
355365
agent {
356366
label 'ci_vm1'
@@ -379,10 +389,13 @@ pipeline {
379389
stage('provisionNodes on Leap 15 with slurm') {
380390
when {
381391
beforeAgent true
392+
/* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed
382393
expression {
383394
env.NO_CI_TESTING != 'true' &&
384395
daosLatestVersion('master') != ''
385396
}
397+
*/
398+
expression { false }
386399
}
387400
agent {
388401
label 'ci_vm1'

vars/dockerBuildArgs.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ String call(Map config = [:]) {
6464
}
6565
}
6666

67+
if (env.DAOS_NO_PROXY) {
68+
println "DAOS_NO_PROXY: $DAOS_NO_PROXY"
69+
ret_str += ' --build-arg DAOS_NO_PROXY' + '="' + env.DAOS_NO_PROXY + '"'
70+
}
71+
6772
String https_proxy = ''
6873
if (env.DAOS_HTTPS_PROXY) {
6974
https_proxy = env.DAOS_HTTPS_PROXY

vars/functionalTest.groovy

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,7 @@ Map call(Map config = [:]) {
114114
run_test_config['context'] = context
115115
run_test_config['description'] = description
116116

117-
String https_proxy = ''
118-
if (env.DAOS_HTTPS_PROXY) {
119-
https_proxy = "${env.DAOS_HTTPS_PROXY}"
120-
} else if (env.HTTPS_PROXY) {
121-
https_proxy = "${env.HTTPS_PROXY}"
122-
}
123117
String script = 'if ! pip3 install'
124-
if (https_proxy) {
125-
script += ' --proxy "' + https_proxy + '"'
126-
}
127118
script += ''' --upgrade --upgrade-strategy only-if-needed launchable; then
128119
set +e
129120
echo "Failed to install launchable"

vars/functionalTestPostV2.groovy

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,9 @@ void call(Map config = [:]) {
9898
script: 'ci/functional/launchable_analysis "' + fileName + '"')
9999
}
100100

101-
String https_proxy = ''
102-
if (env.DAOS_HTTPS_PROXY) {
103-
https_proxy = "${env.DAOS_HTTPS_PROXY}"
104-
} else if (env.HTTPS_PROXY) {
105-
https_proxy = "${env.HTTPS_PROXY}"
106-
}
107101
String script = 'pip3 install'
108-
if (https_proxy) {
109-
script += ' --proxy "' + https_proxy + '"'
110-
}
111102
script += ' --user --upgrade launchable~=1.0'
112103

113-
114104
sh(label: 'Install Launchable',
115105
script: script)
116106

0 commit comments

Comments
 (0)