diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-22 06:29:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 06:29:32 -0500 |
| commit | 10d52c05e23e75b9c608e100999cb55334732525 (patch) | |
| tree | 05d975ca6979e6aba836c1bdacfc74eeaaf24850 /test/e2e | |
| parent | d92b94677cc816a1e157802836195430b731d015 (diff) | |
| parent | 690c02f602eae68335192a202ba01c8097abf111 (diff) | |
| download | podman-10d52c05e23e75b9c608e100999cb55334732525.tar.gz podman-10d52c05e23e75b9c608e100999cb55334732525.tar.bz2 podman-10d52c05e23e75b9c608e100999cb55334732525.zip | |
Merge pull request #9275 from rhatdan/build
Add missing params for podman-remote build
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/build_test.go | 27 | ||||
| -rw-r--r-- | test/e2e/prune_test.go | 1 |
2 files changed, 25 insertions, 3 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index aa9b76c99..c733db61c 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -489,7 +489,7 @@ RUN grep CapEff /proc/self/status` To(ContainElement("0000000000000400")) }) - It("podman build --arch", func() { + It("podman build --isolation && --arch", func() { targetPath, err := CreateTempDirInTempDir() Expect(err).To(BeNil()) @@ -502,11 +502,34 @@ RUN grep CapEff /proc/self/status` // When session := podmanTest.Podman([]string{ - "build", "--arch", "arm64", targetPath, + "build", "--isolation", "oci", "--arch", "arm64", targetPath, }) session.WaitWithDefaultTimeout() + // Then + Expect(session.ExitCode()).To(Equal(0)) + // When + session = podmanTest.Podman([]string{ + "build", "--isolation", "chroot", "--arch", "arm64", targetPath, + }) + session.WaitWithDefaultTimeout() // Then Expect(session.ExitCode()).To(Equal(0)) + + // When + session = podmanTest.Podman([]string{ + "build", "--isolation", "rootless", "--arch", "arm64", targetPath, + }) + session.WaitWithDefaultTimeout() + // Then + Expect(session.ExitCode()).To(Equal(0)) + + // When + session = podmanTest.Podman([]string{ + "build", "--isolation", "bogus", "--arch", "arm64", targetPath, + }) + session.WaitWithDefaultTimeout() + // Then + Expect(session.ExitCode()).To(Equal(125)) }) }) diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 7c5b54c3f..73da77417 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -111,7 +111,6 @@ var _ = Describe("Podman prune", func() { It("podman image prune dangling images", func() { podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") - none := podmanTest.Podman([]string{"images", "-a"}) none.WaitWithDefaultTimeout() Expect(none.ExitCode()).To(Equal(0)) |