From 99cc07670099cbfa4bfc2dc7b24b39b254bc9561 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Mon, 13 Jul 2020 10:34:41 -0500 Subject: 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 --- test/e2e/config_amd64.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/e2e/config_amd64.go') 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" ) -- cgit v1.2.3-54-g00ecf