From 4710c0d7e136bf6fe57531429237e35d56a7f6db Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 08:13:47 +0200 Subject: [PATCH 01/35] SRE-2257 ci: Use Artifactory for PyPi Skip-func-test: true Skip-test: true Skip-unit-tests: true Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 8 ++++++++ utils/docker/Dockerfile.el.9 | 8 ++++++++ utils/docker/Dockerfile.leap.15 | 8 ++++++++ utils/docker/Dockerfile.ubuntu | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 1708cc1269d..0f56c7c35dc 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -61,6 +61,14 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ ARG JENKINS_URL +# Setup the PyPi to use the artifactory as the installation packages source +RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ + trusted_host="${trusted_host%%/*}"; \ + echo "$trusted_host"; \ + echo "[global]" > /etc/pip.conf; \ + echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; + USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index d8fbabab02d..8b015572f7f 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -53,6 +53,14 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent +# Setup the PyPi to use the artifactory as the installation packages source +RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ + trusted_host="${trusted_host%%/*}"; \ + echo "$trusted_host"; \ + echo "[global]" > /etc/pip.conf; \ + echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; + USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index bf817e6501e..2294be40e50 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -60,6 +60,14 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent +# Setup the PyPi to use the artifactory as the installation packages source +RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ + trusted_host="${trusted_host%%/*}"; \ + echo "$trusted_host"; \ + echo "[global]" > /etc/pip.conf; \ + echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; + USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index d55e823add7..d2fe4b31711 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -51,6 +51,14 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server:daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent:daos_agent /var/run/daos_agent +# Setup the PyPi to use the artifactory as the installation packages source +RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ + trusted_host="${trusted_host%%/*}"; \ + echo "$trusted_host"; \ + echo "[global]" > /etc/pip.conf; \ + echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; + USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. From bd25cd68f712568b3c6b721ff43fd881452e8f60 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 09:42:01 +0200 Subject: [PATCH 02/35] Add build on el 9 test Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5e3a2190d41..435c3863554 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -260,6 +260,9 @@ pipeline { booleanParam(name: 'CI_el8_NOBUILD', defaultValue: false, description: 'Do not build on EL 8') + booleanParam(name: 'CI_el9_NOBUILD', + defaultValue: false, + description: 'Do not build on EL 9') booleanParam(name: 'CI_leap15_NOBUILD', defaultValue: false, description: 'Do not build on Leap 15') @@ -668,6 +671,44 @@ pipeline { } } } + stage('Build on EL 9') { + when { + beforeAgent true + expression { !params.CI_el9_NOBUILD && !skipStage() } + } + agent { + dockerfile { + filename 'utils/docker/Dockerfile.el.9' + label 'docker_runner' + additionalBuildArgs dockerBuildArgs(repo_type: 'stable', + deps_build: true, + parallel_build: true) + + " -t ${sanitized_JOB_NAME()}-el9 " + + ' --build-arg REPOS="' + prRepos() + '"' + } + } + steps { + job_step_update( + sconsBuild(parallel_build: true, + stash_files: 'ci/test_files_to_stash.txt', + build_deps: 'no', + stash_opt: true, + scons_args: sconsArgs() + + ' PREFIX=/opt/daos TARGET_TYPE=release')) + } + post { + unsuccessful { + sh '''if [ -f config.log ]; then + mv config.log config.log-el9-gcc + fi''' + archiveArtifacts artifacts: 'config.log-el9-gcc', + allowEmptyArchive: true + } + cleanup { + job_status_update() + } + } + } stage('Build on Leap 15.5 with Intel-C and TARGET_PREFIX') { when { beforeAgent true From c11139044e08c44816f3332f499c14365c578340 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 09:45:24 +0200 Subject: [PATCH 03/35] Add leap 15 build with gcc Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 435c3863554..946434f6c47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -709,6 +709,41 @@ pipeline { } } } + stage('Build on Leap 15.5') { + when { + beforeAgent true + expression { !params.CI_leap15_NOBUILD && !skipStage() } + } + agent { + dockerfile { + filename 'utils/docker/Dockerfile.leap.15' + label 'docker_runner' + additionalBuildArgs dockerBuildArgs(repo_type: 'stable', + parallel_build: true, + deps_build: true) + + " -t ${sanitized_JOB_NAME()}-leap15-gcc" + } + } + steps { + job_step_update( + sconsBuild(parallel_build: true, + scons_args: sconsFaultsArgs() + + ' PREFIX=/opt/daos TARGET_TYPE=release', + build_deps: 'yes')) + } + post { + unsuccessful { + sh '''if [ -f config.log ]; then + mv config.log config.log-leap15-gcc + fi''' + archiveArtifacts artifacts: 'config.log-leap15-gcc', + allowEmptyArchive: true + } + cleanup { + job_status_update() + } + } + } stage('Build on Leap 15.5 with Intel-C and TARGET_PREFIX') { when { beforeAgent true From 964cca58187d086f30469575af7bb9cdb45b1b04 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 11:30:21 +0200 Subject: [PATCH 04/35] Switch to rockylinux Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 8b015572f7f..80a26cec1e7 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -9,7 +9,7 @@ # Pull base image ARG POINT_RELEASE= -ARG BASE_DISTRO=almalinux:9$POINT_RELEASE +ARG BASE_DISTRO=rockylinux:9$POINT_RELEASE FROM $BASE_DISTRO AS basic LABEL maintainer="daos@daos.groups.io" # Needed for later use of BASE_DISTRO From 2130fe5439ff127c8389924e447455dc451e45ef Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 11:46:07 +0200 Subject: [PATCH 05/35] Add Leap 15.6 build Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 946434f6c47..22b5404fc54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -744,6 +744,41 @@ pipeline { } } } + stage('Build on Leap 15.6') { + when { + beforeAgent true + expression { !params.CI_leap15_NOBUILD && !skipStage() } + } + agent { + dockerfile { + filename 'utils/docker/Dockerfile.leap.15' + label 'docker_runner' + additionalBuildArgs dockerBuildArgs(repo_type: 'stable', + parallel_build: true, + deps_build: true) + + " -t ${sanitized_JOB_NAME()}-leap15-6" + } + } + steps { + job_step_update( + sconsBuild(parallel_build: true, + scons_args: sconsFaultsArgs() + + ' PREFIX=/opt/daos TARGET_TYPE=release', + build_deps: 'yes')) + } + post { + unsuccessful { + sh '''if [ -f config.log ]; then + mv config.log config.log-leap15-6-gcc + fi''' + archiveArtifacts artifacts: 'config.log-leap15-6-gcc', + allowEmptyArchive: true + } + cleanup { + job_status_update() + } + } + } stage('Build on Leap 15.5 with Intel-C and TARGET_PREFIX') { when { beforeAgent true From 56c82aba6528acbd72ce87e0068d58cb6a95631d Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 15:25:50 +0200 Subject: [PATCH 06/35] Move PyPi to repo-helper Cancel-prev-build: false Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 8 -------- utils/docker/Dockerfile.el.9 | 8 -------- utils/docker/Dockerfile.leap.15 | 8 -------- utils/docker/Dockerfile.ubuntu | 8 -------- utils/scripts/helpers/repo-helper-el8.sh | 12 ++++++++++++ utils/scripts/helpers/repo-helper-el9.sh | 11 +++++++++++ utils/scripts/helpers/repo-helper-leap15.sh | 11 +++++++++++ utils/scripts/helpers/repo-helper-ubuntu.sh | 11 +++++++++++ 8 files changed, 45 insertions(+), 32 deletions(-) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 0f56c7c35dc..1708cc1269d 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -61,14 +61,6 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ ARG JENKINS_URL -# Setup the PyPi to use the artifactory as the installation packages source -RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ - trusted_host="${trusted_host%%/*}"; \ - echo "$trusted_host"; \ - echo "[global]" > /etc/pip.conf; \ - echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; - USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 80a26cec1e7..3764dd4898e 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -53,14 +53,6 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent -# Setup the PyPi to use the artifactory as the installation packages source -RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ - trusted_host="${trusted_host%%/*}"; \ - echo "$trusted_host"; \ - echo "[global]" > /etc/pip.conf; \ - echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; - USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 2294be40e50..bf817e6501e 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -60,14 +60,6 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent -# Setup the PyPi to use the artifactory as the installation packages source -RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ - trusted_host="${trusted_host%%/*}"; \ - echo "$trusted_host"; \ - echo "[global]" > /etc/pip.conf; \ - echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; - USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index d2fe4b31711..d55e823add7 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -51,14 +51,6 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server:daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent:daos_agent /var/run/daos_agent -# Setup the PyPi to use the artifactory as the installation packages source -RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ - trusted_host="${trusted_host%%/*}"; \ - echo "$trusted_host"; \ - echo "[global]" > /etc/pip.conf; \ - echo "trusted-host = ${trusted_host}" >> /etc/pip.conf; \ - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" >> /etc/pip.conf; fi; - USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index d3c8a0875f8..324ad19bd12 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -125,3 +125,15 @@ module_hotfixes=true\n" >> /etc/yum.repos.d/"$repo:$branch:$build_number".repo 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%%/*}"; \ + { + echo "[global]" + echo "trusted-host = ${trusted_host}" + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + } > /etc/pip.conf +fi diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index df4ba3f1550..7591af5eb64 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -121,3 +121,14 @@ module_hotfixes=true\n" >> /etc/yum.repos.d/"$repo:$branch:$build_number".repo 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%%/*}"; \ + { + echo "[global]" + echo "trusted-host = ${trusted_host}" + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + } > /etc/pip.conf +fi diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index e1260f93d88..36d16b546a4 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -169,3 +169,14 @@ fi # in the past failed to validate HTTPS certificates if this command is not # 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%%/*}"; \ + { + echo "[global]" + echo "trusted-host = ${trusted_host}" + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + } > /etc/pip.conf +fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index a82a04b335e..0e183a7cae5 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -106,3 +106,14 @@ if [ -e /tmp/install.sh ]; then /tmp/install.sh 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%%/*}"; \ + { + echo "[global]" + echo "trusted-host = ${trusted_host}" + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + } > /etc/pip.conf +fi From 67154c3590569aaf3bcde882ecf07ebd62efb8cb Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 16:38:11 +0200 Subject: [PATCH 07/35] Fix - use '--proxy=""' to avoid proxy usage Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 4 ++-- utils/docker/Dockerfile.el.9 | 4 ++-- utils/docker/Dockerfile.leap.15 | 4 ++-- utils/docker/Dockerfile.ubuntu | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 1708cc1269d..dedbe9e3713 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -70,8 +70,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --no-cache-dir install --upgrade pip && \ - python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ + python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 3764dd4898e..ce194b37e5f 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -62,8 +62,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --no-cache-dir install --upgrade pip && \ - python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ + python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index bf817e6501e..c51b2c58da4 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -69,8 +69,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --no-cache-dir install --upgrade pip && \ - python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ + python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index d55e823add7..ea2f703d63f 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -60,8 +60,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --no-cache-dir install --upgrade pip && \ - python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ + python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components From ae2585576dbf3850de58d8f65af28c8701af0191 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 17:02:29 +0200 Subject: [PATCH 08/35] Test with fake proxy Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index 324ad19bd12..4c10588ffef 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -135,5 +135,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + echo "proxy = https://no.proxy.at.all/" } > /etc/pip.conf fi From 5b109eb835787ffe8cd820db50d057e552133a00 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 17:05:09 +0200 Subject: [PATCH 09/35] Test with empty proxy Cancel-prev-build: false Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 4 ++-- utils/scripts/helpers/repo-helper-el8.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index dedbe9e3713..8f1460a449a 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -70,8 +70,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ - python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip -vvv --no-cache-dir install --upgrade pip && \ + python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index 4c10588ffef..dcc33482d72 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -135,6 +135,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = https://no.proxy.at.all/" + echo "proxy = \"\"" } > /etc/pip.conf fi From 8482efaac97e46eae9900be5a8014bf43a1882d3 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 17:12:04 +0200 Subject: [PATCH 10/35] Too many stages for Jenkinse to process Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 22b5404fc54..946434f6c47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -744,41 +744,6 @@ pipeline { } } } - stage('Build on Leap 15.6') { - when { - beforeAgent true - expression { !params.CI_leap15_NOBUILD && !skipStage() } - } - agent { - dockerfile { - filename 'utils/docker/Dockerfile.leap.15' - label 'docker_runner' - additionalBuildArgs dockerBuildArgs(repo_type: 'stable', - parallel_build: true, - deps_build: true) + - " -t ${sanitized_JOB_NAME()}-leap15-6" - } - } - steps { - job_step_update( - sconsBuild(parallel_build: true, - scons_args: sconsFaultsArgs() + - ' PREFIX=/opt/daos TARGET_TYPE=release', - build_deps: 'yes')) - } - post { - unsuccessful { - sh '''if [ -f config.log ]; then - mv config.log config.log-leap15-6-gcc - fi''' - archiveArtifacts artifacts: 'config.log-leap15-6-gcc', - allowEmptyArchive: true - } - cleanup { - job_status_update() - } - } - } stage('Build on Leap 15.5 with Intel-C and TARGET_PREFIX') { when { beforeAgent true From ab401b0d7fb1508835a490e6c828013c6a0a4373 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 17:30:56 +0200 Subject: [PATCH 11/35] Test without empty proxy for el9 Cancel-prev-build: false Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index ce194b37e5f..ebcf3a20c79 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -62,8 +62,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ - python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip -vvv --no-cache-dir install --upgrade pip && \ + python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components From 2e935ebd82136ea7431b5bd0163d1224bbf6971a Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 18:18:32 +0200 Subject: [PATCH 12/35] Test with fake proxy on el9 Cancel-prev-build: false Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el9.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index 7591af5eb64..dca4b03bf59 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -130,5 +130,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + echo "proxy = https://proxy.that.does.not.exist.com/" } > /etc/pip.conf fi From 2afb9b77b71026dcc0624d058dbece6d614673ba Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 18:47:45 +0200 Subject: [PATCH 13/35] Last test with el9 Cancel-prev-build: false Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 3 +++ utils/scripts/helpers/repo-helper-el9.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index ebcf3a20c79..6d9fc89b406 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -60,6 +60,9 @@ RUN python3 -m venv /home/daos/venv ENV PATH=/home/daos/venv/bin:$PATH ENV VIRTUAL_ENV=/home/daos/venv/ +# for test purpose only +RUN echo "no_proxy = $no_proxy" + # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ RUN python3 -m pip -vvv --no-cache-dir install --upgrade pip && \ diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index dca4b03bf59..19c234861ca 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -132,4 +132,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" echo "proxy = https://proxy.that.does.not.exist.com/" } > /etc/pip.conf + echo $no_proxy + export no_proxy="${trusted_host}" fi From 6ec33050979cbd5be9b29524711ce3bc1080e110 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 19:01:55 +0200 Subject: [PATCH 14/35] Fix no_proxy Cancel-prev-buil: false Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 7 ++++++- utils/scripts/helpers/repo-helper-el9.sh | 1 - utils/scripts/helpers/repo-helper-leap15.sh | 5 +++++ utils/scripts/helpers/repo-helper-ubuntu.sh | 7 ++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index dcc33482d72..d666334bc20 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -136,5 +136,10 @@ if [ -n "$REPO_FILE_URL" ]; then echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" echo "proxy = \"\"" - } > /etc/pip.conf + } > /etc/pip.conf + if [ -n "$no_proxy" ]; then + export no_proxy="$no_proxy,${trusted_host}" + else + export no_proxy="${trusted_host}" + fi fi diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index 19c234861ca..7e254b3ac8e 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -132,6 +132,5 @@ if [ -n "$REPO_FILE_URL" ]; then echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" echo "proxy = https://proxy.that.does.not.exist.com/" } > /etc/pip.conf - echo $no_proxy export no_proxy="${trusted_host}" fi diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 36d16b546a4..92c77cc6e63 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -179,4 +179,9 @@ if [ -n "$REPO_FILE_URL" ]; then echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" } > /etc/pip.conf + if [ -n "$no_proxy" ]; then + export no_proxy="$no_proxy,${trusted_host}" + else + export no_proxy="${trusted_host}" + fi fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index 0e183a7cae5..b0158c4ecb4 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -115,5 +115,10 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - } > /etc/pip.conf + } > /etc/pip.conf + if [ -n "$no_proxy" ]; then + export no_proxy="$no_proxy,${trusted_host}" + else + export no_proxy="${trusted_host}" + fi fi From bba5fe2a145c8daed9518ccde92982211439ee1a Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 19:31:36 +0200 Subject: [PATCH 15/35] Fix for empty no_proxy Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 3 ++- utils/scripts/helpers/repo-helper-ubuntu.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index d666334bc20..70f39417474 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -12,6 +12,7 @@ set -uex : "${REPOS:=}" : "${DAOS_LAB_CA_FILE_URL:=}" : "${REPOSITORY_NAME:=artifactory}" +: "${no_proxy:=}" # shellcheck disable=SC2120 disable_repos () { @@ -138,7 +139,7 @@ if [ -n "$REPO_FILE_URL" ]; then echo "proxy = \"\"" } > /etc/pip.conf if [ -n "$no_proxy" ]; then - export no_proxy="$no_proxy,${trusted_host}" + export no_proxy="$no_proxy,${trusted_host}" else export no_proxy="${trusted_host}" fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index b0158c4ecb4..79e282acae7 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -11,6 +11,7 @@ set -uex : "${DAOS_LAB_CA_FILE_UR:=}" : "${REPOSITORY_NAME:=artifactory}" : "${BASE_DISTRO:=24.04}" +: "${no_proxy:=}" disable_repos () { if [ -e /etc/apt/sources.list.d/ubuntu.sources ];then From c32dc06c7733f8f63bc08096b9be5e169d3b1c9d Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 19:53:06 +0200 Subject: [PATCH 16/35] Yet another fix for el9 Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 4 +++- utils/scripts/helpers/repo-helper-el9.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 6d9fc89b406..c56f2f508f2 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -65,7 +65,9 @@ RUN echo "no_proxy = $no_proxy" # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip -vvv --no-cache-dir install --upgrade pip && \ +RUN if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ + direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ + python3 -m pip -vvv --no-cache-dir install --upgrade pip && \ python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index 7e254b3ac8e..f7196ed76b8 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -12,6 +12,7 @@ set -uex : "${REPOS:=}" : "${DAOS_LAB_CA_FILE_URL:=}" : "${REPOSITORY_NAME:=artifactory}" +: "${no_proxy:=}" # shellcheck disable=SC2120 disable_repos () { @@ -132,5 +133,4 @@ if [ -n "$REPO_FILE_URL" ]; then echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" echo "proxy = https://proxy.that.does.not.exist.com/" } > /etc/pip.conf - export no_proxy="${trusted_host}" fi From 230b5910b71f39302d3e44d397bd4babe9b47d39 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 20:19:41 +0200 Subject: [PATCH 17/35] Yet another fix for el9 2nd Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 3 --- utils/scripts/helpers/repo-helper-el9.sh | 2 +- utils/scripts/helpers/repo-helper-leap15.sh | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index c56f2f508f2..3e47b23456d 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -60,9 +60,6 @@ RUN python3 -m venv /home/daos/venv ENV PATH=/home/daos/venv/bin:$PATH ENV VIRTUAL_ENV=/home/daos/venv/ -# for test purpose only -RUN echo "no_proxy = $no_proxy" - # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ RUN if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index f7196ed76b8..b5f005319a9 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -131,6 +131,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = https://proxy.that.does.not.exist.com/" + echo "proxy = \"\"" } > /etc/pip.conf fi diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 92c77cc6e63..20e8bbe8f67 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -12,6 +12,7 @@ set -uex : "${REPOS:=}" : "${REPOSITORY_NAME:=artifactory}" : "${DAOS_LAB_CA_FILE_URL:=}" +: "${no_proxy:=}" # shellcheck disable=SC2120 disable_repos () { From eddc7a50143dc31e81c26f4b22e901147ed91a68 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 20:41:40 +0200 Subject: [PATCH 18/35] Finall solution ready for integration Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 4 ++-- utils/docker/Dockerfile.el.9 | 6 ++---- utils/docker/Dockerfile.leap.15 | 4 ++-- utils/docker/Dockerfile.ubuntu | 4 ++-- utils/scripts/helpers/repo-helper-el8.sh | 6 ------ utils/scripts/helpers/repo-helper-el9.sh | 1 - utils/scripts/helpers/repo-helper-leap15.sh | 6 ------ utils/scripts/helpers/repo-helper-ubuntu.sh | 6 ------ 8 files changed, 8 insertions(+), 29 deletions(-) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 8f1460a449a..1708cc1269d 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -70,8 +70,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip -vvv --no-cache-dir install --upgrade pip && \ - python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --no-cache-dir install --upgrade pip && \ + python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 3e47b23456d..3764dd4898e 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -62,10 +62,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ - python3 -m pip -vvv --no-cache-dir install --upgrade pip && \ - python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --no-cache-dir install --upgrade pip && \ + python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index c51b2c58da4..bf817e6501e 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -69,8 +69,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ - python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --no-cache-dir install --upgrade pip && \ + python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index ea2f703d63f..d55e823add7 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -60,8 +60,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ - python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --no-cache-dir install --upgrade pip && \ + python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index 70f39417474..aa8e13793ef 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -12,7 +12,6 @@ set -uex : "${REPOS:=}" : "${DAOS_LAB_CA_FILE_URL:=}" : "${REPOSITORY_NAME:=artifactory}" -: "${no_proxy:=}" # shellcheck disable=SC2120 disable_repos () { @@ -138,9 +137,4 @@ if [ -n "$REPO_FILE_URL" ]; then echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" echo "proxy = \"\"" } > /etc/pip.conf - if [ -n "$no_proxy" ]; then - export no_proxy="$no_proxy,${trusted_host}" - else - export no_proxy="${trusted_host}" - fi fi diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index b5f005319a9..aa841b6e448 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -12,7 +12,6 @@ set -uex : "${REPOS:=}" : "${DAOS_LAB_CA_FILE_URL:=}" : "${REPOSITORY_NAME:=artifactory}" -: "${no_proxy:=}" # shellcheck disable=SC2120 disable_repos () { diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 20e8bbe8f67..36d16b546a4 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -12,7 +12,6 @@ set -uex : "${REPOS:=}" : "${REPOSITORY_NAME:=artifactory}" : "${DAOS_LAB_CA_FILE_URL:=}" -: "${no_proxy:=}" # shellcheck disable=SC2120 disable_repos () { @@ -180,9 +179,4 @@ if [ -n "$REPO_FILE_URL" ]; then echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" } > /etc/pip.conf - if [ -n "$no_proxy" ]; then - export no_proxy="$no_proxy,${trusted_host}" - else - export no_proxy="${trusted_host}" - fi fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index 79e282acae7..abe6b7132e7 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -11,7 +11,6 @@ set -uex : "${DAOS_LAB_CA_FILE_UR:=}" : "${REPOSITORY_NAME:=artifactory}" : "${BASE_DISTRO:=24.04}" -: "${no_proxy:=}" disable_repos () { if [ -e /etc/apt/sources.list.d/ubuntu.sources ];then @@ -117,9 +116,4 @@ if [ -n "$REPO_FILE_URL" ]; then echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" } > /etc/pip.conf - if [ -n "$no_proxy" ]; then - export no_proxy="$no_proxy,${trusted_host}" - else - export no_proxy="${trusted_host}" - fi fi From 289cf31acac421d3be5351df3ef40326ba0dc81f Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 20:51:01 +0200 Subject: [PATCH 19/35] Finall solution ready for integration (2nd) Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 1 - utils/scripts/helpers/repo-helper-leap15.sh | 1 + utils/scripts/helpers/repo-helper-ubuntu.sh | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index aa8e13793ef..88bcf6654aa 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -126,7 +126,6 @@ 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##*//}" diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 36d16b546a4..ab01f2cda51 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -178,5 +178,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + echo "proxy = \"\"" } > /etc/pip.conf fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index abe6b7132e7..32cf3663065 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -115,5 +115,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + echo "proxy = \"\"" } > /etc/pip.conf fi From 24db345299441c68d84c3ebf375f933ab2e0c94f Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 21:12:05 +0200 Subject: [PATCH 20/35] el9 does not accept proxy from pip.conf file Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 3764dd4898e..ce194b37e5f 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -62,8 +62,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --no-cache-dir install --upgrade pip && \ - python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ + python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components From 75312f0729862c3725da8eb0fd08932737cdb6ea Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 27 Jun 2025 23:56:25 +0200 Subject: [PATCH 21/35] el9 failed build debug Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 4 ++-- utils/scripts/helpers/repo-helper-el9.sh | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index ce194b37e5f..23c26a82fb2 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -62,8 +62,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip && \ - python3 -m pip --proxy="" --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip +RUN python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index aa841b6e448..7591af5eb64 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -130,6 +130,5 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = \"\"" } > /etc/pip.conf fi From 91c9b37d76dded155dec750b0ddd0715e549c3cc Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 08:55:33 +0200 Subject: [PATCH 22/35] Debugging el9 - proxy="" only in pip.conf Skip-test: true Skip-unit-test: true Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 2 +- utils/scripts/helpers/repo-helper-el9.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 23c26a82fb2..c0ad1e6d245 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -62,7 +62,7 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --proxy="" --no-cache-dir install --upgrade pip +RUN python3 -m pip --no-cache-dir install --upgrade pip RUN python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index 7591af5eb64..aa841b6e448 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -130,5 +130,6 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + echo "proxy = \"\"" } > /etc/pip.conf fi From 638b25ae702a76b0acb413c4adb3281a32ba8d34 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 13:14:12 +0200 Subject: [PATCH 23/35] Debugging el9 - proxy="" only in pip.conf in Dockerfile Skip-test: true Skip-unit-test: true Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 14 +++++++++++++- utils/scripts/helpers/repo-helper-el9.sh | 12 ------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index c0ad1e6d245..f18880c5611 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -53,7 +53,19 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent -USER daos_server:daos_server +# Setup the PyPi to use the artifactory as the installation packages source +RUN if [ -n "$REPO_FILE_URL" ]; then; \ + trusted_host="${REPO_FILE_URL##*//}"; \ + trusted_host="${trusted_host%%/*}"; \ + { \ + echo "[global]"; \ + echo "trusted-host = ${trusted_host}" ;\ + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" ;\ + echo "proxy = \"\"";\ + } > /etc/pip.conf; \ + fi + + USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. RUN python3 -m venv /home/daos/venv diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index aa841b6e448..df4ba3f1550 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -121,15 +121,3 @@ module_hotfixes=true\n" >> /etc/yum.repos.d/"$repo:$branch:$build_number".repo 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%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = \"\"" - } > /etc/pip.conf -fi From c41395a31bbe619b680932ee62b8d036d5d606ae Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 13:44:36 +0200 Subject: [PATCH 24/35] Debugging el9 - proxy="" only in pip.conf in Dockerfile - fix Skip-test: true Skip-unit-test: true Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index f18880c5611..133ec3c053b 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -54,14 +54,12 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown daos_agent.daos_agent /var/run/daos_agent # Setup the PyPi to use the artifactory as the installation packages source -RUN if [ -n "$REPO_FILE_URL" ]; then; \ - trusted_host="${REPO_FILE_URL##*//}"; \ +RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ trusted_host="${trusted_host%%/*}"; \ - { \ - echo "[global]"; \ + { echo "[global]"; \ echo "trusted-host = ${trusted_host}" ;\ echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" ;\ - echo "proxy = \"\"";\ + echo "proxy = ";\ } > /etc/pip.conf; \ fi From 007866e02695d203bacf53e62df89d5dc2b343c8 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 14:43:58 +0200 Subject: [PATCH 25/35] Debugging el9 - proxy= only in pip.conf in repo-helper Skip-test: true Skip-unit-tests: true Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 10 ---------- utils/scripts/helpers/repo-helper-el9.sh | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 133ec3c053b..9b255dfcef3 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -53,16 +53,6 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent -# Setup the PyPi to use the artifactory as the installation packages source -RUN if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}"; \ - trusted_host="${trusted_host%%/*}"; \ - { echo "[global]"; \ - echo "trusted-host = ${trusted_host}" ;\ - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" ;\ - echo "proxy = ";\ - } > /etc/pip.conf; \ - fi - USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index df4ba3f1550..f96a144b674 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -121,3 +121,15 @@ module_hotfixes=true\n" >> /etc/yum.repos.d/"$repo:$branch:$build_number".repo 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%%/*}"; \ + { + echo "[global]" + echo "trusted-host = ${trusted_host}" + echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" + echo "proxy = " + } > /etc/pip.conf +fi From 293b57ad7905430e6f7e34c0943cebca9a58f937 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 15:05:45 +0200 Subject: [PATCH 26/35] Final solution cleanup 2nd ;) Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 9b255dfcef3..b2bab055945 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -53,7 +53,7 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent - USER daos_server:daos_server +USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. RUN python3 -m venv /home/daos/venv @@ -62,8 +62,8 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ -RUN python3 -m pip --no-cache-dir install --upgrade pip -RUN python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt +RUN python3 -m pip --no-cache-dir install --upgrade pip && \ + python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components From d0414a8cfd1ed3688fcadab098aa4d6c762f6b04 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 15:07:34 +0200 Subject: [PATCH 27/35] Final solution cleanup 3rd ;) Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index b2bab055945..3764dd4898e 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -63,7 +63,7 @@ ENV VIRTUAL_ENV=/home/daos/venv/ # Install latest versions of python tools. COPY requirements-build.txt requirements-utest.txt ./ RUN python3 -m pip --no-cache-dir install --upgrade pip && \ - python3 -m pip -vvv --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt + python3 -m pip --no-cache-dir install -r requirements-build.txt -r requirements-utest.txt WORKDIR /home/daos/pre RUN mkdir -p /home/daos/pre/site_scons/prereq_tools /home/daos/pre/site_scons/components From bd6da08430d5efc674ac4b63d30d36b2613583f1 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 15:23:13 +0200 Subject: [PATCH 28/35] Custom library for test purpose only Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 946434f6c47..64c91baf01d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,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-2257-no-proxy-for-docker') _ /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:] From 2e91c7d85f6e6e7c4a845b514ced51b7a713385e Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 28 Jun 2025 22:03:50 +0200 Subject: [PATCH 29/35] sre-2257 - introduce no_proxy support for Dockers Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.9 | 10 ++++++++++ utils/scripts/helpers/repo-helper-el9.sh | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 3764dd4898e..4d6b687c1ec 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -22,6 +22,16 @@ ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL + +# Accept no_proxy at build time +ARG no_proxy +# Propagate into the build environment +ENV no_proxy=${no_proxy} +ENV NO_PROXY=${no_proxy} +# Persist into /etc/environment for use by shells and services +RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ + echo "NO_PROXY=${no_proxy}" >> /etc/environment + # script to install OS updates basic tools and daos dependencies COPY ./utils/scripts/install-el9.sh /tmp/install.sh # script to setup local repo if available diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index f96a144b674..8e7c8b8ace5 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -130,6 +130,5 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = " } > /etc/pip.conf fi From 1ee3e55719c7f318cb8f5358f21d8290097a59da Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 00:22:50 +0200 Subject: [PATCH 30/35] Propagate no proxy to all places Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 10 ++++++++++ utils/docker/Dockerfile.leap.15 | 10 ++++++++++ utils/docker/Dockerfile.ubuntu | 10 ++++++++++ utils/scripts/helpers/repo-helper-el8.sh | 1 - utils/scripts/helpers/repo-helper-leap15.sh | 1 - utils/scripts/helpers/repo-helper-ubuntu.sh | 1 - 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 1708cc1269d..9fc93693080 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -22,6 +22,16 @@ ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL + +# Accept no_proxy at build time +ARG no_proxy +# Propagate into the build environment +ENV no_proxy=${no_proxy} +ENV NO_PROXY=${no_proxy} +# Persist into /etc/environment for use by shells and services +RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ + echo "NO_PROXY=${no_proxy}" >> /etc/environment + # script to install OS updates basic tools and daos dependencies COPY ./utils/scripts/install-el8.sh /tmp/install.sh # script to setup local repo if available diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index bf817e6501e..f674072978e 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -22,6 +22,16 @@ ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL + +# Accept no_proxy at build time +ARG no_proxy +# Propagate into the build environment +ENV no_proxy=${no_proxy} +ENV NO_PROXY=${no_proxy} +# Persist into /etc/environment for use by shells and services +RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ + echo "NO_PROXY=${no_proxy}" >> /etc/environment + # script to install OS updates basic tools and daos dependencies COPY ./utils/scripts/install-leap15.sh /tmp/install.sh # script to setup local repo if available diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index d55e823add7..59d85c8d727 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -22,6 +22,16 @@ ENV DEBIAN_FRONTEND=noninteractive # Install basic tools ARG DAOS_LAB_CA_FILE_URL + +# Accept no_proxy at build time +ARG no_proxy +# Propagate into the build environment +ENV no_proxy=${no_proxy} +ENV NO_PROXY=${no_proxy} +# Persist into /etc/environment for use by shells and services +RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ + echo "NO_PROXY=${no_proxy}" >> /etc/environment + # script to setup local repo if available and install packages COPY ./utils/scripts/helpers/repo-helper-ubuntu.sh /tmp/repo-helper.sh COPY ./utils/scripts/install-ubuntu.sh /tmp/install.sh diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index 88bcf6654aa..feb2c93386a 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -134,6 +134,5 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = \"\"" } > /etc/pip.conf fi diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index ab01f2cda51..36d16b546a4 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -178,6 +178,5 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = \"\"" } > /etc/pip.conf fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index 32cf3663065..abe6b7132e7 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -115,6 +115,5 @@ if [ -n "$REPO_FILE_URL" ]; then echo "[global]" echo "trusted-host = ${trusted_host}" echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = \"\"" } > /etc/pip.conf fi From b72a94e50ff3adbf824a41912243775e4a996f86 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 00:29:55 +0200 Subject: [PATCH 31/35] remove all export no_proxy Skip-test: true Skip-unit-tests: true Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 24 +++--------------------- utils/docker/Dockerfile.leap.15 | 16 +--------------- 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 9fc93693080..6dba2427f0b 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -47,9 +47,7 @@ FROM basic # with a local repository, yet needing a proxy to reach outside repositories. # This needs to be moved to a shell script like above in the future to # properly only remove the proxy variables only when they need to be removed -RUN if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ - dnf upgrade && \ +RUN dnf upgrade && \ /tmp/install.sh && \ dnf clean all && \ rm -f /tmp/install.sh @@ -69,8 +67,6 @@ RUN mkdir -p /opt/daos /mnt/daos /var/run/daos_server /var/run/daos_agent /home/ chown -R daos_server.daos_server /opt/daos /mnt/daos /var/run/daos_server /home/daos && \ chown daos_agent.daos_agent /var/run/daos_agent -ARG JENKINS_URL - USER daos_server:daos_server # Setup a python venv so that python packages can be installed locally. @@ -105,8 +101,6 @@ ARG DAOS_PACKAGES_BUILD=yes # ensure that latest dependencies are used. USER root:root RUN [ "$DAOS_DEPS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ dnf upgrade --exclude=spdk,spdk-devel,dpdk-devel,dpdk,mercury-devel,mercury && \ dnf clean all; \ } @@ -115,8 +109,6 @@ USER daos_server:daos_server ARG DEPS_JOBS=1 RUN [ "$DAOS_DEPS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ scons --build-deps=only --jobs $DEPS_JOBS PREFIX=/opt/daos \ TARGET_TYPE=$DAOS_TARGET_TYPE && \ ([ "$DAOS_KEEP_BUILD" != "no" ] || /bin/rm -rf build *.gz); \ @@ -127,8 +119,7 @@ COPY --chown=daos_server:daos_server utils/sl utils/sl # Build third party RPMs RUN [ "$DAOS_PACKAGES_BUILD" != "yes" ] || [ "$DAOS_DEPS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ + export DISTRO="el8" && \ utils/rpms/build_packages.sh deps && \ mkdir -p /home/daos/rpms && \ mv *.rpm /home/daos/rpms; \ @@ -138,10 +129,7 @@ USER root:root # force an upgrade to get any newly built RPMs, but only if CB1 is set. ARG CB1 RUN [ -z "$CB1" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ - dnf upgrade \ - --exclude=spdk,spdk-devel,dpdk-devel,dpdk,mercury-devel,mercury && \ + dnf upgrade --exclude=spdk,spdk-devel,dpdk-devel,dpdk,mercury-devel,mercury && \ dnf clean all; \ } USER daos_server:daos_server @@ -167,8 +155,6 @@ ARG DAOS_BUILD=$DAOS_DEPS_BUILD # Build DAOS RUN [ "$DAOS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ scons --jobs $JOBS install PREFIX=/opt/daos COMPILER=$COMPILER \ FIRMWARE_MGMT=1 BUILD_TYPE=$DAOS_BUILD_TYPE TARGET_TYPE=$DAOS_TARGET_TYPE && \ ([ "$DAOS_KEEP_BUILD" != "no" ] || /bin/rm -rf build) && \ @@ -180,8 +166,6 @@ COPY --chown=daos_server:daos_server utils utils # Build DAOS RPMs RUN [ "$DAOS_PACKAGES_BUILD" != "yes" ] || [ "$DAOS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ utils/rpms/build_packages.sh daos && \ mkdir -p /home/daos/rpms && \ cp *.rpm /home/daos/rpms; \ @@ -197,8 +181,6 @@ WORKDIR /home/daos/daos/src/client/java ARG DAOS_JAVA_BUILD=$DAOS_BUILD RUN [ "$DAOS_JAVA_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ mkdir /home/daos/.m2 && \ cp /home/daos/daos/utils/scripts/helpers/maven-settings.xml.in /home/daos/.m2/settings.xml && \ export JAVA_HOME=$(daos-java/find_java_home.sh) && \ diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index f674072978e..f9e85440ae4 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -48,9 +48,7 @@ FROM basic # with a local repository, yet needing a proxy to reach outside repositories. # This needs to be moved to a shell script like above in the future to # properly only remove the proxy variables only when they need to be removed -RUN if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ - dnf upgrade && \ +RUN dnf upgrade && \ /tmp/install.sh && \ dnf clean all && \ rm -f /tmp/install.sh @@ -105,8 +103,6 @@ ARG DAOS_PACKAGES_BUILD=yes # The dnf upgrade can add or re-enable distro repositories. USER root:root RUN [ "$DAOS_DEPS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ dnf upgrade --exclude=fuse,fuse-libs,fuse-devel,libraft0,raft-devel,mercury,mercury-devel && \ dnf clean all; \ } @@ -115,8 +111,6 @@ USER daos_server:daos_server ARG DEPS_JOBS=1 RUN [ "$DAOS_DEPS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ scons --build-deps=only --jobs $DEPS_JOBS PREFIX=/opt/daos \ TARGET_TYPE=$DAOS_TARGET_TYPE && \ ([ "$DAOS_KEEP_BUILD" != "no" ] || /bin/rm -rf build *.gz); \ @@ -149,8 +143,6 @@ RUN if [ "$COMPILER" = "icc" ]; then rpm --import https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && \ dnf config-manager --add-repo https://yum.repos.intel.com/oneapi oneAPI; \ fi; \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; "\ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ dnf install intel-oneapi-compiler-dpcpp-cpp && \ dnf clean all; \ fi @@ -158,8 +150,6 @@ RUN if [ "$COMPILER" = "icc" ]; then # force an upgrade to get any newly built RPMs, but only if CB1 is set. ARG CB1 RUN [ -z "$CB1" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ dnf upgrade --exclude=fuse,fuse-libs,fuse-devel,libraft0,raft-devel,mercury,mercury-devel && \ dnf clean all; \ } @@ -184,8 +174,6 @@ ARG DAOS_BUILD=$DAOS_DEPS_BUILD # Build DAOS RUN [ "$DAOS_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ scons --jobs $JOBS install PREFIX=/opt/daos COMPILER=$COMPILER \ BUILD_TYPE=$DAOS_BUILD_TYPE TARGET_TYPE=$DAOS_TARGET_TYPE \ FIRMWARE_MGMT=1 && \ @@ -214,8 +202,6 @@ WORKDIR /home/daos/daos/src/client/java ARG DAOS_JAVA_BUILD=$DAOS_BUILD RUN [ "$DAOS_JAVA_BUILD" != "yes" ] || { \ - if [ -n "$REPO_FILE_URL" ]; then direct="${REPO_FILE_URL##*//}; " \ - direct="${direct%%/*}"; export no_proxy="${direct}"; fi; \ mkdir /home/daos/.m2 && \ cp /home/daos/daos/utils/scripts/helpers/maven-settings.xml.in /home/daos/.m2/settings.xml && \ mvn clean install -ntp -T 1C -DskipITs -Dgpg.skip -Ddaos.install.path=/opt/daos; \ From a2a885cd71d8f2c6c31e2fa26df2e2c208bd1341 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 00:56:19 +0200 Subject: [PATCH 32/35] DAOS_NO_PROXY instead of NO_PROXY Skip-test: true Skip-unit-tests: true Signed-off-by: Tomasz Gromadzki --- utils/docker/Dockerfile.el.8 | 12 ++++++------ utils/docker/Dockerfile.el.9 | 12 ++++++------ utils/docker/Dockerfile.leap.15 | 12 ++++++------ utils/docker/Dockerfile.ubuntu | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 6dba2427f0b..ab120f1ec5b 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -23,14 +23,14 @@ ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL -# Accept no_proxy at build time -ARG no_proxy +# Accept DAOS_NO_PROXY at build time +ARG DAOS_NO_PROXY # Propagate into the build environment -ENV no_proxy=${no_proxy} -ENV NO_PROXY=${no_proxy} +ENV no_proxy=${DAOS_NO_PROXY} +ENV NO_PROXY=${DAOS_NO_PROXY} # Persist into /etc/environment for use by shells and services -RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ - echo "NO_PROXY=${no_proxy}" >> /etc/environment +RUN echo "no_proxy=${DAOS_NO_PROXY}" >> /etc/environment && \ + echo "NO_PROXY=${DAOS_NO_PROXY}" >> /etc/environment # script to install OS updates basic tools and daos dependencies COPY ./utils/scripts/install-el8.sh /tmp/install.sh diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 4d6b687c1ec..0b72fa0d9c7 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -23,14 +23,14 @@ ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL -# Accept no_proxy at build time -ARG no_proxy +# Accept DAOS_NO_PROXY at build time +ARG DAOS_NO_PROXY # Propagate into the build environment -ENV no_proxy=${no_proxy} -ENV NO_PROXY=${no_proxy} +ENV no_proxy=${DAOS_NO_PROXY} +ENV NO_PROXY=${DAOS_NO_PROXY} # Persist into /etc/environment for use by shells and services -RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ - echo "NO_PROXY=${no_proxy}" >> /etc/environment +RUN echo "no_proxy=${DAOS_NO_PROXY}" >> /etc/environment && \ + echo "NO_PROXY=${DAOS_NO_PROXY}" >> /etc/environment # script to install OS updates basic tools and daos dependencies COPY ./utils/scripts/install-el9.sh /tmp/install.sh diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index f9e85440ae4..b6f5c3cb55e 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -23,14 +23,14 @@ ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL -# Accept no_proxy at build time -ARG no_proxy +# Accept DAOS_NO_PROXY at build time +ARG DAOS_NO_PROXY # Propagate into the build environment -ENV no_proxy=${no_proxy} -ENV NO_PROXY=${no_proxy} +ENV no_proxy=${DAOS_NO_PROXY} +ENV NO_PROXY=${DAOS_NO_PROXY} # Persist into /etc/environment for use by shells and services -RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ - echo "NO_PROXY=${no_proxy}" >> /etc/environment +RUN echo "no_proxy=${DAOS_NO_PROXY}" >> /etc/environment && \ + echo "NO_PROXY=${DAOS_NO_PROXY}" >> /etc/environment # script to install OS updates basic tools and daos dependencies COPY ./utils/scripts/install-leap15.sh /tmp/install.sh diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index 59d85c8d727..2e44083082c 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -23,14 +23,14 @@ ENV DEBIAN_FRONTEND=noninteractive # Install basic tools ARG DAOS_LAB_CA_FILE_URL -# Accept no_proxy at build time -ARG no_proxy +# Accept DAOS_NO_PROXY at build time +ARG DAOS_NO_PROXY # Propagate into the build environment -ENV no_proxy=${no_proxy} -ENV NO_PROXY=${no_proxy} +ENV no_proxy=${DAOS_NO_PROXY} +ENV NO_PROXY=${DAOS_NO_PROXY} # Persist into /etc/environment for use by shells and services -RUN echo "no_proxy=${no_proxy}" >> /etc/environment && \ - echo "NO_PROXY=${no_proxy}" >> /etc/environment +RUN echo "no_proxy=${DAOS_NO_PROXY}" >> /etc/environment && \ + echo "NO_PROXY=${DAOS_NO_PROXY}" >> /etc/environment # script to setup local repo if available and install packages COPY ./utils/scripts/helpers/repo-helper-ubuntu.sh /tmp/repo-helper.sh From 5d9f788211d887840c2d359e69240431c9f34dc3 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sun, 29 Jun 2025 10:57:22 +0200 Subject: [PATCH 33/35] Final tune Priority: 2 Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 10 +++++----- utils/scripts/helpers/repo-helper-el9.sh | 10 +++++----- utils/scripts/helpers/repo-helper-leap15.sh | 10 +++++----- utils/scripts/helpers/repo-helper-ubuntu.sh | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index feb2c93386a..b2b0a956008 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -130,9 +130,9 @@ disable_repos /etc/yum.repos.d/ "${save_repos[@]}" if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - } > /etc/pip.conf + cat < /etc/pip.conf +[global] + trusted-host = ${trusted_host} + index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple +EOF fi diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index 8e7c8b8ace5..b595d5d5c15 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -126,9 +126,9 @@ disable_repos /etc/yum.repos.d/ "${save_repos[@]}" if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - } > /etc/pip.conf + cat < /etc/pip.conf +[global] + trusted-host = ${trusted_host} + index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple +EOF fi diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 36d16b546a4..98ced4e82ea 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -174,9 +174,9 @@ update-ca-certificates if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - } > /etc/pip.conf + cat < /etc/pip.conf +[global] + trusted-host = ${trusted_host} + index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple +EOF fi diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index abe6b7132e7..c7738a982de 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -111,9 +111,9 @@ apt-get clean all if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - } > /etc/pip.conf + cat < /etc/pip.conf +[global] + trusted-host = ${trusted_host} + index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple +EOF fi From f98391bcae6f0655b0eddf79f23a62252a7bf761 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 4 Jul 2025 09:34:39 +0200 Subject: [PATCH 34/35] No proxy is implemented via 'no_proxy' variable' There is no need to use unset HTTPS_PROXY as proxy is selectively disabled for preconfigured list of hosts. Signed-off-by: Tomasz Gromadzki --- utils/scripts/helpers/repo-helper-el8.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index b2b0a956008..3572699d634 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -74,8 +74,8 @@ if [ -n "$REPO_FILE_URL" ]; then popd # These may have been created in the Dockerfile must be removed # when using a local repository. - unset HTTPS_PROXY - unset https_proxy + # unset HTTPS_PROXY + # unset https_proxy fi dnf -y --disablerepo \*epel\* install dnf-plugins-core dnf -y config-manager --save --setopt=assumeyes=True From c5726876799b51ddfde7d9897453ef0b5201aab5 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 17 Jul 2025 13:10:48 +0200 Subject: [PATCH 35/35] pipeline-lib changes has landed Final validation on VMs only. Skip-func-hw-test: true Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 64c91baf01d..946434f6c47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,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-2257-no-proxy-for-docker') _ /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:]