summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-14 17:59:12 +0200
committerGitHub <noreply@github.com>2020-07-14 17:59:12 +0200
commit210f1040d26334457803bc1da74667f70630a620 (patch)
treebd2c5c93236b1ba4a9e9af85df33223a49bbff76
parent3d3359086ef0ed0833a8ac8e9d06d9934d835139 (diff)
parent99cc07670099cbfa4bfc2dc7b24b39b254bc9561 (diff)
downloadpodman-210f1040d26334457803bc1da74667f70630a620.tar.gz
podman-210f1040d26334457803bc1da74667f70630a620.tar.bz2
podman-210f1040d26334457803bc1da74667f70630a620.zip
Merge pull request #6952 from baude/systemdpid1fix
add systemd to fedora image
-rw-r--r--contrib/cirrus/lib.sh1
-rw-r--r--test/e2e/config_amd64.go4
-rw-r--r--test/e2e/system_df_test.go2
-rw-r--r--test/e2e/systemd_test.go7
4 files changed, 5 insertions, 9 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 66e8060cf..2375d512e 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -392,7 +392,6 @@ install_test_configs() {
# 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
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/
}
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()