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

quadlet: Drop --pull=never 

This is to match podman run default behaviour.

Signed-off-by: Alexander Larsson <alexl@redhat.com>
This commit is contained in:
Alexander Larsson 2022-12-02 16:33:09 +01:00
parent 098ad52ecb
commit b34ab8b5fa
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/systemd/quadlet/quadlet.go
View File

@ -253,9 +253,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile
// But we still want output to the journal, so use the log driver. // But we still want output to the journal, so use the log driver.
"--log-driver", "passthrough", "--log-driver", "passthrough",
)
// Never try to pull the image during service start
"--pull=never")
// We use crun as the runtime and delegated groups to it // We use crun as the runtime and delegated groups to it
service.Add(ServiceGroup, "Delegate", "yes") service.Add(ServiceGroup, "Delegate", "yes")

2
test/e2e/quadlet/basepodman.container
View File

@ -1,4 +1,4 @@
## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm -d --log-driver passthrough --pull=never --runtime /usr/bin/crun --cgroups=split --sdnotify=conmon localhost/imagename ## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm -d --log-driver passthrough --runtime /usr/bin/crun --cgroups=split --sdnotify=conmon localhost/imagename
[Container] [Container]
Image=localhost/imagename Image=localhost/imagename

1
test/e2e/quadlet/basic.container
View File

@ -5,7 +5,6 @@
## assert-podman-args "--replace" ## assert-podman-args "--replace"
## assert-podman-args "-d" ## assert-podman-args "-d"
## assert-podman-args "--log-driver" "passthrough" ## assert-podman-args "--log-driver" "passthrough"
## assert-podman-args "--pull=never"
## assert-podman-args "--runtime" "/usr/bin/crun" ## assert-podman-args "--runtime" "/usr/bin/crun"
## assert-podman-args "--cgroups=split" ## assert-podman-args "--cgroups=split"
## assert-podman-args "--sdnotify=conmon" ## assert-podman-args "--sdnotify=conmon"