diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-07-13 10:34:41 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-07-13 17:11:26 -0500 |
| commit | 99cc07670099cbfa4bfc2dc7b24b39b254bc9561 (patch) | |
| tree | 70c86f1e9b77595505c820b03eab4edd3feae580 /test | |
| parent | e2a8e037d1c3a2176cd15493812bf165faea63f2 (diff) | |
| download | podman-99cc07670099cbfa4bfc2dc7b24b39b254bc9561.tar.gz podman-99cc07670099cbfa4bfc2dc7b24b39b254bc9561.tar.bz2 podman-99cc07670099cbfa4bfc2dc7b24b39b254bc9561.zip | |
Fix systemd pid 1 test
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/config_amd64.go | 4 | ||||
| -rw-r--r-- | test/e2e/system_df_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/systemd_test.go | 7 |
3 files changed, 5 insertions, 8 deletions
diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go index 7e5765ac7..151120058 100644 --- a/test/e2e/config_amd64.go +++ b/test/e2e/config_amd64.go @@ -5,9 +5,11 @@ var ( STORAGE_OPTIONS = "--storage-driver vfs" ROOTLESS_STORAGE_FS = "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" BB_GLIBC = "docker.io/library/busybox:glibc" registry = "docker.io/library/registry:2.6" labels = "quay.io/libpod/alpine_labels:latest" + ubi_minimal = "registry.access.redhat.com/ubi8-minimal" + ubi_init = "registry.access.redhat.com/ubi8-init" ) diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index 01ceac325..16a8dbb7e 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -56,7 +56,7 @@ var _ = Describe("podman system df", func() { images := strings.Fields(session.OutputToStringArray()[1]) containers := strings.Fields(session.OutputToStringArray()[2]) 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(volumes[2]).To(Equal("1")) }) diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 3db8fc3a6..a1cdff70e 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -81,13 +81,8 @@ WantedBy=multi-user.target }) 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" - 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() Expect(run.ExitCode()).To(Equal(0)) ctrID := run.OutputToString() |