Merge pull request #6570 from rhatdan/remote

Change buildtag for remoteclient to remote for testing

64 files changed, 79 insertions, 56 deletions

diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go
index 327fda0eb..9fd1466aa 100644
--- a/test/e2e/attach_test.go
+++ b/test/e2e/attach_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index 3de7e8090..9c8078f16 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
index 10116349a..e9d60f507 100644
--- a/test/e2e/checkpoint_test.go
+++ b/test/e2e/checkpoint_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 6633f3a53..51f290159 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -468,6 +468,10 @@ func (p *PodmanTestIntegration) CleanupVolume() {
 	// Remove all containers
 	session := p.Podman([]string{"volume", "rm", "-fa"})
 	session.Wait(90)
+
+	// Stop remove service on volume cleanup
+	p.StopRemoteService()
+
 	// Nuke tempdir
 	if err := os.RemoveAll(p.TempDir); err != nil {
 		fmt.Printf("%q\n", err)
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index d8e5f2e69..23d8dd197 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index 86e485859..6fed6a0ac 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
@@ -142,7 +142,6 @@ var _ = Describe("Podman cp", func() {
 
 	It("podman cp stdin/stdout", func() {
 		SkipIfRemote()
-		Skip("Looks like SkipIfRemote() is not working")
 		session := podmanTest.Podman([]string{"create", ALPINE, "ls", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go
index 995193a7d..e52b37417 100644
--- a/test/e2e/create_staticip_test.go
+++ b/test/e2e/create_staticip_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go
index 93af5ab10..fbe11440c 100644
--- a/test/e2e/create_staticmac_test.go
+++ b/test/e2e/create_staticmac_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 1e33be013..f21f17d39 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -107,6 +107,7 @@ var _ = Describe("Podman create", func() {
 	})
 
 	It("podman create --entrypoint \"\"", func() {
+		Skip(v2remotefail)
 		session := podmanTest.Podman([]string{"create", "--entrypoint", "", ALPINE, "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go
index 5a519413e..4f744e401 100644
--- a/test/e2e/exec_test.go
+++ b/test/e2e/exec_test.go
@@ -79,6 +79,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec environment test", func() {
+		Skip(v2remotefail)
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
@@ -123,6 +124,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec terminal doesn't hang", func() {
+		Skip(v2remotefail)
 		setup := podmanTest.Podman([]string{"run", "-dti", fedoraMinimal, "sleep", "+Inf"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
@@ -157,6 +159,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec with user only in container", func() {
+		Skip(v2remotefail)
 		testUser := "test123"
 		setup := podmanTest.Podman([]string{"run", "--name", "test1", "-d", fedoraMinimal, "sleep", "60"})
 		setup.WaitWithDefaultTimeout()
@@ -173,6 +176,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec with user from run", func() {
+		Skip(v2remotefail)
 		testUser := "guest"
 		setup := podmanTest.Podman([]string{"run", "--user", testUser, "-d", ALPINE, "top"})
 		setup.WaitWithDefaultTimeout()
@@ -192,6 +196,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec simple working directory test", func() {
+		Skip(v2remotefail)
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
@@ -210,6 +215,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec missing working directory test", func() {
+		Skip(v2remotefail)
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
@@ -224,6 +230,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec cannot be invoked", func() {
+		Skip(v2remotefail)
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
@@ -234,6 +241,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec command not found", func() {
+		Skip(v2remotefail)
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 87dfa8d00..987e4779c 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 654e99531..63c12d2e8 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index 89e7d6769..6c2be1a4f 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -176,6 +176,7 @@ var _ = Describe("Podman images", func() {
 	})
 
 	It("podman images filter before image", func() {
+		Skip(v2remotefail)
 		dockerfile := `FROM docker.io/library/alpine:latest
 RUN apk update && apk add strace
 `
@@ -187,6 +188,7 @@ RUN apk update && apk add strace
 	})
 
 	It("podman images workingdir from  image", func() {
+		Skip(v2remotefail)
 		dockerfile := `FROM docker.io/library/alpine:latest
 WORKDIR /test
 `
@@ -306,6 +308,7 @@ WORKDIR /test
 	})
 
 	It("podman images --all flag", func() {
+		Skip(v2remotefail)
 		podmanTest.RestoreAllArtifacts()
 		dockerfile := `FROM docker.io/library/alpine:latest
 RUN mkdir hello
@@ -325,6 +328,7 @@ ENV foo=bar
 	})
 
 	It("podman images filter by label", func() {
+		Skip(v2remotefail)
 		dockerfile := `FROM docker.io/library/alpine:latest
 LABEL version="1.0"
 LABEL "com.example.vendor"="Example Vendor"
@@ -337,6 +341,7 @@ LABEL "com.example.vendor"="Example Vendor"
 	})
 
 	It("podman with images with no layers", func() {
+		Skip(v2remotefail)
 		dockerfile := strings.Join([]string{
 			`FROM scratch`,
 			`LABEL org.opencontainers.image.authors="<somefolks@example.org>"`,
diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go
index 5745f971b..92ee49b8b 100644
--- a/test/e2e/import_test.go
+++ b/test/e2e/import_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go
index cb1bae16d..8a071a911 100644
--- a/test/e2e/libpod_suite_remote_test.go
+++ b/test/e2e/libpod_suite_remote_test.go
@@ -1,4 +1,4 @@
-// +build remoteclient
+// +build remote
 
 package integration
 
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 009f70914..3543bd110 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index ba4928234..df2613334 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go
index c3b10efe7..3bdce970b 100644
--- a/test/e2e/login_logout_test.go
+++ b/test/e2e/login_logout_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index 298174a63..1ceab9161 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -273,6 +273,7 @@ var _ = Describe("Podman logs", func() {
 	})
 
 	It("streaming output", func() {
+		Skip(v2remotefail)
 		containerName := "logs-f-rm"
 
 		logc := podmanTest.Podman([]string{"run", "--rm", "--name", containerName, "-dt", ALPINE, "sh", "-c", "echo podman; sleep 1; echo podman"})
@@ -313,6 +314,7 @@ var _ = Describe("Podman logs", func() {
 	})
 
 	It("follow output stopped container", func() {
+		Skip(v2remotefail)
 		containerName := "logs-f"
 
 		logc := podmanTest.Podman([]string{"run", "--name", containerName, "-d", ALPINE, "true"})
diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go
index 657daedef..36d1f856d 100644
--- a/test/e2e/mount_test.go
+++ b/test/e2e/mount_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/namespace_test.go b/test/e2e/namespace_test.go
index ba8eabb8c..70472f384 100644
--- a/test/e2e/namespace_test.go
+++ b/test/e2e/namespace_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go
index a69004208..83b0ce32c 100644
--- a/test/e2e/network_create_test.go
+++ b/test/e2e/network_create_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
index deb537f6f..85f3566b1 100644
--- a/test/e2e/network_test.go
+++ b/test/e2e/network_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 63d5eff21..23604f47d 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go
index c0639e5c7..49105310b 100644
--- a/test/e2e/pod_infra_container_test.go
+++ b/test/e2e/pod_infra_container_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go
index 5e3634435..e2c2ac607 100644
--- a/test/e2e/pod_inspect_test.go
+++ b/test/e2e/pod_inspect_test.go
@@ -59,6 +59,7 @@ var _ = Describe("Podman pod inspect", func() {
 	})
 
 	It("podman pod inspect (CreateCommand)", func() {
+		Skip(v2remotefail)
 		podName := "myTestPod"
 		createCommand := []string{"pod", "create", "--name", podName, "--hostname", "rudolph", "--share", "net"}
 
diff --git a/test/e2e/pod_pod_namespaces.go b/test/e2e/pod_pod_namespaces.go
index f7ffeb7b7..fce131e20 100644
--- a/test/e2e/pod_pod_namespaces.go
+++ b/test/e2e/pod_pod_namespaces.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go
index 6386d7f29..6cf392bd7 100644
--- a/test/e2e/pod_stats_test.go
+++ b/test/e2e/pod_stats_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go
index f091ca4a2..f86d23d84 100644
--- a/test/e2e/pod_top_test.go
+++ b/test/e2e/pod_top_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go
index e8541ab71..897505588 100644
--- a/test/e2e/port_test.go
+++ b/test/e2e/port_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index 8110c3ccf..eec2877e8 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go
index 637838229..a05291d06 100644
--- a/test/e2e/push_test.go
+++ b/test/e2e/push_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go
index 43e73fd0a..ed3292139 100644
--- a/test/e2e/run_cgroup_parent_test.go
+++ b/test/e2e/run_cgroup_parent_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go
index 14cdf21cf..7c83acc40 100644
--- a/test/e2e/run_cleanup_test.go
+++ b/test/e2e/run_cleanup_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go
index 287d3a2b6..b4785c513 100644
--- a/test/e2e/run_cpu_test.go
+++ b/test/e2e/run_cpu_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go
index 3f6575b9e..a5e1e0269 100644
--- a/test/e2e/run_device_test.go
+++ b/test/e2e/run_device_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go
index 408c315fc..beed80fd2 100644
--- a/test/e2e/run_dns_test.go
+++ b/test/e2e/run_dns_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go
index c947fa863..76e021552 100644
--- a/test/e2e/run_entrypoint_test.go
+++ b/test/e2e/run_entrypoint_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go
index f8d0796a7..c6fb1ad1b 100644
--- a/test/e2e/run_env_test.go
+++ b/test/e2e/run_env_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go
index f0e65a09d..0e88c09b3 100644
--- a/test/e2e/run_memory_test.go
+++ b/test/e2e/run_memory_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index 6c049c5c1..5a463d46f 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go
index 1c1b5cfbb..96ca2fc56 100644
--- a/test/e2e/run_ns_test.go
+++ b/test/e2e/run_ns_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go
index d7f3233ef..3152f166b 100644
--- a/test/e2e/run_passwd_test.go
+++ b/test/e2e/run_passwd_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go
index 2a8ccaf64..03fb71656 100644
--- a/test/e2e/run_privileged_test.go
+++ b/test/e2e/run_privileged_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go
index e74f1dec8..0a1c7e134 100644
--- a/test/e2e/run_restart_test.go
+++ b/test/e2e/run_restart_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_seccomp.go b/test/e2e/run_seccomp.go
index 08d76bbf6..a6a14618c 100644
--- a/test/e2e/run_seccomp.go
+++ b/test/e2e/run_seccomp.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_security_labels.go b/test/e2e/run_security_labels.go
index 2f43e7373..148b18daa 100644
--- a/test/e2e/run_security_labels.go
+++ b/test/e2e/run_security_labels.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go
index c725316cb..7c1946534 100644
--- a/test/e2e/run_selinux_test.go
+++ b/test/e2e/run_selinux_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go
index 03ed6120a..d3b77ae73 100644
--- a/test/e2e/run_signal_test.go
+++ b/test/e2e/run_signal_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go
index 4dd6ba65b..8377636cf 100644
--- a/test/e2e/run_staticip_test.go
+++ b/test/e2e/run_staticip_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index f49770727..6cbedb457 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go
index c0d98f7b1..9f0466468 100644
--- a/test/e2e/run_userns_test.go
+++ b/test/e2e/run_userns_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 3963e8133..92988ff87 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go
index 97668f85f..3383fbd1e 100644
--- a/test/e2e/runlabel_test.go
+++ b/test/e2e/runlabel_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index c62e0fabd..aeab3ac56 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go
index 761b1c4ca..bf62a65f2 100644
--- a/test/e2e/start_test.go
+++ b/test/e2e/start_test.go
@@ -120,6 +120,7 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman failed to start with --rm should delete the container", func() {
+		Skip(v2remotefail)
 		session := podmanTest.Podman([]string{"create", "--name", "test1", "-it", "--rm", ALPINE, "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go
index 3d93cbeaf..009bb9cac 100644
--- a/test/e2e/stats_test.go
+++ b/test/e2e/stats_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go
index 68f76a4e7..417bba321 100644
--- a/test/e2e/stop_test.go
+++ b/test/e2e/stop_test.go
@@ -198,6 +198,7 @@ var _ = Describe("Podman stop", func() {
 	})
 
 	It("podman stop all containers with one stopped", func() {
+		Skip(v2remotefail)
 		session := podmanTest.RunTopContainer("test1")
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go
index d1a43798e..01ceac325 100644
--- a/test/e2e/system_df_test.go
+++ b/test/e2e/system_df_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go
index fb9e77b3d..3db8fc3a6 100644
--- a/test/e2e/systemd_test.go
+++ b/test/e2e/systemd_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go
index 3c4142e39..157a7fe46 100644
--- a/test/e2e/top_test.go
+++ b/test/e2e/top_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go
index 6533ffb26..62ebc903f 100644
--- a/test/e2e/trust_test.go
+++ b/test/e2e/trust_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration
 
diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go
index 9d0959ff8..e0e8d060a 100644
--- a/test/e2e/untag_test.go
+++ b/test/e2e/untag_test.go
@@ -33,6 +33,7 @@ var _ = Describe("Podman untag", func() {
 	})
 
 	It("podman untag all", func() {
+		Skip(v2remotefail)
 		tags := []string{ALPINE, "registry.com/foo:bar", "localhost/foo:bar"}
 
 		cmd := []string{"tag"}
diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go
index f7a2b1995..c4fafa406 100644
--- a/test/e2e/volume_prune_test.go
+++ b/test/e2e/volume_prune_test.go
@@ -1,4 +1,4 @@
-// +build !remoteclient
+// +build !remote
 
 package integration