diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-07 13:02:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 13:02:02 -0400 |
| commit | ce93ab354234c989c52bdbf87166e117e7c97fce (patch) | |
| tree | 5cd6445f92921c7015fbe0b9663983165bd58db3 /test/e2e/build_test.go | |
| parent | a7500e54a4646c7db477349e2530ac13df77b8fa (diff) | |
| parent | ccc5bc167fa2c140e33963bb5cce99f40ff00281 (diff) | |
| download | podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.gz podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.bz2 podman-ce93ab354234c989c52bdbf87166e117e7c97fce.zip | |
Merge pull request #7845 from rhatdan/remote
Attempt to turn on some more remote tests
Diffstat (limited to 'test/e2e/build_test.go')
| -rw-r--r-- | test/e2e/build_test.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index e3e1044aa..5155bcbc7 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -89,7 +89,6 @@ 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("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)) @@ -221,8 +220,12 @@ var _ = Describe("Podman build", func() { }) It("podman build --http_proxy flag", func() { - SkipIfRemote("FIXME: This is broken should be fixed") + SkipIfRemote("FIXME: This is broken should be fixed") // This is hanging currently. os.Setenv("http_proxy", "1.2.3.4") + if IsRemote() { + podmanTest.StopRemoteService() + podmanTest.StartRemoteService() + } podmanTest.RestoreAllArtifacts() dockerfile := `FROM docker.io/library/alpine:latest RUN printenv http_proxy` @@ -230,7 +233,7 @@ RUN printenv http_proxy` dockerfilePath := filepath.Join(podmanTest.TempDir, "Dockerfile") err := ioutil.WriteFile(dockerfilePath, []byte(dockerfile), 0755) Expect(err).To(BeNil()) - session := podmanTest.PodmanNoCache([]string{"build", "--file", dockerfilePath, podmanTest.TempDir}) + session := podmanTest.PodmanNoCache([]string{"build", "--http-proxy", "--file", dockerfilePath, podmanTest.TempDir}) session.Wait(120) Expect(session.ExitCode()).To(Equal(0)) ok, _ := session.GrepString("1.2.3.4") |