containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23461 from edsantiago/ci-machine-nocache 

CI: podman-machine: do not use cache registry
This commit is contained in:
openshift-merge-bot[bot] 2024-08-05 15:49:24 +00:00 committed by GitHub
parent 5ca337d2e8 87dad1caef
commit 0bd43f4e12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/cirrus/lib.sh
View File

@ -195,9 +195,20 @@ setup_rootless() {
} }
install_test_configs() { install_test_configs() {
msg "Installing ./test/registries.conf system-wide." # Which registries.conf to use. By default we always want the cached one...
cached="-cached"
# ...except for podman-machine, where it's antihelpful
if [[ -n "$1" ]]; then
if [[ "$1" = "nocache" ]]; then
cached=""
else
die "Internal error: install_test_configs(): unknown arg '$*'"
fi
fi
msg "Installing ./test/registries$cached.conf system-wide."
# All CI VMs run with a local registry # All CI VMs run with a local registry
install -v -D -m 644 ./test/registries-cached.conf /etc/containers/registries.conf install -v -D -m 644 ./test/registries$cached.conf /etc/containers/registries.conf
} }
# Remove all files provided by the distro version of podman. # Remove all files provided by the distro version of podman.

7
contrib/cirrus/setup_environment.sh
View File

@ -450,11 +450,8 @@ case "$TEST_FLAVOR" in
fi fi
remove_packaged_podman_files remove_packaged_podman_files
showrun make install PREFIX=/usr ETCDIR=/etc showrun make install PREFIX=/usr ETCDIR=/etc
# machine-os image changes too frequently, can't be precached # machine-os image changes too frequently, can't use image cache
# FIXME: I don't think we can use version.go, because of chicken-egg install_test_configs nocache
# problem when that gets bumped. Ideas welcome.
$LCR cache podman/machine-os:5.3
install_test_configs
;; ;;
swagger) swagger)
showrun make .install.swagger showrun make .install.swagger