summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-05-02 13:21:50 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-04 17:15:55 +0000
commit769f8f2d72dc74475bd9709aa6421ad8e1b14fc7 (patch)
tree58d05d84855ff73193b33f5d63664873a9c86381
parent522a7197a88ab4e3730387df33f22e445f0f8f3c (diff)
downloadpodman-769f8f2d72dc74475bd9709aa6421ad8e1b14fc7.tar.gz
podman-769f8f2d72dc74475bd9709aa6421ad8e1b14fc7.tar.bz2
podman-769f8f2d72dc74475bd9709aa6421ad8e1b14fc7.zip
test/e2e/run_userns_test.go: new file
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #690 Approved by: mheon
-rwxr-xr-x.papr.sh2
-rw-r--r--.travis.yml1
-rw-r--r--Dockerfile2
-rw-r--r--test/e2e/run_userns_test.go60
4 files changed, 63 insertions, 2 deletions
diff --git a/.papr.sh b/.papr.sh
index 044a7c4a9..abf43bad6 100755
--- a/.papr.sh
+++ b/.papr.sh
@@ -30,5 +30,5 @@ make TAGS="${TAGS}" install PREFIX=/usr ETCDIR=/etc
make TAGS="${TAGS}" test-binaries
# Run the ginkgo integration tests
-GOPATH=/go make localintegration
+SKIP_USERNS=1 GOPATH=/go make localintegration
exit 0
diff --git a/.travis.yml b/.travis.yml
index 64b2b9a9c..cf716afcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
language: go
sudo: required
+dist: trusty
services:
- docker
diff --git a/Dockerfile b/Dockerfile
index adead646d..d09ab31e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,7 +52,7 @@ RUN mkdir -p /usr/src/criu \
&& rm -rf /usr/src/criu
# Install runc
-ENV RUNC_COMMIT 84a082bfef6f932de921437815355186db37aeb1
+ENV RUNC_COMMIT 0cbfd8392fff2462701507296081e835b3b0b99a
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go
new file mode 100644
index 000000000..512857bcb
--- /dev/null
+++ b/test/e2e/run_userns_test.go
@@ -0,0 +1,60 @@
+package integration
+
+import (
+ "os"
+
+ . "github.com/onsi/ginkgo"
+ . "github.com/onsi/gomega"
+)
+
+var _ = Describe("Podman UserNS support", func() {
+ var (
+ tempdir string
+ err error
+ podmanTest PodmanTest
+ )
+
+ BeforeEach(func() {
+ tempdir, err = CreateTempDirInTempDir()
+ if err != nil {
+ os.Exit(1)
+ }
+ podmanTest = PodmanCreate(tempdir)
+ podmanTest.RestoreAllArtifacts()
+ })
+
+ AfterEach(func() {
+ podmanTest.Cleanup()
+
+ })
+
+ It("podman uidmapping and gidmapping", func() {
+ if os.Getenv("SKIP_USERNS") != "" {
+ Skip("Skip userns tests.")
+ }
+ if _, err := os.Stat("/proc/self/uid_map"); err != nil {
+ Skip("User namespaces not supported.")
+ }
+
+ session := podmanTest.Podman([]string{"run", "--uidmap=0:1:70000", "--gidmap=0:20000:70000", "busybox", "echo", "hello"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ ok, _ := session.GrepString("hello")
+ Expect(ok).To(BeTrue())
+ })
+
+ It("podman uidmapping and gidmapping --net=host", func() {
+ if os.Getenv("SKIP_USERNS") != "" {
+ Skip("Skip userns tests.")
+ }
+ if _, err := os.Stat("/proc/self/uid_map"); err != nil {
+ Skip("User namespaces not supported.")
+ }
+ session := podmanTest.Podman([]string{"run", "--net=host", "--uidmap=0:1:70000", "--gidmap=0:20000:70000", "busybox", "echo", "hello"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ ok, _ := session.GrepString("hello")
+ Expect(ok).To(BeTrue())
+ })
+
+})