Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// Then a second PR submitted to comment out the @Library line, and when it
// is landed, both PR branches can be deleted.
//@Library(value='pipeline-lib@my_branch_name') _
@Library(value='pipeline-lib@grom72/sre-3215') _

/* groovylint-disable-next-line CompileStatic */
job_status_internal = [:]
Expand Down
5 changes: 5 additions & 0 deletions vars/dockerBuildArgs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,17 @@ 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
} else if (env.HTTPS_PROXY) {
println "HTTPS_PROXY: $HTTPS_PROXY"
https_proxy = env.HTTPS_PROXY
}
if (https_proxy) {
ret_str += ' --build-arg HTTPS_PROXY' + '="' + https_proxy + '"'
ret_str += ' --build-arg DAOS_HTTPS_PROXY' + '="' + https_proxy + '"'
} else {
println "WARNING: Missing HTTPS_PROXY variable in Docker build arguments"
}

if (config['qb']) {
Expand Down