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

Merge pull request #26631 from Luap99/autoupdate-error 

podman auto-update: include container in invalid policy message
This commit is contained in:
openshift-merge-bot[bot] 2025-07-14 17:34:37 +00:00 committed by GitHub
parent 9ed9da3446 e55270a51a
commit 6b9a3066b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/autoupdate/autoupdate.go
View File

@ -393,7 +393,7 @@ func (u *updater) assembleTasks(ctx context.Context) []error {
}
policy, err := LookupPolicy(value)
if err != nil {
errs = append(errs, err)
errs = append(errs, fmt.Errorf("auto-updating container %q: %w", ctr.ID(), err))
continue
}
if policy == PolicyDefault {

5
test/system/255-auto-update.bats
View File

@ -267,7 +267,7 @@ function _confirm_update() {
_wait_service_ready container-$cname.service
run_podman 125 auto-update
is "$output" ".*invalid auto-update policy.*" "invalid policy setup"
assert "$output" =~ 'auto-updating container "[0-9a-f]{64}": invalid auto-update policy "'"$fakevalue"'": valid policies are \["disabled" "image" "local" "registry"\]' "invalid policy setup"
run_podman inspect --format "{{.Image}}" $cname
is "$output" "$ori_image" "Image ID should not change"
@ -384,8 +384,7 @@ EOF
# Exit code is expected, due to invalid 'fakevalue'
run_podman 125 auto-update --rollback=false
update_log=$output
is "$update_log" ".*invalid auto-update policy.*" "invalid policy setup"
is "$update_log" ".*Error: invalid auto-update policy.*" "invalid policy setup"
assert "$update_log" =~ '.*Error: auto-updating container "[0-9a-f]{64}": invalid auto-update policy.*' "invalid policy setup"
local n_updated=$(grep -c 'Trying to pull' <<<"$update_log")
is "$n_updated" "2" "Number of images updated from registry."