From 9b66d1321e283d1971d96ff757d54cb8f8037da2 Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude@redhat.com>
Date: Thu, 7 May 2020 16:09:18 -0500
Subject: enable rootless integration testing

Signed-off-by: Brent Baude <bbaude@redhat.com>
---
 .cirrus.yml                     | 8 ++++----
 test/e2e/events_test.go         | 1 +
 test/e2e/generate_kube_test.go  | 1 +
 test/e2e/libpod_suite_test.go   | 6 ++++++
 test/e2e/mount_test.go          | 1 +
 test/e2e/play_kube_test.go      | 1 +
 test/e2e/run_networking_test.go | 1 +
 7 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7400ae0a8..10e78404a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -523,7 +523,6 @@ integration_test_temporary_task:
 # This task executes tests under unique environments/conditions
 special_testing_rootless_task:
 
-    skip: $CI == 'true'
     depends_on:
         - "gating"
         - "varlink_api"
@@ -539,9 +538,10 @@ special_testing_rootless_task:
         ADD_SECOND_PARTITION: 'true'
         SPECIALMODE: 'rootless'  # See docs
         matrix:
-            - name: remote
-              env:
-                  TEST_REMOTE_CLIENT: 'true'
+          # FIX ME ...
+          #- name: remote
+          #    env:
+          #        TEST_REMOTE_CLIENT: 'true'
             - name: local
               env:
                   TEST_REMOTE_CLIENT: 'false'
diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go
index 0636af74c..4cd5de05e 100644
--- a/test/e2e/events_test.go
+++ b/test/e2e/events_test.go
@@ -19,6 +19,7 @@ var _ = Describe("Podman events", func() {
 	)
 
 	BeforeEach(func() {
+		SkipIfRootlessV2()
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 389f2c822..1650831a5 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -21,6 +21,7 @@ var _ = Describe("Podman generate kube", func() {
 	)
 
 	BeforeEach(func() {
+		SkipIfRootlessV2()
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 29a55980c..d26f5784d 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -21,6 +21,12 @@ func SkipIfRootless() {
 	}
 }
 
+func SkipIfRootlessV2() {
+	if os.Geteuid() != 0 {
+		ginkgo.Skip("This function is not enabled for v2 rootless podman")
+	}
+}
+
 // Podman is the exec call to podman on the filesystem
 func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration {
 	podmanSession := p.PodmanBase(args, false, false)
diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go
index ac52d8c7e..bb1e129db 100644
--- a/test/e2e/mount_test.go
+++ b/test/e2e/mount_test.go
@@ -18,6 +18,7 @@ var _ = Describe("Podman mount", func() {
 	)
 
 	BeforeEach(func() {
+		SkipIfRootlessV2()
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 9daf266b8..fa943c12f 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -217,6 +217,7 @@ var _ = Describe("Podman generate kube", func() {
 	)
 
 	BeforeEach(func() {
+		SkipIfRootlessV2()
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index 375930948..6a93da085 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -19,6 +19,7 @@ var _ = Describe("Podman run networking", func() {
 	)
 
 	BeforeEach(func() {
+		SkipIfRootlessV2()
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
-- 
cgit v1.2.3-54-g00ecf