summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-18 09:07:53 -0700
committerGitHub <noreply@github.com>2018-10-18 09:07:53 -0700
commita75a888640efcbecdf80caac3004957d6b0752ed (patch)
tree2bd60b2bb4579235537ed7a2d561fdaff2b9859a
parent05cadf31d24916215188ee839b0c0a824c31b822 (diff)
parent4662d06efdad2b32b0b53f059ac6fb517ba5a472 (diff)
downloadpodman-a75a888640efcbecdf80caac3004957d6b0752ed.tar.gz
podman-a75a888640efcbecdf80caac3004957d6b0752ed.tar.bz2
podman-a75a888640efcbecdf80caac3004957d6b0752ed.zip
Merge pull request #1647 from baude/notify
fix NOTIFY_SOCKET in e2e testfix NOTIFY_SOCKET in e2e tests
-rw-r--r--.papr.yml1
-rw-r--r--.papr_prepare.sh2
-rw-r--r--Dockerfile.Fedora1
-rw-r--r--test/e2e/run_passwd_test.go8
-rw-r--r--test/e2e/run_test.go2
5 files changed, 8 insertions, 6 deletions
diff --git a/.papr.yml b/.papr.yml
index 71f9b1d2f..74741a8b8 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -12,6 +12,7 @@ required: true
timeout: 90m
tests:
+ - rpm-ostree usroverlay && rpm -Uvh https://kojipkgs.fedoraproject.org//packages/podman/0.10.1/1.gite4a1553.fc28/x86_64/podman-0.10.1-1.gite4a1553.fc28.x86_64.rpm
- CONTAINER_RUNTIME="podman" sh .papr_prepare.sh
artifacts:
diff --git a/.papr_prepare.sh b/.papr_prepare.sh
index fbb3647ce..e0657dcd2 100644
--- a/.papr_prepare.sh
+++ b/.papr_prepare.sh
@@ -14,4 +14,4 @@ fi
${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log
# Run the tests
-${CONTAINER_RUNTIME} run --rm --cap-add all --security-opt seccomp=unconfined --security-opt label=disable --net=host -v $PWD:/go/src/github.com/containers/libpod:Z --workdir /go/src/github.com/containers/libpod -e CGROUP_MANAGER=cgroupfs -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/containers/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST -e CONTAINER_RUNTIME=$CONTAINER_RUNTIME $IMAGE sh ./.papr.sh -b -i -t
+${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/containers/libpod:Z --workdir /go/src/github.com/containers/libpod -e CGROUP_MANAGER=cgroupfs -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/containers/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST -e CONTAINER_RUNTIME=$CONTAINER_RUNTIME $IMAGE sh ./.papr.sh -b -i -t
diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora
index 30653d06b..c83097227 100644
--- a/Dockerfile.Fedora
+++ b/Dockerfile.Fedora
@@ -31,6 +31,7 @@ RUN dnf -y install btrfs-progs-devel \
nmap-ncat \
xz \
slirp4netns \
+ container-selinux \
iptables && dnf clean all
# Install CNI plugins
diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go
index cea457ae4..0bea092bb 100644
--- a/test/e2e/run_passwd_test.go
+++ b/test/e2e/run_passwd_test.go
@@ -32,27 +32,27 @@ var _ = Describe("Podman run passwd", func() {
})
It("podman run no user specified ", func() {
- session := podmanTest.Podman([]string{"run", ALPINE, "mount"})
+ session := podmanTest.Podman([]string{"run", BB, "mount"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeFalse())
})
It("podman run user specified in container", func() {
- session := podmanTest.Podman([]string{"run", "-u", "bin", ALPINE, "mount"})
+ session := podmanTest.Podman([]string{"run", "-u", "bin", BB, "mount"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeFalse())
})
It("podman run UID specified in container", func() {
- session := podmanTest.Podman([]string{"run", "-u", "2:1", ALPINE, "mount"})
+ session := podmanTest.Podman([]string{"run", "-u", "2:1", BB, "mount"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeFalse())
})
It("podman run UID not specified in container", func() {
- session := podmanTest.Podman([]string{"run", "-u", "20001:1", ALPINE, "mount"})
+ session := podmanTest.Podman([]string{"run", "-u", "20001:1", BB, "mount"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeTrue())
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 052dd0566..1cd2fdf2c 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -283,7 +283,7 @@ var _ = Describe("Podman run", func() {
})
It("podman run notify_socket", func() {
- sock := "/run/sock"
+ sock := "/run/notify"
os.Setenv("NOTIFY_SOCKET", sock)
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "NOTIFY_SOCKET"})
session.WaitWithDefaultTimeout()