Skip to content

USHIFT-6365: Mirror test assets images in local registry #5863

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
openshift-merge-bot merged 3 commits into from
Dec 5, 2025
Merged

USHIFT-6365: Mirror test assets images in local registry #5863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da5a7be
USHIFT-6365: Mirror test assets images in local registry
pacevedom Dec 5, 2025
f95ea47
USHIFT-6365: Align all test busybox images to same registry and version
pacevedom Dec 5, 2025
32d6539
USHIFT-6365: Adjust mirroring images to include tags
pacevedom Dec 5, 2025
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
2 changes: 1 addition & 1 deletion test/assets/kustomizations/greenboot/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ resources:
- busybox.yaml
images:
- name: BUSYBOX_IMAGE
newName: busybox:1.35
newName: quay.io/microshift/busybox:1.36
5 changes: 5 additions & 0 deletions test/bin/mirror_registry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,11 @@ mirror_images() {
echo "${src_img}" >> "${ffile}"
done

# Add test assets images.
find "${SCRIPTDIR}/../assets/" -type f -exec grep -hPo "(?<=image: ).*\..*" {} \; | while read -r img; do
Copy link
Contributor

@ggiguash ggiguash Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
find "${SCRIPTDIR}/../assets/" -type f -exec grep -hPo "(?<=image: ).*\..*" {} \; | while read -r img; do
find "${SCRIPTDIR}/../assets/" -type f -exec awk '/quay.io/ {print $NF}' {} \; | while read -r img; do

Copy link
Contributor Author

@pacevedom pacevedom Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unable, there are images from 3 different sources and also images: has 2 different formats. This captures any domain name after images:, whatever the format it has.

echo "${img}" >> "${ffile}"
done

sort -u "${ifile}" "${ffile}" > "${ofile}"
"${ROOTDIR}/scripts/mirror-images.sh" --mirror "${QUAY_PULL_SECRET}" "${ofile}" "${MIRROR_REGISTRY_URL}"
rm -f "${ofile}" "${ffile}"
Expand Down
6 changes: 3 additions & 3 deletions test/kickstart-templates/includes/post-containers.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@ EOF

# Setup mirror registries configuration here, as the hostname is dynamic and the file is verbose.
# Use hostnames as IP addresses are not allowed.
# Mirroring happens for both digests(MicroShift itself) and tags (because of tests). There is
# no risk of stale images when mirroring by tags because the VMs are meant to be short lived
# and mirroring happens right before running the tests.
mkdir -p /etc/containers/registries.conf.d
cat > /etc/containers/registries.conf.d/999-microshift-mirror.conf <<'EOF'
[[registry]]
prefix = ""
location = "REPLACE_MIRROR_HOSTNAME:REPLACE_MIRROR_PORT"
mirror-by-digest-only = true
insecure = true

[[registry]]
prefix = ""
location = "quay.io"
mirror-by-digest-only = true
[[registry.mirror]]
location = "REPLACE_MIRROR_HOSTNAME:REPLACE_MIRROR_PORT/microshift"
insecure = true

[[registry]]
prefix = ""
location = "registry.redhat.io"
mirror-by-digest-only = true
[[registry.mirror]]
location = "REPLACE_MIRROR_HOSTNAME:REPLACE_MIRROR_PORT/microshift"
insecure = true
Expand Down