diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-23 13:02:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-23 13:02:53 +0000 |
| commit | 7d273c40f5411df00666bd5d1ea1df5662a75517 (patch) | |
| tree | 8e5d9d2fe9656d62ba306bafa7ae82964250a68c /test/e2e/build_test.go | |
| parent | 5cedd830f7275e8dc3382502908b846bfa57a3b8 (diff) | |
| parent | a277b7eb0bedd24eecede1c88e58fce2dea89991 (diff) | |
| download | podman-7d273c40f5411df00666bd5d1ea1df5662a75517.tar.gz podman-7d273c40f5411df00666bd5d1ea1df5662a75517.tar.bz2 podman-7d273c40f5411df00666bd5d1ea1df5662a75517.zip | |
Merge pull request #7727 from rhatdan/attach
Examine all SkipIfRemote functions
Diffstat (limited to 'test/e2e/build_test.go')
| -rw-r--r-- | test/e2e/build_test.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 06054bcb4..0307b7dbc 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -38,7 +38,6 @@ var _ = Describe("Podman build", func() { // Let's first do the most simple build possible to make sure stuff is // happy and then clean up after ourselves to make sure that works too. It("podman build and remove basic alpine", func() { - SkipIfRemote() session := podmanTest.PodmanNoCache([]string{"build", "build/basicalpine"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -58,7 +57,6 @@ var _ = Describe("Podman build", func() { }) It("podman build with logfile", func() { - SkipIfRemote() logfile := filepath.Join(podmanTest.TempDir, "logfile") session := podmanTest.PodmanNoCache([]string{"build", "--tag", "test", "--logfile", logfile, "build/basicalpine"}) session.WaitWithDefaultTimeout() @@ -91,7 +89,7 @@ var _ = Describe("Podman build", func() { // Check that builds with different values for the squash options // create the appropriate number of layers, then clean up after. It("podman build basic alpine with squash", func() { - SkipIfRemote() + SkipIfRemote() // FIXME: This is broken should be fixed session := podmanTest.PodmanNoCache([]string{"build", "-f", "build/squash/Dockerfile.squash-a", "-t", "test-squash-a:latest", "build/squash"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -223,7 +221,7 @@ var _ = Describe("Podman build", func() { }) It("podman build --http_proxy flag", func() { - SkipIfRemote() + SkipIfRemote() // FIXME: This is broken should be fixed os.Setenv("http_proxy", "1.2.3.4") podmanTest.RestoreAllArtifacts() dockerfile := `FROM docker.io/library/alpine:latest |