diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-28 13:19:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 13:19:04 -0800 |
| commit | 4f8ea996035899d3e1d00129ec1517065b341358 (patch) | |
| tree | 1b3819635f3392342cbcc1475c017df71f76d04e | |
| parent | 39a8cc7558f05fc7740a074681e9093f4594cb71 (diff) | |
| parent | 6e04ec783b0f2443f14e37601a51d35b09a7e84f (diff) | |
| download | podman-4f8ea996035899d3e1d00129ec1517065b341358.tar.gz podman-4f8ea996035899d3e1d00129ec1517065b341358.tar.bz2 podman-4f8ea996035899d3e1d00129ec1517065b341358.zip | |
Merge pull request #1714 from giuseppe/fix-rootless-tests
tests: fix rootless tests with an updated runc
| -rw-r--r-- | .papr.yml | 1 | ||||
| -rw-r--r-- | Dockerfile.Fedora | 2 | ||||
| -rw-r--r-- | test/e2e/rootless_test.go | 4 |
3 files changed, 5 insertions, 2 deletions
@@ -122,7 +122,6 @@ packages: - python3-varlink - python3-dateutil - python3-psutil - - https://kojipkgs.fedoraproject.org//packages/runc/1.0.0/55.dev.git578fe65.fc28/x86_64/runc-1.0.0-55.dev.git578fe65.fc28.x86_64.rpm tests: - sed 's/^expand-check.*/expand-check=0/g' -i /etc/selinux/semanage.conf diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index 51bcaeaf0..2080b597b 100644 --- a/Dockerfile.Fedora +++ b/Dockerfile.Fedora @@ -17,7 +17,7 @@ RUN dnf -y install btrfs-progs-devel \ libseccomp-devel \ libselinux-devel \ skopeo-containers \ - https://kojipkgs.fedoraproject.org//packages/runc/1.0.0/55.dev.git578fe65.fc28/x86_64/runc-1.0.0-55.dev.git578fe65.fc28.x86_64.rpm \ + runc \ make \ ostree-devel \ python \ diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go index c75910296..b15e6731b 100644 --- a/test/e2e/rootless_test.go +++ b/test/e2e/rootless_test.go @@ -56,6 +56,7 @@ var _ = Describe("Podman rootless", func() { commands := []string{"help", "version"} for _, v := range commands { env := os.Environ() + env = append(env, "USER=foo") cmd := podmanTest.PodmanAsUser([]string{v}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) @@ -122,6 +123,7 @@ var _ = Describe("Podman rootless", func() { env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", xdgRuntimeDir)) env = append(env, fmt.Sprintf("HOME=%s", home)) env = append(env, "PODMAN_ALLOW_SINGLE_ID_MAPPING_IN_USERNS=1") + env = append(env, "USER=foo") cmd := rootlessTest.PodmanAsUser([]string{"pod", "create", "--infra=false"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() @@ -152,6 +154,7 @@ var _ = Describe("Podman rootless", func() { env := os.Environ() env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", xdgRuntimeDir)) env = append(env, fmt.Sprintf("HOME=%s", home)) + env = append(env, "USER=foo") cmd := podmanTest.PodmanAsUser([]string{"search", "docker.io/busybox"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) @@ -165,6 +168,7 @@ var _ = Describe("Podman rootless", func() { env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", xdgRuntimeDir)) env = append(env, fmt.Sprintf("HOME=%s", home)) env = append(env, "PODMAN_ALLOW_SINGLE_ID_MAPPING_IN_USERNS=1") + env = append(env, "USER=foo") allArgs := append([]string{"run"}, args...) allArgs = append(allArgs, "--rootfs", mountPath, "echo", "hello") |