opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 01:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix NOTIFY_SOCKET in e2e testfix NOTIFY_SOCKET in e2e tests

Browse Source 
Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2018-10-15 13:00:07 -05:00
parent 05cadf31d2
commit 4662d06efd
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.papr.yml
View File

@ -12,6 +12,7 @@ required: true
timeout: 90m timeout: 90m
tests: 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 - CONTAINER_RUNTIME="podman" sh .papr_prepare.sh
artifacts: artifacts:

2
.papr_prepare.sh
View File

@ -14,4 +14,4 @@ fi
${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log ${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log
# Run the tests # 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

1
Dockerfile.Fedora
View File

@ -31,6 +31,7 @@ RUN dnf -y install btrfs-progs-devel \
nmap-ncat \ nmap-ncat \
xz \ xz \
slirp4netns \ slirp4netns \
container-selinux \
iptables && dnf clean all iptables && dnf clean all
# Install CNI plugins # Install CNI plugins

8
test/e2e/run_passwd_test.go
View File

@ -32,27 +32,27 @@ var _ = Describe("Podman run passwd", func() {
}) })
It("podman run no user specified ", func() { It("podman run no user specified ", func() {
session := podmanTest.Podman([]string{"run", ALPINE, "mount"}) session := podmanTest.Podman([]string{"run", BB, "mount"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeFalse()) Expect(session.LineInOutputContains("passwd")).To(BeFalse())
}) })
It("podman run user specified in container", func() { 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeFalse()) Expect(session.LineInOutputContains("passwd")).To(BeFalse())
}) })
It("podman run UID specified in container", func() { 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeFalse()) Expect(session.LineInOutputContains("passwd")).To(BeFalse())
}) })
It("podman run UID not specified in container", func() { 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOutputContains("passwd")).To(BeTrue()) Expect(session.LineInOutputContains("passwd")).To(BeTrue())

2
test/e2e/run_test.go
View File

@ -283,7 +283,7 @@ var _ = Describe("Podman run", func() {
}) })
It("podman run notify_socket", func() { It("podman run notify_socket", func() {
sock := "/run/sock" sock := "/run/notify"
os.Setenv("NOTIFY_SOCKET", sock) os.Setenv("NOTIFY_SOCKET", sock)
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "NOTIFY_SOCKET"}) session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "NOTIFY_SOCKET"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()