From bc76c01f0a347bc5715e69e888c8b3d803bbf2f1 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 22:01:56 +0200 Subject: [PATCH 1/6] sre-2257 - introduce no_proxy support for Dockers Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 5186198a8..b6c6d3928 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -64,6 +64,13 @@ String call(Map config = [:]) { } } + if (env.REPO_FILE_URL) { + def url = new URL(env.REPO_FILE_URL) + def no_proxy = url.getHost() + println "no_proxy: $no_proxy" + ret_str += ' --build-arg no_proxy' + '="' + no_proxy + '"' + } + String https_proxy = '' if (env.DAOS_HTTPS_PROXY) { https_proxy = env.DAOS_HTTPS_PROXY From 99e8796bc18fee57884772d7c5efdc65aed89ec3 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 00:53:55 +0200 Subject: [PATCH 2/6] DAOS_NO_PROXY instead of NO_PROXY Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index b6c6d3928..043bb6e0b 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -65,10 +65,10 @@ String call(Map config = [:]) { } if (env.REPO_FILE_URL) { - def url = new URL(env.REPO_FILE_URL) - def no_proxy = url.getHost() - println "no_proxy: $no_proxy" - ret_str += ' --build-arg no_proxy' + '="' + no_proxy + '"' + def url = env.REPO_FILE_URL + def DAOS_NO_PROXY = url.replaceFirst(/^https?:\/\//, '').split('/')[0].split(':')[0] + println "DAOS_NO_PROXY: $DAOS_NO_PROXY" + ret_str += ' --build-arg DAOS_NO_PROXY' + '="' + DAOS_NO_PROXY + '"' } String https_proxy = '' From 890c5f025a2fa14e7b3f8b9fab868cc8c658c5d2 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 10:35:14 +0200 Subject: [PATCH 3/6] Remove --proxy from all pip install Signed-off-by: Tomasz Gromadzki --- vars/functionalTest.groovy | 9 --------- vars/functionalTestPostV2.groovy | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/vars/functionalTest.groovy b/vars/functionalTest.groovy index 09f9689ee..aa7b949d3 100755 --- a/vars/functionalTest.groovy +++ b/vars/functionalTest.groovy @@ -114,16 +114,7 @@ Map call(Map config = [:]) { run_test_config['context'] = context run_test_config['description'] = description - String https_proxy = '' - if (env.DAOS_HTTPS_PROXY) { - https_proxy = "${env.DAOS_HTTPS_PROXY}" - } else if (env.HTTPS_PROXY) { - https_proxy = "${env.HTTPS_PROXY}" - } String script = 'if ! pip3 install' - if (https_proxy) { - script += ' --proxy "' + https_proxy + '"' - } script += ''' --upgrade --upgrade-strategy only-if-needed launchable; then set +e echo "Failed to install launchable" diff --git a/vars/functionalTestPostV2.groovy b/vars/functionalTestPostV2.groovy index 42369091d..1b395517e 100755 --- a/vars/functionalTestPostV2.groovy +++ b/vars/functionalTestPostV2.groovy @@ -98,19 +98,9 @@ void call(Map config = [:]) { script: 'ci/functional/launchable_analysis "' + fileName + '"') } - String https_proxy = '' - if (env.DAOS_HTTPS_PROXY) { - https_proxy = "${env.DAOS_HTTPS_PROXY}" - } else if (env.HTTPS_PROXY) { - https_proxy = "${env.HTTPS_PROXY}" - } String script = 'pip3 install' - if (https_proxy) { - script += ' --proxy "' + https_proxy + '"' - } script += ' --user --upgrade launchable~=1.0' - sh(label: 'Install Launchable', script: script) From 87cc1e59986ef5036f96cbf78a986e92b5496485 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 14:17:28 +0200 Subject: [PATCH 4/6] Disable tests until SRE-3161 is fixed https://daosio.atlassian.net/browse/SRE-3161 is fixed Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 641ad6141..3cbddef06 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -224,7 +224,9 @@ pipeline { stage('publishToRepository RPM tests') { when { beforeAgent true - expression { env.NO_CI_TESTING != 'true' } + /* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed + expression { env.NO_CI_TESTING != 'true' } */ + expression { false } } agent { dockerfile { @@ -264,7 +266,9 @@ pipeline { stage('publishToRepository DEB tests') { when { beforeAgent true - expression { env.NO_CI_TESTING != 'true' } + /* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed + expression { env.NO_CI_TESTING != 'true' } */ + expression { false } } agent { dockerfile { From d80c98353bdf1c69c751baf1e94d87f8dc1323ec Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 14:26:42 +0200 Subject: [PATCH 5/6] Disable tests until SRE-3162 is fixed https://daosio.atlassian.net/browse/SRE-3162 is fixed Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 3cbddef06..434f3be33 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -308,11 +308,14 @@ pipeline { stage('provisionNodes on EL 9 with master Repo') { when { beforeAgent true + /* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed expression { env.NO_CI_TESTING != 'true' && cachedCommitPragma('Skip-el9-provisioning-test') != 'true' && daosLatestVersion('master') != '' } + */ + expression { false } } agent { label 'ci_vm1' @@ -351,10 +354,13 @@ pipeline { stage('provisionNodes on EL 8 with slurm') { when { beforeAgent true + /* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed expression { env.NO_CI_TESTING != 'true' && daosLatestVersion('master') != '' } + */ + expression { false } } agent { label 'ci_vm1' @@ -383,10 +389,13 @@ pipeline { stage('provisionNodes on Leap 15 with slurm') { when { beforeAgent true + /* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed expression { env.NO_CI_TESTING != 'true' && daosLatestVersion('master') != '' } + */ + expression { false } } agent { label 'ci_vm1' From e6801a0c5f5da42cb7e50794071a1e4cf7bb2991 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 30 Jun 2025 11:36:58 +0200 Subject: [PATCH 6/6] Use dedicated Jenkins variable for no_proxy Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 043bb6e0b..02ab45190 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -64,11 +64,9 @@ String call(Map config = [:]) { } } - if (env.REPO_FILE_URL) { - def url = env.REPO_FILE_URL - def DAOS_NO_PROXY = url.replaceFirst(/^https?:\/\//, '').split('/')[0].split(':')[0] + if (env.DAOS_NO_PROXY) { println "DAOS_NO_PROXY: $DAOS_NO_PROXY" - ret_str += ' --build-arg DAOS_NO_PROXY' + '="' + DAOS_NO_PROXY + '"' + ret_str += ' --build-arg DAOS_NO_PROXY' + '="' + env.DAOS_NO_PROXY + '"' } String https_proxy = ''