Skip to content

SRE-3737 ci: HOT FIX - remove proxy related settings for Fault Injection testing stage #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phender merged 1 commit into from
Apr 23, 2026
+16 −14
Merged

SRE-3737 ci: HOT FIX - remove proxy related settings for Fault Injection testing stage #508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 16 additions & 14 deletions vars/dockerBuildArgs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))) {

@phender phender Apr 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use an argument passed to dockerBuildArgs instead of triggering action based upon stage names.

@JohnMalmberg JohnMalmberg Apr 22, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is going be a phased approach, with the first just to get things working again, then the next to to work on a plan starting with documenting how external resources should be accessed in a portable and maintainable manner.

The first option to look for is if there is a Artifact server to be used, and we need to make the use of Artifactory or Nexus to be transparent. Which means we also need to have that set up for proxy mirroring. This gives the best performance and reliability for our lab.

It needs to be optional so that the code will work outside of our lab. And the code exposed to the user should hide if Artifactory or Nexus is used. This will a bit of planning and refactoring to roll in correctly.

Next option is that the code should be looking for a proxy is configured to be used, and that gets more complicated because the "noproxy" environment variable is unreliable to use. This is an option to support smaller volume shops.

For both these options we want to look for global configuration files that can be configured early in the script or node setup. Use of proxy environment variables should be avoided in production if at all possible because they have too broad of scope, and "noproxy" may not be sufficient to work around that issue. On a desktop system we can have a script look up the proxy server to do this configuration portably because that is how the proxy for a web browser is typically configure. Unknown if this discovery would work in the lab.

And then the final case where there are known specific proxy or artifact server used, such as a GitHub hosted runner, then we fall back to assuming direct access to the public Internet.

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']) {
Expand Down