From 983b9f47f617dfad8dbd1b041ad0d7a24600d52e Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 19 Jul 2025 13:37:06 +0200 Subject: [PATCH 1/2] SRE-3215 ci: HTTPS_PROXY arg for Docker diagnostic Add diagnostic about HTTPS_PROXY arg for Docker build Priority: 2 Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 1 + vars/dockerBuildArgs.groovy | 4 ++++ 2 files changed, 5 insertions(+) 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..8c5bcf926 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -71,12 +71,16 @@ 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 + '"' + } else { + println "WARNING: Missing HTTPS_PROXY variable in Docker build arguments" } if (config['qb']) { From 44b9893ddea6a8dc621fc1df84140aa0e8e27c65 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 22 Jul 2025 18:37:09 +0200 Subject: [PATCH 2/2] Add support for DAOS_HTTPS_PROXY in Docker Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 8c5bcf926..08d9cc317 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -79,6 +79,7 @@ String call(Map config = [:]) { } 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" }