From 3f2bc85cd72eda55e76eaa89373705ddd1e2324e Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 10 Jun 2025 16:44:09 +0200 Subject: [PATCH 01/14] SRE-3104 ci: Use DAOS specific HTTPS_PROXY variable The HTTPS_PROXY variable set in Jenkins may force any shell script to use a proxy server. This is not expected, as we want to avoid using a proxy unless it is explicitly needed by the DAOS tests or the build process. Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 883c6df07..cb3fdfb4e 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -1,5 +1,9 @@ /* groovylint-disable DuplicateStringLiteral, VariableName */ // vars/dockerBuildArgs.groovy +/* + * Copyright (C) 2020-2024 Intel Corporation + * Copyright (C) 2025 Hewlett Packard Enterprise Development LP + */ Integer num_proc() { return sh(label: 'Get number of processors online', @@ -55,12 +59,22 @@ String call(Map config = [:]) { } // pass through env. var.s - ['DAOS_LAB_CA_FILE_URL', 'REPO_FILE_URL', 'HTTP_PROXY', 'HTTPS_PROXY'].each { var -> + ['DAOS_LAB_CA_FILE_URL', 'REPO_FILE_URL', 'HTTP_PROXY'].each { var -> if (env."$var") { ret_str += ' --build-arg ' + var + '="' + env."$var" + '"' } } + String https_proxy = '' + if (env.DAOS_HTTPS_PROXY) { + https_proxy = "${env.DAOS_HTTPS_PROXY}" + } else if (env.HTTPS_PROXY) { + https_proxy = "${env.HTTPS_PROXY}" + } + if (https_proxy) { + ret_str += ' --build-arg HTTPS_PROXY' + '="' + https_proxy + '"' + } + if (config['qb']) { ret_str += ' --build-arg QUICKBUILD=true --build-arg DAOS_DEPS_BUILD=no' } else { From 51c056c6addc760b49da65ebed52e87e034b1bdc Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 07:56:46 +0200 Subject: [PATCH 02/14] Temporary add debug info Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index cb3fdfb4e..378157e50 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -65,6 +65,19 @@ String call(Map config = [:]) { } } +/* For DEBUG purpose only */ + if (env.HTTPS_PROXY) { + println ('env.HTTPS_PROXY = ' + env.HTTPS_PROXY) + } else { + println ('env.HTTPS_PROXY = NULL') + } +/* For DEBUG purpose only */ + if (env.DAOS_HTTPS_PROXY) { + println ('env.DAOS_HTTPS_PROXY = ' + env.DAOS_HTTPS_PROXY) + } else { + println ('env.DAOS_HTTPS_PROXY = NULL') + } + String https_proxy = '' if (env.DAOS_HTTPS_PROXY) { https_proxy = "${env.DAOS_HTTPS_PROXY}" From a4b21291ab4b19ea2fe563365aed5807c472c7d3 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 08:32:35 +0200 Subject: [PATCH 03/14] Pass HTTPS_PROXY explicitly to the build script. Signed-off-by: Tomasz Gromadzki --- vars/buildRpm.groovy | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/vars/buildRpm.groovy b/vars/buildRpm.groovy index 80370abd9..4b6f25bdb 100755 --- a/vars/buildRpm.groovy +++ b/vars/buildRpm.groovy @@ -1,5 +1,9 @@ /* groovylint-disable DuplicateStringLiteral, VariableName */ // vars/buildRpm.groovy +/* + * Copyright (C) 2020-2024 Intel Corporation + * Copyright (C) 2025 Hewlett Packard Enterprise Development LP + */ /** * buildRpm step method @@ -60,6 +64,14 @@ Map call(Map config = [:]) { env_vars = ' CHROOT_NAME=' + config['chroot_name'] } + String https_proxy = '' + if (env.DAOS_HTTPS_PROXY) { + https_proxy = "${env.DAOS_HTTPS_PROXY}" + } else if (env.HTTPS_PROXY) { + https_proxy = "${env.HTTPS_PROXY}" + } + env_vars += ' HTTPS_PROXY=' + https_proxy + String error_stage_result = 'FAILURE' String error_build_result = 'FAILURE' if (config['unstable']) { From cb1502766d8236a8873434a3b984b782a94bfb6a Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 10:44:00 +0200 Subject: [PATCH 04/14] Custom library for testing Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4c66c7298..491a38a37 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,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-3104') _ /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:] From e1fd1258cef678d0859fd5512ebf9fd63b48795e Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 11:30:20 +0200 Subject: [PATCH 05/14] Pass HTTPS_PROXY to post_provision_config.sh Pass HTTPS_PROXY to docekr build command Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 3 ++- vars/dockerBuildArgs.groovy | 1 - vars/provisionNodes.groovy | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 491a38a37..e287e5f8b 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -230,6 +230,7 @@ pipeline { dockerfile { filename 'docker/Dockerfile.el.8' label 'docker_runner' + additionalBuildArgs dockerBuildArgs() } } steps { @@ -269,7 +270,7 @@ pipeline { dockerfile { filename 'docker/Dockerfile.el.8' label 'docker_runner' - additionalBuildArgs dockerBuildArgs(cachebust: false, add_repos: false) + additionalBuildArgs dockerBuildArgs(cachebust: false) } } steps { diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 378157e50..9a20a1a03 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -35,7 +35,6 @@ Integer num_proc() { String call(Map config = [:]) { Boolean cachebust = config.get('cachebust', true) - Boolean add_repos = config.get('add_repos', true) Boolean deps_build = config.get('deps_build', false) Boolean parallel_build = config.get('parallel_build', false) diff --git a/vars/provisionNodes.groovy b/vars/provisionNodes.groovy index f8d9ef6b9..9466e355c 100644 --- a/vars/provisionNodes.groovy +++ b/vars/provisionNodes.groovy @@ -164,6 +164,7 @@ Map call(Map config = [:]) { // https://issues.jenkins.io/browse/JENKINS-55819 'CI_RPM_TEST_VERSION="' + (params.CI_RPM_TEST_VERSION ?: '') + '" ' + 'CI_PR_REPOS="' + (params.CI_PR_REPOS ?: '') + '" ' + + 'HTTPS_PROXY="' + env.DAOS_HTTPS_PROXY + '" ' + 'ci/provisioning/post_provision_config.sh' new_config['post_restore'] = provision_script try { From f4e2615ead31f25efa9f493a0a75cb4ccd9a3501 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 11:42:54 +0200 Subject: [PATCH 06/14] pip3 install requires proxy to access internet Signed-off-by: Tomasz Gromadzki --- vars/functionalTest.groovy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vars/functionalTest.groovy b/vars/functionalTest.groovy index 78e221983..1b6fffb91 100755 --- a/vars/functionalTest.groovy +++ b/vars/functionalTest.groovy @@ -1,5 +1,9 @@ /* groovylint-disable VariableName */ // vars/functionalTest.groovy +/* + * Copyright (C) 2020-2024 Intel Corporation + * Copyright (C) 2025 Hewlett Packard Enterprise Development LP + */ /** * functionalTest step method @@ -110,8 +114,8 @@ Map call(Map config = [:]) { run_test_config['context'] = context run_test_config['description'] = description - sh label: 'Install Launchable', - script: '''if ! pip3 install --upgrade --upgrade-strategy only-if-needed launchable; then + String script = "HTTPS_PROXY=" +'"' + env.DAOS_HTTPS_PROXY + '"; ' + script += '''if ! pip3 install --upgrade --upgrade-strategy only-if-needed launchable; then set +e echo "Failed to install launchable" id @@ -125,6 +129,8 @@ Map call(Map config = [:]) { fi pip3 list --user || true ''' + sh label: 'Install Launchable', + script: script try { withCredentials([string(credentialsId: 'launchable-test', variable: 'LAUNCHABLE_TOKEN')]) { From 9a9ca512628e4a3b77e133687a0d9bdae31fd7c0 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 13:40:33 +0200 Subject: [PATCH 07/14] pip3 install requires explicity pass proxy parameter Signed-off-by: Tomasz Gromadzki --- vars/functionalTest.groovy | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vars/functionalTest.groovy b/vars/functionalTest.groovy index 1b6fffb91..6e16becd1 100755 --- a/vars/functionalTest.groovy +++ b/vars/functionalTest.groovy @@ -114,8 +114,11 @@ Map call(Map config = [:]) { run_test_config['context'] = context run_test_config['description'] = description - String script = "HTTPS_PROXY=" +'"' + env.DAOS_HTTPS_PROXY + '"; ' - script += '''if ! pip3 install --upgrade --upgrade-strategy only-if-needed launchable; then + String script = '''if ! pip3 install''' + if (env.DAOS_HTTPS_PROXY) { + script += ' --proxy "' + env.DAOS_HTTPS_PROXY + '"' + } + script += ''' --upgrade --upgrade-strategy only-if-needed launchable; then set +e echo "Failed to install launchable" id From 453b7b16fefa51c665b62043f473aace57bbb809 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 15:58:42 +0200 Subject: [PATCH 08/14] pip3 install requires explicity pass proxy parameter 2nd Signed-off-by: Tomasz Gromadzki --- vars/functionalTestPostV2.groovy | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vars/functionalTestPostV2.groovy b/vars/functionalTestPostV2.groovy index 0ee061542..5cbfb572e 100755 --- a/vars/functionalTestPostV2.groovy +++ b/vars/functionalTestPostV2.groovy @@ -98,8 +98,15 @@ void call(Map config = [:]) { script: 'ci/functional/launchable_analysis "' + fileName + '"') } + String script = 'if pip3 install' + if (env.DAOS_HTTPS_PROXY) { + script += ' --proxy "' + env.DAOS_HTTPS_PROXY + '"' + } + script += ' --user --upgrade launchable~=1.0' + + sh(label: 'Install Launchable', - script: 'pip3 install --user --upgrade launchable~=1.0') + script: script) try { withCredentials([string(credentialsId: 'launchable-test', variable: 'LAUNCHABLE_TOKEN')]) { From 4650205867290da30f1fa14a050abacf714021b7 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 16:23:03 +0200 Subject: [PATCH 09/14] Remove (C) from copyright text Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 3 ++- vars/buildRpm.groovy | 4 ++-- vars/dockerBuildArgs.groovy | 4 ++-- vars/functionalTest.groovy | 6 +++--- vars/packageBuildingPipeline.groovy | 2 +- vars/packageBuildingPipelineDAOS.groovy | 2 +- vars/packageBuildingPipelineDAOSTest.groovy | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e287e5f8b..a638fe768 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,8 @@ #!/usr/bin/env groovy /* groovylint-disable DuplicateListLiteral, DuplicateMapLiteral, DuplicateNumberLiteral */ // groovylint-disable DuplicateStringLiteral, NestedBlockDepth, VariableName -/* Copyright (C) 2019-2023 Intel Corporation +/* Copyright 2019-2024 Intel Corporation + * Copyright 2025 Hewlett Packard Enterprise Development LP * All rights reserved. * * This file is part of the DAOS Project. It is subject to the license terms diff --git a/vars/buildRpm.groovy b/vars/buildRpm.groovy index 4b6f25bdb..d91125943 100755 --- a/vars/buildRpm.groovy +++ b/vars/buildRpm.groovy @@ -1,8 +1,8 @@ /* groovylint-disable DuplicateStringLiteral, VariableName */ // vars/buildRpm.groovy /* - * Copyright (C) 2020-2024 Intel Corporation - * Copyright (C) 2025 Hewlett Packard Enterprise Development LP + * Copyright 2020-2024 Intel Corporation + * Copyright 2025 Hewlett Packard Enterprise Development LP */ /** diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 9a20a1a03..6b570760b 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -1,8 +1,8 @@ /* groovylint-disable DuplicateStringLiteral, VariableName */ // vars/dockerBuildArgs.groovy /* - * Copyright (C) 2020-2024 Intel Corporation - * Copyright (C) 2025 Hewlett Packard Enterprise Development LP + * Copyright 2020-2024 Intel Corporation + * Copyright 2025 Hewlett Packard Enterprise Development LP */ Integer num_proc() { diff --git a/vars/functionalTest.groovy b/vars/functionalTest.groovy index 6e16becd1..1ccef556c 100755 --- a/vars/functionalTest.groovy +++ b/vars/functionalTest.groovy @@ -1,8 +1,8 @@ /* groovylint-disable VariableName */ // vars/functionalTest.groovy /* - * Copyright (C) 2020-2024 Intel Corporation - * Copyright (C) 2025 Hewlett Packard Enterprise Development LP + * Copyright 2020-2024 Intel Corporation + * Copyright 2025 Hewlett Packard Enterprise Development LP */ /** @@ -114,7 +114,7 @@ Map call(Map config = [:]) { run_test_config['context'] = context run_test_config['description'] = description - String script = '''if ! pip3 install''' + String script = 'if ! pip3 install' if (env.DAOS_HTTPS_PROXY) { script += ' --proxy "' + env.DAOS_HTTPS_PROXY + '"' } diff --git a/vars/packageBuildingPipeline.groovy b/vars/packageBuildingPipeline.groovy index 28ca90140..09c3f841e 100644 --- a/vars/packageBuildingPipeline.groovy +++ b/vars/packageBuildingPipeline.groovy @@ -1,6 +1,6 @@ #!/usr/bin/groovy /* groovylint-disable DuplicateMapLiteral, DuplicateStringLiteral, NestedBlockDepth */ -/* Copyright (C) 2019-2023 Intel Corporation +/* Copyright 2019-2023 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/vars/packageBuildingPipelineDAOS.groovy b/vars/packageBuildingPipelineDAOS.groovy index 3353f6d86..353ba420b 100644 --- a/vars/packageBuildingPipelineDAOS.groovy +++ b/vars/packageBuildingPipelineDAOS.groovy @@ -1,6 +1,6 @@ #!/usr/bin/groovy /* groovylint-disable DuplicateMapLiteral, DuplicateStringLiteral, NestedBlockDepth, VariableName */ -/* Copyright (C) 2019-2023 Intel Corporation +/* Copyright 2019-2023 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/vars/packageBuildingPipelineDAOSTest.groovy b/vars/packageBuildingPipelineDAOSTest.groovy index 1842b8fac..a732db4de 100644 --- a/vars/packageBuildingPipelineDAOSTest.groovy +++ b/vars/packageBuildingPipelineDAOSTest.groovy @@ -1,7 +1,7 @@ #!/usr/bin/groovy /* groovylint-disable DuplicateMapLiteral, DuplicateStringLiteral, NestedBlockDepth, VariableName */ -/* Copyright (C) 2019-2024 Intel Corporation - * Copyright (C) 2025 Hewlett Packard Enterprise Development LP +/* Copyright 2019-2024 Intel Corporation + * Copyright 2025 Hewlett Packard Enterprise Development LP * All rights reserved. * * Redistribution and use in source and binary forms, with or without From 4188340ee25081c262559c412775239dd586fc10 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 16:25:24 +0200 Subject: [PATCH 10/14] Fix copyright text Signed-off-by: Tomasz Gromadzki --- vars/provisionNodes.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/provisionNodes.groovy b/vars/provisionNodes.groovy index 9466e355c..9a7534dd1 100644 --- a/vars/provisionNodes.groovy +++ b/vars/provisionNodes.groovy @@ -1,5 +1,9 @@ /* groovylint-disable DuplicateNumberLiteral, DuplicateStringLiteral, VariableName */ // vars/provisionNodes.groovy +/* + * Copyright 2020-2024 Intel Corporation + * Copyright 2025 Hewlett Packard Enterprise Development LP + */ /** * provisionNodes.groovy From 2173fada911d7aef514b62c12daaf37d8c06741c Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 20:29:35 +0200 Subject: [PATCH 11/14] Remove debug code Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 6b570760b..37677cd6a 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -64,19 +64,6 @@ String call(Map config = [:]) { } } -/* For DEBUG purpose only */ - if (env.HTTPS_PROXY) { - println ('env.HTTPS_PROXY = ' + env.HTTPS_PROXY) - } else { - println ('env.HTTPS_PROXY = NULL') - } -/* For DEBUG purpose only */ - if (env.DAOS_HTTPS_PROXY) { - println ('env.DAOS_HTTPS_PROXY = ' + env.DAOS_HTTPS_PROXY) - } else { - println ('env.DAOS_HTTPS_PROXY = NULL') - } - String https_proxy = '' if (env.DAOS_HTTPS_PROXY) { https_proxy = "${env.DAOS_HTTPS_PROXY}" From 6df7f786b1e6bf7b39a2b38a09852141d2eebea7 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Jun 2025 20:36:45 +0200 Subject: [PATCH 12/14] Unify the solution and maintain backward compatibility Signed-off-by: Tomasz Gromadzki --- vars/buildRpm.groovy | 4 +++- vars/functionalTest.groovy | 10 ++++++++-- vars/functionalTestPostV2.groovy | 10 ++++++++-- vars/provisionNodes.groovy | 8 +++++++- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/vars/buildRpm.groovy b/vars/buildRpm.groovy index d91125943..fbf8e0d2b 100755 --- a/vars/buildRpm.groovy +++ b/vars/buildRpm.groovy @@ -70,7 +70,9 @@ Map call(Map config = [:]) { } else if (env.HTTPS_PROXY) { https_proxy = "${env.HTTPS_PROXY}" } - env_vars += ' HTTPS_PROXY=' + https_proxy + if (https_proxy) { + env_vars += ' HTTPS_PROXY=' + https_proxy + } String error_stage_result = 'FAILURE' String error_build_result = 'FAILURE' diff --git a/vars/functionalTest.groovy b/vars/functionalTest.groovy index 1ccef556c..09f9689ee 100755 --- a/vars/functionalTest.groovy +++ b/vars/functionalTest.groovy @@ -114,9 +114,15 @@ Map call(Map config = [:]) { run_test_config['context'] = context run_test_config['description'] = description - String script = 'if ! pip3 install' + String https_proxy = '' if (env.DAOS_HTTPS_PROXY) { - script += ' --proxy "' + 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 diff --git a/vars/functionalTestPostV2.groovy b/vars/functionalTestPostV2.groovy index 5cbfb572e..c26b9e10f 100755 --- a/vars/functionalTestPostV2.groovy +++ b/vars/functionalTestPostV2.groovy @@ -98,9 +98,15 @@ void call(Map config = [:]) { script: 'ci/functional/launchable_analysis "' + fileName + '"') } - String script = 'if pip3 install' + String https_proxy = '' if (env.DAOS_HTTPS_PROXY) { - script += ' --proxy "' + 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 += ' --user --upgrade launchable~=1.0' diff --git a/vars/provisionNodes.groovy b/vars/provisionNodes.groovy index 9a7534dd1..eb213d483 100644 --- a/vars/provisionNodes.groovy +++ b/vars/provisionNodes.groovy @@ -159,6 +159,12 @@ Map call(Map config = [:]) { default: error "Unsupported distro type: ${distro_type}/distro: ${distro}" } + String https_proxy = '' + if (env.DAOS_HTTPS_PROXY) { + https_proxy = "${env.DAOS_HTTPS_PROXY}" + } else if (env.HTTPS_PROXY) { + https_proxy = "${env.HTTPS_PROXY}" + } provision_script += ' ' + 'NODESTRING=' + nodeString + ' ' + 'CONFIG_POWER_ONLY=' + config_power_only + ' ' + @@ -168,7 +174,7 @@ Map call(Map config = [:]) { // https://issues.jenkins.io/browse/JENKINS-55819 'CI_RPM_TEST_VERSION="' + (params.CI_RPM_TEST_VERSION ?: '') + '" ' + 'CI_PR_REPOS="' + (params.CI_PR_REPOS ?: '') + '" ' + - 'HTTPS_PROXY="' + env.DAOS_HTTPS_PROXY + '" ' + + 'HTTPS_PROXY="' + https_proxy + '" ' + 'ci/provisioning/post_provision_config.sh' new_config['post_restore'] = provision_script try { From b37fd6fc14a64668a2111e70ff7ea1205f0aa3ed Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 12 Jun 2025 08:23:42 +0200 Subject: [PATCH 13/14] Fix - remove unnecessary Signed-off-by: Tomasz Gromadzki --- vars/dockerBuildArgs.groovy | 4 ++-- vars/functionalTestPostV2.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 37677cd6a..5186198a8 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -66,9 +66,9 @@ String call(Map config = [:]) { String https_proxy = '' if (env.DAOS_HTTPS_PROXY) { - https_proxy = "${env.DAOS_HTTPS_PROXY}" + https_proxy = env.DAOS_HTTPS_PROXY } else if (env.HTTPS_PROXY) { - https_proxy = "${env.HTTPS_PROXY}" + https_proxy = env.HTTPS_PROXY } if (https_proxy) { ret_str += ' --build-arg HTTPS_PROXY' + '="' + https_proxy + '"' diff --git a/vars/functionalTestPostV2.groovy b/vars/functionalTestPostV2.groovy index c26b9e10f..42369091d 100755 --- a/vars/functionalTestPostV2.groovy +++ b/vars/functionalTestPostV2.groovy @@ -104,7 +104,7 @@ void call(Map config = [:]) { } else if (env.HTTPS_PROXY) { https_proxy = "${env.HTTPS_PROXY}" } - String script = 'if pip3 install' + String script = 'pip3 install' if (https_proxy) { script += ' --proxy "' + https_proxy + '"' } From 722fa21b11b6b1b90c3228482605bb4e4044160e Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 13 Jun 2025 08:35:52 +0200 Subject: [PATCH 14/14] Remove test library Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a638fe768..641ad6141 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,6 @@ // 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-3104') _ /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:]