Skip to content

SRE-3743 ci: force direct access to artifactory (#18048) #18050

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
daltonbohning merged 2 commits into from
Apr 20, 2026
Merged

SRE-3743 ci: force direct access to artifactory (#18048) #18050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
086f6d1
SRE-3731 ci: force direct access to artifactory
grom72 Apr 20, 2026
72db3bc
linting and copyright fixes
ryon-jensen Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion utils/docker/Dockerfile.el.8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2018-2024 Intel Corporation
# Copyright 2025 Hewlett Packard Enterprise Development LP
# Copyright 2025-2026 Hewlett Packard Enterprise Development LP
# All rights reserved.
#
# 'recipe' for Docker to build an image of EL 8 based
Expand All @@ -17,6 +17,17 @@ ARG BASE_DISTRO
# Intermittent cache-bust. Used to reduce load on the actual CB1 later.
ARG CB0

# Accept DAOS_NO_PROXY at build time
ARG DAOS_NO_PROXY
# Propagate into the build environment
ENV no_proxy=${DAOS_NO_PROXY}
ENV NO_PROXY=${DAOS_NO_PROXY}
# Persist into /etc/environment for use by shells and services
RUN cat <<EOF >> /etc/environment
"no_proxy=${DAOS_NO_PROXY}"
"NO_PROXY=${DAOS_NO_PROXY}"
EOF

ARG REPO_FILE_URL
ARG JENKINS_URL
ARG REPOS
Expand Down
13 changes: 12 additions & 1 deletion utils/docker/Dockerfile.el.9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2022-2024 Intel Corporation
# Copyright 2025 Hewlett Packard Enterprise Development LP
# Copyright 2025-2026 Hewlett Packard Enterprise Development LP
# All rights reserved.
#
# 'recipe' for Docker to build an image of EL 9 based
Expand All @@ -17,6 +17,17 @@ ARG BASE_DISTRO
# Intermittent cache-bust. Used to reduce load on the actual CB1 later.
ARG CB0

# Accept DAOS_NO_PROXY at build time
ARG DAOS_NO_PROXY
# Propagate into the build environment
ENV no_proxy=${DAOS_NO_PROXY}
ENV NO_PROXY=${DAOS_NO_PROXY}
# Persist into /etc/environment for use by shells and services
RUN cat <<EOF >> /etc/environment
"no_proxy=${DAOS_NO_PROXY}"
"NO_PROXY=${DAOS_NO_PROXY}"
EOF

ARG REPO_FILE_URL
ARG JENKINS_URL
ARG REPOS
Expand Down
11 changes: 11 additions & 0 deletions utils/docker/Dockerfile.leap.15
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ ARG BASE_DISTRO
# Intermittent cache-bust. Used to reduce load on the actual CB1 later.
ARG CB0

# Accept DAOS_NO_PROXY at build time
ARG DAOS_NO_PROXY
# Propagate into the build environment
ENV no_proxy=${DAOS_NO_PROXY}
ENV NO_PROXY=${DAOS_NO_PROXY}
# Persist into /etc/environment for use by shells and services
RUN cat <<EOF >> /etc/environment
"no_proxy=${DAOS_NO_PROXY}"
"NO_PROXY=${DAOS_NO_PROXY}"
EOF

ARG REPO_FILE_URL
ARG JENKINS_URL
ARG REPOS
Expand Down
14 changes: 8 additions & 6 deletions utils/scripts/helpers/repo-helper-el8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,12 @@ 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"
echo "proxy = \"\""
} > /etc/pip.conf
cat <<EOF > /etc/pip.conf
[global]
trusted-host = ${trusted_host}
index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple
progress_bar = off
no_color = true
quiet = 1
EOF
fi
14 changes: 8 additions & 6 deletions utils/scripts/helpers/repo-helper-el9.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,12 @@ 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"
echo "proxy = "
} > /etc/pip.conf
cat <<EOF > /etc/pip.conf
[global]
trusted-host = ${trusted_host}
index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple
progress_bar = off
no_color = true
quiet = 1
EOF
fi
14 changes: 8 additions & 6 deletions utils/scripts/helpers/repo-helper-leap15.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,12 @@ 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"
echo "proxy = \"\""
} > /etc/pip.conf
cat <<EOF > /etc/pip.conf
[global]
trusted-host = ${trusted_host}
index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple
progress_bar = off
no_color = true
quiet = 1
EOF
fi
Loading