diff options
author | haircommander <pehunt@redhat.com> | 2018-08-17 10:36:51 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 18:16:28 +0000 |
commit | 2a7449362f2884d9ae6a783c0ce38979d882e2cf (patch) | |
tree | 6e7b8ab33505d210201e62faba6a50f98c0a4ea7 /test/e2e/libpod_suite_test.go | |
parent | 697b46430a8a7c2c7231078911dcec51f0c6fab5 (diff) | |
download | podman-2a7449362f2884d9ae6a783c0ce38979d882e2cf.tar.gz podman-2a7449362f2884d9ae6a783c0ce38979d882e2cf.tar.bz2 podman-2a7449362f2884d9ae6a783c0ce38979d882e2cf.zip |
Change pause container to infra container
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1187
Approved by: mheon
Diffstat (limited to 'test/e2e/libpod_suite_test.go')
-rw-r--r-- | test/e2e/libpod_suite_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 019ba9377..8c9183450 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -32,7 +32,7 @@ var ( CGROUP_MANAGER = "systemd" STORAGE_OPTIONS = "--storage-driver vfs" ARTIFACT_DIR = "/tmp/.artifacts" - CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, pause} + CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra} RESTORE_IMAGES = []string{ALPINE, BB} ALPINE = "docker.io/library/alpine:latest" BB = "docker.io/library/busybox:latest" @@ -41,7 +41,7 @@ var ( nginx = "quay.io/baude/alpine_nginx:latest" redis = "docker.io/library/redis:alpine" registry = "docker.io/library/registry:2" - pause = "k8s.gcr.io/pause:3.1" + infra = "k8s.gcr.io/pause:3.1" defaultWaitTimeout = 90 ) @@ -423,10 +423,10 @@ func (p *PodmanTest) RestoreAllArtifacts() error { return nil } -// CreatePod creates a pod with no pause container +// CreatePod creates a pod with no infra container // it optionally takes a pod name func (p *PodmanTest) CreatePod(name string) (*PodmanSession, int, string) { - var podmanArgs = []string{"pod", "create", "--pause=false", "--share", ""} + var podmanArgs = []string{"pod", "create", "--infra=false", "--share", ""} if name != "" { podmanArgs = append(podmanArgs, "--name", name) } |