diff --git a/Jenkinsfile b/Jenkinsfile index 434f3be33..acdb3f4fd 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 = [:] diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 02ab45190..08d9cc317 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -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']) {