diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-10 23:52:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 23:52:59 +0200 |
| commit | dc82b3630d982b1fb9d91c65a70c7d31d901c54d (patch) | |
| tree | 6a4ddd6051deb6e6ff5e728e71031788116abb65 | |
| parent | bd80b00d5d98b65768dee1a957c2e2752a164d77 (diff) | |
| parent | 9b66d1321e283d1971d96ff757d54cb8f8037da2 (diff) | |
| download | podman-dc82b3630d982b1fb9d91c65a70c7d31d901c54d.tar.gz podman-dc82b3630d982b1fb9d91c65a70c7d31d901c54d.tar.bz2 podman-dc82b3630d982b1fb9d91c65a70c7d31d901c54d.zip | |
Merge pull request #6126 from baude/v2rootless
enable rootless integration testing
| -rw-r--r-- | .cirrus.yml | 8 | ||||
| -rw-r--r-- | test/e2e/events_test.go | 1 | ||||
| -rw-r--r-- | test/e2e/generate_kube_test.go | 1 | ||||
| -rw-r--r-- | test/e2e/libpod_suite_test.go | 6 | ||||
| -rw-r--r-- | test/e2e/mount_test.go | 1 | ||||
| -rw-r--r-- | test/e2e/play_kube_test.go | 1 | ||||
| -rw-r--r-- | 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) |