From 2c81a756e310d59702b52ffc30d84aa9e11a8dbd Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 21 Jun 2018 09:53:29 -0400 Subject: Update the version of conmon used in test Also start using podmin in /usr/libexec/podman rather then crio. Signed-off-by: Daniel J Walsh Closes: #979 Approved by: baude --- .papr_prepare.sh | 2 +- Dockerfile | 20 ++++++-------------- Dockerfile.CentOS | 9 +++++---- Dockerfile.Fedora | 9 +++++---- contrib/spec/podman.spec.in | 2 +- docs/tutorials/podman_tutorial.md | 2 +- test/e2e/libpod_suite_test.go | 4 ++-- test/e2e/run_ns_test.go | 9 +++++---- test/e2e/run_signal_test.go | 2 +- 9 files changed, 27 insertions(+), 32 deletions(-) diff --git a/.papr_prepare.sh b/.papr_prepare.sh index 24f55c5b1..8b9679a26 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 --privileged --net=host -v $PWD:/go/src/github.com/projectatomic/libpod --workdir /go/src/github.com/projectatomic/libpod -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/projectatomic/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/crio/conmon" -e DIST=$DIST $IMAGE sh .papr.sh +${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/projectatomic/libpod --workdir /go/src/github.com/projectatomic/libpod -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/projectatomic/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST $IMAGE sh .papr.sh diff --git a/Dockerfile b/Dockerfile index bb8adbfe2..1ae4de13f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8 +FROM golang:1.10 RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list @@ -37,6 +37,7 @@ RUN apt-get update && apt-get install -y \ socat \ python3-pip \ python3-dateutil \ + python3-setuptools \ --no-install-recommends \ && apt-get clean @@ -44,16 +45,8 @@ ADD . /go/src/github.com/projectatomic/libpod RUN set -x && cd /go/src/github.com/projectatomic/libpod && make install.libseccomp.sudo -# install criu -ENV CRIU_VERSION 1.7 -RUN mkdir -p /usr/src/criu \ - && curl -sSL https://github.com/xemul/criu/archive/v${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \ - && cd /usr/src/criu \ - && make install-criu \ - && rm -rf /usr/src/criu - # Install runc -ENV RUNC_COMMIT 0cbfd8392fff2462701507296081e835b3b0b99a +ENV RUNC_COMMIT ad0f5255060d36872be04de22f8731f38ef2d7b1 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -65,16 +58,15 @@ RUN set -x \ && rm -rf "$GOPATH" # Install conmon -ENV CRIO_COMMIT 814c6ab0913d827543696b366048056a31d9529c +ENV CRIO_COMMIT 66788a10e57f42faf741c2f149d0ee6635063014 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && git fetch origin --tags \ && git checkout -q "$CRIO_COMMIT" \ - && mkdir bin \ - && make conmon \ - && install -D -m 755 bin/conmon /usr/libexec/crio/conmon \ + && make \ + && install -D -m 755 bin/conmon /usr/libexec/podman/conmon \ && rm -rf "$GOPATH" # Install CNI plugins diff --git a/Dockerfile.CentOS b/Dockerfile.CentOS index db7cb839e..865585cfd 100644 --- a/Dockerfile.CentOS +++ b/Dockerfile.CentOS @@ -6,6 +6,7 @@ RUN yum -y install btrfs-progs-devel \ device-mapper-devel \ findutils \ git \ + glibc-static \ glib2-devel \ gnupg \ golang \ @@ -56,16 +57,16 @@ RUN set -x \ && go get github.com/onsi/gomega/... # Install conmon -ENV CRIO_COMMIT 814c6ab0913d827543696b366048056a31d9529c +ENV CRIO_COMMIT 66788a10e57f42faf741c2f149d0ee6635063014 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && git fetch origin --tags \ && git checkout -q "$CRIO_COMMIT" \ - && mkdir bin \ - && make conmon \ - && install -D -m 755 bin/conmon /usr/libexec/crio/conmon \ + && make \ + && make bin/conmon \ + && install -D -m 755 bin/conmon /usr/libexec/podman/conmon \ && rm -rf "$GOPATH" # Install cni config diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index f75074213..589180beb 100644 --- a/Dockerfile.Fedora +++ b/Dockerfile.Fedora @@ -8,6 +8,7 @@ RUN dnf -y install btrfs-progs-devel \ findutils \ git \ glib2-devel \ + glibc-static \ gnupg \ golang \ golang-github-cpuguy83-go-md2man \ @@ -58,16 +59,16 @@ RUN set -x \ && go get github.com/onsi/gomega/... # Install conmon -ENV CRIO_COMMIT 814c6ab0913d827543696b366048056a31d9529c +ENV CRIO_COMMIT 66788a10e57f42faf741c2f149d0ee6635063014 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && git fetch origin --tags \ && git checkout -q "$CRIO_COMMIT" \ - && mkdir bin \ - && make conmon \ - && install -D -m 755 bin/conmon /usr/libexec/crio/conmon \ + && make \ + && make bin/conmon \ + && install -D -m 755 bin/conmon /usr/libexec/podman/conmon \ && rm -rf "$GOPATH" # Install cni config diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 7ecdba703..a1aa5ff44 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -80,7 +80,7 @@ BuildRequires: runc BuildRequires: skopeo-containers Requires: runc Requires: skopeo-containers -Requires: conmon +Requires: conmon >= 1.10.1 Requires: iptables Requires: containernetworking-cni Requires: atomic-registries diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md index bde11fd53..9e569c3cf 100644 --- a/docs/tutorials/podman_tutorial.md +++ b/docs/tutorials/podman_tutorial.md @@ -54,7 +54,7 @@ $ sudo apt-get install libdevmapper-dev libglib2.0-dev libgpgme11-dev golang lib # cd ~/src/github.com/kubernetes-incubator/cri-o # mkdir bin # make conmon -$ sudo install -D -m 755 bin/conmon /usr/libexec/crio/conmon +$ sudo install -D -m 755 bin/conmon /usr/libexec/podman/conmon ``` #### Adding required configuration files ``` diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 3d444f662..542122daf 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -28,7 +28,7 @@ import ( "github.com/projectatomic/libpod/pkg/inspect" ) -// - CRIO_ROOT=/var/tmp/checkout PODMAN_BINARY=/usr/bin/podman CONMON_BINARY=/usr/libexec/crio/conmon PAPR=1 sh .papr.sh +// - CRIO_ROOT=/var/tmp/checkout PODMAN_BINARY=/usr/bin/podman CONMON_BINARY=/usr/libexec/podman/conmon PAPR=1 sh .papr.sh // PODMAN_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY} --conmon ${CONMON_BINARY} --cni-config-dir ${LIBPOD_CNI_CONFIG}" //TODO do the image caching @@ -131,7 +131,7 @@ func PodmanCreate(tempDir string) PodmanTest { if os.Getenv("PODMAN_BINARY") != "" { podmanBinary = os.Getenv("PODMAN_BINARY") } - conmonBinary := filepath.Join("/usr/libexec/crio/conmon") + conmonBinary := filepath.Join("/usr/libexec/podman/conmon") altConmonBinary := "/usr/libexec/podman/conmon" if _, err := os.Stat(altConmonBinary); err == nil { conmonBinary = altConmonBinary diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 1dfec9f64..ccc534780 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -46,16 +46,17 @@ var _ = Describe("Podman run ns", func() { }) It("podman run ipcns test", func() { - setup := podmanTest.SystemExec("mktemp", []string{"/dev/shm/podmantest.XXXX)"}) + testFile := "/dev/shm/podmantest" + setup := podmanTest.SystemExec("touch", []string{testFile}) setup.WaitWithDefaultTimeout() Expect(setup.ExitCode()).To(Equal(0)) - session := podmanTest.Podman([]string{"run", "--ipc=host", fedoraMinimal, "ls", setup.OutputToString()}) + session := podmanTest.Podman([]string{"run", "--ipc=host", fedoraMinimal, "ls", testFile}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring(setup.OutputToString())) + Expect(session.OutputToString()).To(ContainSubstring(testFile)) - err := os.Remove(setup.OutputToString()) + err := os.Remove(testFile) Expect(err).To(BeNil()) }) diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 57beaee6f..9a9f5d1ad 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -133,7 +133,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { Expect(killSession.ExitCode()).To(Equal(0)) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session.ExitCode()).To(Equal(137)) ok, _ = session.GrepString(fmt.Sprintf("Received %d", signal)) Expect(ok).To(BeFalse()) }) -- cgit v1.2.3-54-g00ecf