Attempt to turn on some more remote tests

Signed-off-by: Daniel J Walsh <[email protected]>
<MH: Fixed cherry-pick conflicts>
Signed-off-by: Matthew Heon <[email protected]>

cmd/podman/common/create.go

@@ -166,10 +166,12 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 		"env", "e", containerConfig.Env(),
 		"Set environment variables in container",
 	)
-	createFlags.BoolVar(
-		&cf.EnvHost,
-		"env-host", false, "Use all current host environment variables in container",
-	)
+	if !registry.IsRemote() {
+		createFlags.BoolVar(
+			&cf.EnvHost,
+			"env-host", false, "Use all current host environment variables in container",
+		)
+	}
 	createFlags.StringSliceVar(
 		&cf.EnvFile,
 		"env-file", []string{},

cmd/podman/containers/create.go

@@ -64,7 +64,6 @@ func createFlags(flags *pflag.FlagSet) {
 	_ = flags.MarkHidden("signature-policy")
 	if registry.IsRemote() {
 		_ = flags.MarkHidden("authfile")
-		_ = flags.MarkHidden("env-host")
 		_ = flags.MarkHidden("http-proxy")
 	}
 }

cmd/podman/containers/run.go

@@ -67,7 +67,6 @@ func runFlags(flags *pflag.FlagSet) {
 	_ = flags.MarkHidden("signature-policy")
 	if registry.IsRemote() {
 		_ = flags.MarkHidden("authfile")
-		_ = flags.MarkHidden("env-host")
 		_ = flags.MarkHidden("http-proxy")
 		_ = flags.MarkHidden("preserve-fds")
 	}

cmd/podman/images/search.go

@@ -86,11 +86,6 @@ func searchFlags(flags *pflag.FlagSet) {
 	flags.BoolVar(&searchOptions.NoTrunc, "no-trunc", false, "Do not truncate the output")
 	flags.StringVar(&searchOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
 	flags.BoolVar(&searchOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries")
-
-	if registry.IsRemote() {
-		_ = flags.MarkHidden("authfile")
-		_ = flags.MarkHidden("tls-verify")
-	}
 }
 
 // imageSearch implements the command for searching images.

docs/source/markdown/podman-search.1.md

@@ -27,7 +27,7 @@ Note, searching without a search term will only work for registries that impleme
 
 **--authfile**=*path*
 
-Path of the authentication file. Default is ${XDG\_RUNTIME\_DIR}/containers/auth.json (Not available for remote commands)
+Path of the authentication file. Default is ${XDG\_RUNTIME\_DIR}/containers/auth.json
 
 Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
 environment variable. `export REGISTRY_AUTH_FILE=path`
@@ -74,7 +74,7 @@ Do not truncate the output
 Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to true,
 then TLS verification will be used. If set to false, then TLS verification will not be used if needed. If not specified,
 default registries will be searched through (in /etc/containers/registries.conf), and TLS will be skipped if a default
-registry is listed in the insecure registries. (Not available for remote commands)
+registry is listed in the insecure registries.
 
 **--help**, **-h**
 

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,16 +220,20 @@ 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`
 
 		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")

test/e2e/exec_test.go

@@ -284,8 +284,6 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec preserves container groups with --user and --group-add", func() {
-		SkipIfRemote("FIXME: This is broken SECCOMP Failues?")
-
 		dockerfile := `FROM registry.fedoraproject.org/fedora-minimal
 RUN groupadd -g 4000 first
 RUN groupadd -g 4001 second

test/e2e/images_test.go

@@ -176,7 +176,6 @@ var _ = Describe("Podman images", func() {
 	})
 
 	It("podman images filter before image", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
 		dockerfile := `FROM docker.io/library/alpine:latest
 RUN apk update && apk add strace
 `
@@ -340,7 +339,7 @@ WORKDIR /test
 	})
 
 	It("podman images --all flag", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("FIXME This should work on podman-remote, problem is with podman-remote build")
 		podmanTest.RestoreAllArtifacts()
 		dockerfile := `FROM docker.io/library/alpine:latest
 RUN mkdir hello
@@ -372,7 +371,7 @@ LABEL "com.example.vendor"="Example Vendor"
 	})
 
 	It("podman with images with no layers", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("FIXME This should work on podman-remote, problem is with podman-remote build")
 		dockerfile := strings.Join([]string{
 			`FROM scratch`,
 			`LABEL org.opencontainers.image.authors="<[email protected]>"`,

test/e2e/load_test.go

@@ -243,7 +243,7 @@ var _ = Describe("Podman load", func() {
 	})
 
 	It("podman load localhost registry from dir", func() {
-		SkipIfRemote("FIXME: podman-remote load is currently broken.")
+		SkipIfRemote("podman-remote does not support loading directories")
 		outfile := filepath.Join(podmanTest.TempDir, "load")
 
 		setup := podmanTest.PodmanNoCache([]string{"tag", BB, "hello:world"})

test/e2e/logs_test.go

@@ -127,7 +127,7 @@ var _ = Describe("Podman logs", func() {
 	})
 
 	It("two containers showing short container IDs", func() {
-		SkipIfRemote("FIXME: remote does not support multiple containers")
+		SkipIfRemote("FIXME: podman-remote logs does not support showing two containers at the same time")
 		log1 := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
 		log1.WaitWithDefaultTimeout()
 		Expect(log1.ExitCode()).To(Equal(0))

test/e2e/namespace_test.go

@@ -33,9 +33,14 @@ var _ = Describe("Podman namespaces", func() {
 	})
 
 	It("podman namespace test", func() {
-		SkipIfRemote("FIXME This should work on Remote")
 		podman1 := podmanTest.Podman([]string{"--namespace", "test1", "run", "-d", ALPINE, "echo", "hello"})
 		podman1.WaitWithDefaultTimeout()
+		if IsRemote() {
+			// --namespace flag not supported in podman remote
+			Expect(podman1.ExitCode()).To(Equal(125))
+			Expect(podman1.ErrorToString()).To(ContainSubstring("unknown flag: --namespace"))
+			return
+		}
 		Expect(podman1.ExitCode()).To(Equal(0))
 
 		podman2 := podmanTest.Podman([]string{"--namespace", "test2", "ps", "-aq"})

test/e2e/network_create_test.go

@@ -137,7 +137,6 @@ var _ = Describe("Podman network create", func() {
 	})
 
 	It("podman network create with name and subnet", func() {
-		SkipIfRemote("FIXME, this should work on --remote")
 		var (
 			results []network.NcList
 		)

test/e2e/play_kube_test.go

@@ -793,7 +793,7 @@ var _ = Describe("Podman generate kube", func() {
 	})
 
 	It("podman play kube seccomp container level", func() {
-		SkipIfRemote("FIXME This is broken")
+		SkipIfRemote("podman-remote does not support --seccomp-profile-root flag")
 		// expect play kube is expected to set a seccomp label if it's applied as an annotation
 		jsonFile, err := podmanTest.CreateSeccompJson(seccompPwdEPERM)
 		if err != nil {
@@ -820,7 +820,7 @@ var _ = Describe("Podman generate kube", func() {
 	})
 
 	It("podman play kube seccomp pod level", func() {
-		SkipIfRemote("FIXME: This should work with --remote")
+		SkipIfRemote("podman-remote does not support --seccomp-profile-root flag")
 		// expect play kube is expected to set a seccomp label if it's applied as an annotation
 		jsonFile, err := podmanTest.CreateSeccompJson(seccompPwdEPERM)
 		if err != nil {

test/e2e/pod_infra_container_test.go

@@ -377,7 +377,6 @@ var _ = Describe("Podman pod create", func() {
 	})
 
 	It("podman run --add-host in pod", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
 		session := podmanTest.Podman([]string{"pod", "create"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))

test/e2e/pod_pod_namespaces.go

@@ -61,7 +61,6 @@ var _ = Describe("Podman pod create", func() {
 	})
 
 	It("podman pod container dontshare PIDNS", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
 		session := podmanTest.Podman([]string{"pod", "create"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))

test/e2e/prune_test.go

@@ -88,7 +88,7 @@ var _ = Describe("Podman prune", func() {
 	})
 
 	It("podman image prune skip cache images", func() {
-		SkipIfRemote("FIXME should work on podman --remote")
+		SkipIfRemote("FIXME: podman-remote build is not working the same as local build")
 		podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
 
 		none := podmanTest.Podman([]string{"images", "-a"})
@@ -110,7 +110,7 @@ var _ = Describe("Podman prune", func() {
 	})
 
 	It("podman image prune dangling images", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("FIXME: podman-remote build is not working the same as local build")
 		podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
 		podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
 
@@ -147,7 +147,6 @@ var _ = Describe("Podman prune", func() {
 	})
 
 	It("podman system image prune unused images", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
 		podmanTest.RestoreAllArtifacts()
 		podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
 		prune := podmanTest.PodmanNoCache([]string{"system", "prune", "-a", "--force"})

test/e2e/pull_test.go

@@ -234,7 +234,8 @@ var _ = Describe("Podman pull", func() {
 	})
 
 	It("podman pull from docker-archive", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("podman-remote does not support pulling from docker-archive")
+
 		podmanTest.RestoreArtifact(ALPINE)
 		tarfn := filepath.Join(podmanTest.TempDir, "alp.tar")
 		session := podmanTest.PodmanNoCache([]string{"save", "-o", tarfn, "alpine"})
@@ -296,7 +297,8 @@ var _ = Describe("Podman pull", func() {
 	})
 
 	It("podman pull from oci-archive", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("podman-remote does not support pulling from oci-archive")
+
 		podmanTest.RestoreArtifact(ALPINE)
 		tarfn := filepath.Join(podmanTest.TempDir, "oci-alp.tar")
 		session := podmanTest.PodmanNoCache([]string{"save", "--format", "oci-archive", "-o", tarfn, "alpine"})
@@ -315,7 +317,8 @@ var _ = Describe("Podman pull", func() {
 	})
 
 	It("podman pull from local directory", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("podman-remote does not support pulling from local directory")
+
 		podmanTest.RestoreArtifact(ALPINE)
 		dirpath := filepath.Join(podmanTest.TempDir, "alpine")
 		os.MkdirAll(dirpath, os.ModePerm)
@@ -340,7 +343,8 @@ var _ = Describe("Podman pull", func() {
 	})
 
 	It("podman pull from local OCI directory", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("podman-remote does not support pulling from OCI directory")
+
 		podmanTest.RestoreArtifact(ALPINE)
 		dirpath := filepath.Join(podmanTest.TempDir, "alpine")
 		os.MkdirAll(dirpath, os.ModePerm)

test/e2e/rmi_test.go

@@ -185,7 +185,8 @@ var _ = Describe("Podman rmi", func() {
 	})
 
 	It("podman rmi with cached images", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("FIXME This should work on podman-remote, problem is with podman-remote build")
+
 		session := podmanTest.PodmanNoCache([]string{"rmi", "-fa"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -255,7 +256,6 @@ var _ = Describe("Podman rmi", func() {
 	})
 
 	It("podman rmi -a with parent|child images", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
 		dockerfile := `FROM docker.io/library/alpine:latest AS base
 RUN touch /1
 ENV LOCAL=/1

test/e2e/run_entrypoint_test.go

@@ -90,7 +90,7 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
 	})
 
 	It("podman run user entrypoint overrides image entrypoint and image cmd", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
+		SkipIfRemote("FIXME: podman-remote not handling passing --entrypoint=\"\" flag correctly")
 		dockerfile := `FROM docker.io/library/alpine:latest
 CMD ["-i"]
 ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]

test/e2e/run_env_test.go

@@ -90,11 +90,15 @@ var _ = Describe("Podman run", func() {
 	})
 
 	It("podman run --env-host environment test", func() {
-		SkipIfRemote("FIXME, We should check that --env-host reports correct error on podman-remote")
 		env := append(os.Environ(), "FOO=BAR")
 		session := podmanTest.PodmanAsUser([]string{"run", "--rm", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env)
-
 		session.WaitWithDefaultTimeout()
+		if IsRemote() {
+			// podman-remote does not support --env-host
+			Expect(session.ExitCode()).To(Equal(125))
+			Expect(session.ErrorToString()).To(ContainSubstring("unknown flag: --env-host"))
+			return
+		}
 		Expect(session.ExitCode()).To(Equal(0))
 		match, _ := session.GrepString("BAR")
 		Expect(match).Should(BeTrue())
@@ -108,8 +112,11 @@ var _ = Describe("Podman run", func() {
 	})
 
 	It("podman run --http-proxy test", func() {
-		SkipIfRemote("FIXME: Should report proper error when http-proxy is not supported")
 		os.Setenv("http_proxy", "1.2.3.4")
+		if IsRemote() {
+			podmanTest.StopRemoteService()
+			podmanTest.StartRemoteService()
+		}
 		session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "http_proxy"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))

test/e2e/run_restart_test.go

@@ -33,11 +33,14 @@ var _ = Describe("Podman run restart containers", func() {
 	})
 
 	It("Podman start after successful run", func() {
-		SkipIfRemote("FIXME This should work on podman-remote")
 		session := podmanTest.Podman([]string{"run", "--name", "test", ALPINE, "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
 
+		session = podmanTest.Podman([]string{"wait", "test"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
 		session2 := podmanTest.Podman([]string{"start", "--attach", "test"})
 		session2.WaitWithDefaultTimeout()
 		Expect(session2.ExitCode()).To(Equal(0))