From c42d897a2e0a412a6b3b5c18689898557823f086 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 21 Apr 2026 22:12:24 +0200 Subject: [PATCH] SRE-3737 ci: HOT FIX Fault Injection without proxy Fault Injection testing shall not access internet so neither https_proxy nor no_proxy variables are required. Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 42c4bd6ee..eb05fe057 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -61,21 +61,23 @@ 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 + '"' - } + if (!(env.STAGE_NAME?.contains('Fault injection'))) { + 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) { - println "DAOS_HTTPS_PROXY: $DAOS_HTTPS_PROXY" - https_proxy = env.DAOS_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 DAOS_HTTPS_PROXY variable in Docker build arguments" + String https_proxy = '' + if (env.DAOS_HTTPS_PROXY) { + println "DAOS_HTTPS_PROXY: $DAOS_HTTPS_PROXY" + https_proxy = env.DAOS_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 DAOS_HTTPS_PROXY variable in Docker build arguments" + } } if (config['qb']) {