Merge pull request #6126 from baude/v2rootless

enable rootless integration testing

.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
+          # FIX ME ...
-              env:
+          #- name: remote
-                  TEST_REMOTE_CLIENT: 'true'
+          #    env:
+          #        TEST_REMOTE_CLIENT: 'true'
             - name: local
               env:
                   TEST_REMOTE_CLIENT: 'false'

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)

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)

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)

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)

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)

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)