opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix systemd pid 1 test

Browse Source 
fedora removed the systemd package from its standard container image causing our systemd pid1 test to fail.  Replacing usage of fedora to ubi-init.

adding ubi images to the cache for local tests.

also, remove installation of test/policy.json to the system wide /etc/containers

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-07-13 10:34:41 -05:00
parent e2a8e037d1
commit 99cc076700
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/cirrus/lib.sh
View File

@ -392,7 +392,6 @@ install_test_configs() {
# as the default). This config prevents allocation of network address space used # as the default). This config prevents allocation of network address space used
# by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges # by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges
install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/ install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/
install -v -D -m 644 ./test/policy.json /etc/containers/
install -v -D -m 644 ./test/registries.conf /etc/containers/ install -v -D -m 644 ./test/registries.conf /etc/containers/
} }

4
test/e2e/config_amd64.go
View File

@ -5,9 +5,11 @@ var (
STORAGE_OPTIONS = "--storage-driver vfs" STORAGE_OPTIONS = "--storage-driver vfs"
ROOTLESS_STORAGE_FS = "vfs" ROOTLESS_STORAGE_FS = "vfs"
ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs"
CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck} CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck, ubi_init, ubi_minimal}
nginx = "quay.io/libpod/alpine_nginx:latest" nginx = "quay.io/libpod/alpine_nginx:latest"
BB_GLIBC = "docker.io/library/busybox:glibc" BB_GLIBC = "docker.io/library/busybox:glibc"
registry = "docker.io/library/registry:2.6" registry = "docker.io/library/registry:2.6"
labels = "quay.io/libpod/alpine_labels:latest" labels = "quay.io/libpod/alpine_labels:latest"
ubi_minimal = "registry.access.redhat.com/ubi8-minimal"
ubi_init = "registry.access.redhat.com/ubi8-init"
) )

2
test/e2e/system_df_test.go
View File

@ -56,7 +56,7 @@ var _ = Describe("podman system df", func() {
images := strings.Fields(session.OutputToStringArray()[1]) images := strings.Fields(session.OutputToStringArray()[1])
containers := strings.Fields(session.OutputToStringArray()[2]) containers := strings.Fields(session.OutputToStringArray()[2])
volumes := strings.Fields(session.OutputToStringArray()[3]) volumes := strings.Fields(session.OutputToStringArray()[3])
Expect(images[1]).To(Equal("9")) Expect(images[1]).To(Equal("11"))
Expect(containers[1]).To(Equal("2")) Expect(containers[1]).To(Equal("2"))
Expect(volumes[2]).To(Equal("1")) Expect(volumes[2]).To(Equal("1"))
}) })

7
test/e2e/systemd_test.go
View File

@ -81,13 +81,8 @@ WantedBy=multi-user.target
}) })
It("podman run container with systemd PID1", func() { It("podman run container with systemd PID1", func() {
systemdImage := "fedora"
pull := podmanTest.Podman([]string{"pull", systemdImage})
pull.WaitWithDefaultTimeout()
Expect(pull.ExitCode()).To(Equal(0))
ctrName := "testSystemd" ctrName := "testSystemd"
run := podmanTest.Podman([]string{"run", "--name", ctrName, "-t", "-i", "-d", systemdImage, "/usr/sbin/init"}) run := podmanTest.Podman([]string{"run", "--name", ctrName, "-t", "-i", "-d", ubi_init, "/sbin/init"})
run.WaitWithDefaultTimeout() run.WaitWithDefaultTimeout()
Expect(run.ExitCode()).To(Equal(0)) Expect(run.ExitCode()).To(Equal(0))
ctrID := run.OutputToString() ctrID := run.OutputToString()