mirror of
https://github.com/containers/podman.git
synced 2025-10-19 20:23:08 +08:00
test/e2e: rm systemd start test
We have a lot of systemd and quadlet based tests in the system tests. This test doesn't seem very useful and it seems to flake so just remove it. Fixes #23480 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -14,67 +14,6 @@ import (
|
|||||||
|
|
||||||
var _ = Describe("Podman systemd", func() {
|
var _ = Describe("Podman systemd", func() {
|
||||||
|
|
||||||
var systemdUnitFile string
|
|
||||||
|
|
||||||
BeforeEach(func() {
|
|
||||||
podmanCmd := fmt.Sprintf("%s %s", podmanTest.PodmanBinary, strings.Join(podmanTest.MakeOptions(nil, false, false), " "))
|
|
||||||
systemdUnitFile = fmt.Sprintf(`[Unit]
|
|
||||||
Description=redis container
|
|
||||||
[Service]
|
|
||||||
Restart=always
|
|
||||||
ExecStart=%s start -a redis
|
|
||||||
ExecStop=%s stop -t 10 redis
|
|
||||||
KillMode=process
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
||||||
`, podmanCmd, podmanCmd)
|
|
||||||
})
|
|
||||||
|
|
||||||
It("podman start container by systemd", func() {
|
|
||||||
SkipIfRemote("cannot create unit file on remote host")
|
|
||||||
SkipIfContainerized("test does not have systemd as pid 1")
|
|
||||||
|
|
||||||
dashWhat := "--system"
|
|
||||||
unitDir := "/run/systemd/system"
|
|
||||||
if isRootless() {
|
|
||||||
dashWhat = "--user"
|
|
||||||
unitDir = fmt.Sprintf("%s/systemd/user", os.Getenv("XDG_RUNTIME_DIR"))
|
|
||||||
}
|
|
||||||
err := os.MkdirAll(unitDir, 0700)
|
|
||||||
Expect(err).ToNot(HaveOccurred())
|
|
||||||
|
|
||||||
serviceName := "redis-" + RandomString(10)
|
|
||||||
sysFilePath := filepath.Join(unitDir, serviceName+".service")
|
|
||||||
sysFile := os.WriteFile(sysFilePath, []byte(systemdUnitFile), 0644)
|
|
||||||
Expect(sysFile).ToNot(HaveOccurred())
|
|
||||||
defer func() {
|
|
||||||
stop := SystemExec("systemctl", []string{dashWhat, "stop", serviceName})
|
|
||||||
os.Remove(sysFilePath)
|
|
||||||
SystemExec("systemctl", []string{dashWhat, "daemon-reload"})
|
|
||||||
Expect(stop).Should(ExitCleanly())
|
|
||||||
}()
|
|
||||||
|
|
||||||
create := podmanTest.Podman([]string{"create", "--name", "redis", REDIS_IMAGE})
|
|
||||||
create.WaitWithDefaultTimeout()
|
|
||||||
Expect(create).Should(ExitCleanly())
|
|
||||||
|
|
||||||
enable := SystemExec("systemctl", []string{dashWhat, "daemon-reload"})
|
|
||||||
Expect(enable).Should(ExitCleanly())
|
|
||||||
|
|
||||||
start := SystemExec("systemctl", []string{dashWhat, "start", serviceName})
|
|
||||||
Expect(start).Should(ExitCleanly())
|
|
||||||
|
|
||||||
checkAvailableJournald()
|
|
||||||
if !journald.journaldSkip {
|
|
||||||
// "-q" needed on fc40+ because something creates /run/log/journal/XXX 2750
|
|
||||||
logs := SystemExec("journalctl", []string{dashWhat, "-q", "-n", "20", "-u", serviceName})
|
|
||||||
Expect(logs).Should(ExitCleanly())
|
|
||||||
}
|
|
||||||
|
|
||||||
status := SystemExec("systemctl", []string{dashWhat, "status", serviceName})
|
|
||||||
Expect(status.OutputToString()).To(ContainSubstring("active (running)"))
|
|
||||||
})
|
|
||||||
|
|
||||||
It("podman run container with systemd PID1", func() {
|
It("podman run container with systemd PID1", func() {
|
||||||
ctrName := "testSystemd"
|
ctrName := "testSystemd"
|
||||||
run := podmanTest.Podman([]string{"run", "--name", ctrName, "-t", "-i", "-d", SYSTEMD_IMAGE, "/sbin/init"})
|
run := podmanTest.Podman([]string{"run", "--name", ctrName, "-t", "-i", "-d", SYSTEMD_IMAGE, "/sbin/init"})
|
||||||
|
Reference in New Issue
Block a user