From 64ac4722eb919de81d80bc55aa25a01203078ed5 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 15 Apr 2026 20:14:01 +0000 Subject: [PATCH 1/7] SRE-3737 ci: allows custom source for gem install Priority: 2 Skip-unit-tests:true Skip-unit-test: true Skip-NLT: true Skip-unit-test-memcheck: true Skip-func-vm: true Skip-func-hw-test: true Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 16 ++++++++++++++- utils/scripts/helpers/repo-helper-el9.sh | 16 ++++++++++++++- utils/scripts/helpers/repo-helper-leap15.sh | 22 ++++++++++++++++++++- utils/scripts/helpers/repo-helper-ubuntu.sh | 9 ++++++++- 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index 28b2e7f01a3..411954154e8 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright 2022-2023 Intel Corporation. +# Copyright 2025-2026 Hewlett Packard Enterprise Development LP +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + set -uex # This script is used by dockerfiles to optionally use @@ -126,10 +133,11 @@ done disable_repos /etc/yum.repos.d/ "${save_repos[@]}" -# Setup the PyPi to use the artifactory as the installation packages source if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ + +# Setup the PyPi to use the artifactory as the installation packages source cat < /etc/pip.conf [global] trusted-host = ${trusted_host} @@ -138,4 +146,10 @@ if [ -n "$REPO_FILE_URL" ]; then no_color = true quiet = 1 EOF + +# Setup RubyGems to use artifactory as the installation source. + cat < /etc/gemrc +:sources: +- https://${trusted_host}/artifactory/api/gems/rubygems-proxy/ +EOF fi diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index ece81cf786f..17926815b9b 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright 2023 Intel Corporation. +# Copyright 2025-2026 Hewlett Packard Enterprise Development LP +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + set -uex # This script is used by dockerfiles to optionally use @@ -122,10 +129,11 @@ done disable_repos /etc/yum.repos.d/ "${save_repos[@]}" -# Setup the PyPi to use the artifactory as the installation packages source if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ + +# Setup the PyPi to use the artifactory as the installation packages source cat < /etc/pip.conf [global] trusted-host = ${trusted_host} @@ -134,4 +142,10 @@ if [ -n "$REPO_FILE_URL" ]; then no_color = true quiet = 1 EOF + +# Setup RubyGems to use artifactory as the installation source. + cat < /etc/gemrc +:sources: +- https://${trusted_host}/artifactory/api/gems/rubygems-proxy/ +EOF fi diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index bacae8b2698..8b026b4571b 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -1,4 +1,9 @@ #!/bin/bash +# Copyright 2022-2023 Intel Corporation. +# Copyright 2024-2026 Hewlett Packard Enterprise Development LP +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# set -uex # This script is used by dockerfiles to optionally use @@ -170,10 +175,11 @@ fi # run here. Running this command just makes sure things work. update-ca-certificates -# Setup the PyPi to use the artifactory as the installation packages source if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ + +# Setup the PyPi to use the artifactory as the installation packages source cat < /etc/pip.conf [global] trusted-host = ${trusted_host} @@ -182,4 +188,18 @@ if [ -n "$REPO_FILE_URL" ]; then no_color = true quiet = 1 EOF + +# Setup RubyGems to use artifactory as the primary installation source. +# Prior to setup, it is essential to ensure that Ruby-Dev is installed. +# Failure to comply with this procedure will result +# in the manual /etc/gemrc file being overridden. + dnf --nodocs install ruby-devel + if [ ! -f /etc/gemrc ]; then + echo ":sources:" > /etc/gemrc + elif ! grep -q '^:sources:$' /etc/gemrc; then + echo ":sources:" >> /etc/gemrc + fi + sed -i "/^:sources:$/a- https://${trusted_host}/artifactory/api/gems/rubygems-proxy/" \ + /etc/gemrc + gem env fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index 54fd74b669c..9c4eb8aaa06 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -107,10 +107,11 @@ if [ -e /tmp/install.sh ]; then fi apt-get clean all -# Setup the PyPi to use the artifactory as the installation packages source if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ + +# Setup the PyPi to use the artifactory as the installation packages source cat < /etc/pip.conf [global] trusted-host = ${trusted_host} @@ -119,4 +120,10 @@ if [ -n "$REPO_FILE_URL" ]; then no_color = true quiet = 1 EOF + +# Setup RubyGems to use artifactory as the installation source. + cat < /etc/gemrc +:sources: +- https://${trusted_host}/artifactory/api/gems/rubygems-proxy/ +EOF fi From 1d7178407a08b8ebe63abc077e8dbdc25adf7f8f Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 16 Apr 2026 05:32:48 +0000 Subject: [PATCH 2/7] Custom library Cancel-prev-build: false Priority: 2 Skip-unit-tests:true Skip-unit-test: true Skip-NLT: true Skip-unit-test-memcheck: true Skip-func-test-el9: true Skip-func-hw-test: true Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index f586e6897a1..87176619dee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,6 +19,7 @@ // To use a test branch (i.e. PR) until it lands to master // I.e. for testing library changes //@Library(value='pipeline-lib@your_branch') _ +@Library(value='pipeline-lib@grom72/SRE-3737') _ /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:] From 0a864ee7f918729828246a819c6ab1a5116072b0 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 21 Apr 2026 22:56:07 +0200 Subject: [PATCH 3/7] Formating issues fixing Doc-only: true Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 1 - utils/scripts/helpers/repo-helper-el9.sh | 1 - utils/scripts/helpers/repo-helper-leap15.sh | 1 + utils/scripts/helpers/repo-helper-ubuntu.sh | 5 +++++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index 411954154e8..64b37198550 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -5,7 +5,6 @@ # # SPDX-License-Identifier: BSD-2-Clause-Patent # - set -uex # This script is used by dockerfiles to optionally use diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index 17926815b9b..2b3cc8e810c 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -5,7 +5,6 @@ # # SPDX-License-Identifier: BSD-2-Clause-Patent # - set -uex # This script is used by dockerfiles to optionally use diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 8b026b4571b..c679f99bf2d 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -1,4 +1,5 @@ #!/bin/bash +# # Copyright 2022-2023 Intel Corporation. # Copyright 2024-2026 Hewlett Packard Enterprise Development LP # diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index 9c4eb8aaa06..262616a5241 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -1,4 +1,9 @@ #!/bin/bash +# +# Copyright 2025-2026 Hewlett Packard Enterprise Development LP +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# set -uex # This script is used by dockerfiles to optionally use From 27fba7f4c0daa78f5786e5b04a7aaec9c8aba91b Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 22 Apr 2026 09:54:47 +0200 Subject: [PATCH 4/7] Fix: obsolete space at the end of the line Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-leap15.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index c679f99bf2d..700839f1517 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -192,7 +192,7 @@ EOF # Setup RubyGems to use artifactory as the primary installation source. # Prior to setup, it is essential to ensure that Ruby-Dev is installed. -# Failure to comply with this procedure will result +# Failure to comply with this procedure will result # in the manual /etc/gemrc file being overridden. dnf --nodocs install ruby-devel if [ ! -f /etc/gemrc ]; then From 93033bce2b333a5183a841aff131459d365c465c Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 22 Apr 2026 09:56:07 +0200 Subject: [PATCH 5/7] Revert "Custom library" This reverts commit 1d7178407a08b8ebe63abc077e8dbdc25adf7f8f. Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index be6f608a3b9..bc8ab3c4116 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,6 @@ // To use a test branch (i.e. PR) until it lands to master // I.e. for testing library changes //@Library(value='pipeline-lib@your_branch') _ -@Library(value='pipeline-lib@grom72/SRE-3737') _ /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:] From 010a362c13cd90ae0afb04b31ac39f091abc3da4 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 22 Apr 2026 09:57:27 +0200 Subject: [PATCH 6/7] Custom library to disable proxy setting for FI Docker image for fault injection testing shall be build without access to internet, that means neither https_proxy nor no_proxy variables shall be provided as docker build parameters. Signed-off-by: Tomasz Gromadzki Cancel-prev-build: false Priority: 2 Skip-unit-tests:true Skip-unit-test: true Skip-NLT: true Skip-unit-test-memcheck: true Skip-func-test-el9: true Skip-func-hw-test: true Skip-test-el-9-rpms: true Skip-test-leap-15-rpms: true --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc8ab3c4116..0779565848b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,8 @@ // To use a test branch (i.e. PR) until it lands to master // I.e. for testing library changes //@Library(value='pipeline-lib@your_branch') _ - +@Library(value='pipeline-lib@grom72/SRE-3737-no-proxy-for-Fault-Injection-testing') _ + /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:] From c16241f68b0839285e4311d661cd32b369cac780 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 22 Apr 2026 13:35:30 +0200 Subject: [PATCH 7/7] Revert "Custom library to disable proxy setting for FI" This reverts commit 010a362c13cd90ae0afb04b31ac39f091abc3da4. Signed-off-by: Tomasz Gromadzki Cancel-prev-build: false Priority: 2 Skip-unit-tests:true Skip-unit-test: true Skip-NLT: true Skip-unit-test-memcheck: true Skip-func-test-el9: true Skip-func-hw-test: true Skip-test-el-9-rpms: true Skip-test-leap-15-rpms: true --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0779565848b..bc8ab3c4116 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,8 +19,7 @@ // To use a test branch (i.e. PR) until it lands to master // I.e. for testing library changes //@Library(value='pipeline-lib@your_branch') _ -@Library(value='pipeline-lib@grom72/SRE-3737-no-proxy-for-Fault-Injection-testing') _ - + /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:]