From 4699f80ef73141ee87a77d03f93065e541fab382 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 26 May 2017 08:26:33 +0000 Subject: [PATCH 1/3] test: add test-containerd Signed-off-by: Akihiro Suda Signed-off-by: Rolf Neugebauer --- pkg/containerd/Dockerfile | 4 +-- .../020_containerd/test-containerd.yml | 19 +++++++++++ .../cases/040_packages/020_containerd/test.sh | 22 +++++++++++++ test/pkg/containerd/Dockerfile | 32 +++++++++++++++++++ test/pkg/containerd/Makefile | 15 +++++++++ test/pkg/containerd/run.sh | 11 +++++++ tools/alpine/Dockerfile | 2 ++ tools/alpine/versions | 4 +-- 8 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 test/cases/040_packages/020_containerd/test-containerd.yml create mode 100644 test/cases/040_packages/020_containerd/test.sh create mode 100644 test/pkg/containerd/Dockerfile create mode 100644 test/pkg/containerd/Makefile create mode 100755 test/pkg/containerd/run.sh diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 60947a9a5..f6a297f7c 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:7cf5393e04fe0e26e9fa8f507379cacb64595918 as alpine +FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 as alpine RUN \ apk add \ btrfs-progs-dev \ @@ -10,11 +10,11 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git WORKDIR $GOPATH/src/github.com/containerd/containerd +# CONTAINERD_COMMIT is defined in linuxkit/alpine RUN git checkout $CONTAINERD_COMMIT RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/ diff --git a/test/cases/040_packages/020_containerd/test-containerd.yml b/test/cases/040_packages/020_containerd/test-containerd.yml new file mode 100644 index 000000000..c39321e7b --- /dev/null +++ b/test/cases/040_packages/020_containerd/test-containerd.yml @@ -0,0 +1,19 @@ +kernel: + image: "linuxkit/kernel:4.9.x" + cmdline: "console=ttyS0 page_poison=1" +init: + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 + - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e + - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d +onboot: + - name: sysctl + image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" + - name: test + image: "test-containerd:latest" # maintainers please push and update + - name: poweroff + image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" +trust: + org: + - linuxkit + diff --git a/test/cases/040_packages/020_containerd/test.sh b/test/cases/040_packages/020_containerd/test.sh new file mode 100644 index 000000000..12457326e --- /dev/null +++ b/test/cases/040_packages/020_containerd/test.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# SUMMARY: Run contianerd test +# LABELS: +# REPEAT: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +clean_up() { + find . -iname "test-containerd*" -not -iname "*.yml" -exec rm -rf {} \; +} +trap clean_up EXIT + +# Test code goes here +moby build test-containerd.yml +RESULT="$(linuxkit run -mem 2048 test-containerd)" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile new file mode 100644 index 000000000..8a720620f --- /dev/null +++ b/test/pkg/containerd/Dockerfile @@ -0,0 +1,32 @@ +FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 AS mirror +RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ +# btrfs-progfs is required for btrfs test (mkfs.btrfs) +# util-linux is required for btrfs test (losetup) +RUN apk add --no-cache --initdb -p /out \ + alpine-baselayout \ + busybox \ + btrfs-progs \ + btrfs-progs-dev \ + gcc \ + git \ + go \ + libc-dev \ + linux-headers \ + make \ + musl \ + util-linux +RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache + +FROM scratch +COPY --from=mirror /out/ / +ENV GOPATH=/go +RUN mkdir -p $GOPATH/src/github.com/containerd && \ + cd $GOPATH/src/github.com/containerd && \ + git clone https://github.com/containerd/containerd.git +WORKDIR $GOPATH/src/github.com/containerd/containerd +# CONTAINERD_COMMIT is defined in linuxkit/alpine +RUN git checkout $CONTAINERD_COMMIT +ADD run.sh ./run.sh + +ENTRYPOINT ["/bin/sh", "run.sh"] +LABEL org.mobyproject.config='{"net": "host", "capabilities": ["all"], "tmpfs": ["/tmp:exec"], "binds": ["/dev:/dev"]}' diff --git a/test/pkg/containerd/Makefile b/test/pkg/containerd/Makefile new file mode 100644 index 000000000..675a4a515 --- /dev/null +++ b/test/pkg/containerd/Makefile @@ -0,0 +1,15 @@ +.PHONY: tag push +default: push + +ORG?=linuxkit +IMAGE=test-containerd +DEPS=Dockerfile Makefile run.sh + +HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') + +tag: $(DEPS) + docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) . + +push: tag + DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \ + DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH) diff --git a/test/pkg/containerd/run.sh b/test/pkg/containerd/run.sh new file mode 100755 index 000000000..777c831df --- /dev/null +++ b/test/pkg/containerd/run.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +function failed { + printf "containerd test suite FAILED\n" + exit 1 +} + +# unset -race (does not work on alpine; see golang/go#14481) +export TESTFLAGS= +make root-test || failed +printf "containerd test suite PASSED\n" diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 6c543ed4e..e9fbfee87 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -54,3 +54,5 @@ COPY --from=shellcheck /usr/local/bin/shellcheck /usr/local/bin/shellcheck COPY --from=shellcheck /usr/local/lib/ /usr/local/lib/ RUN apk update && apk upgrade -a + +ARG CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90 diff --git a/tools/alpine/versions b/tools/alpine/versions index 9d1b14d08..dd4d9de37 100644 --- a/tools/alpine/versions +++ b/tools/alpine/versions @@ -49,7 +49,7 @@ glib-2.52.1-r0 gmp-6.1.2-r0 gmp-dev-6.1.2-r0 gnutls-3.5.13-r0 -go-1.8.1-r0 +go-1.8.1-r2 gummiboot-48.1-r0 hvtools-4.4.15-r0 icu-libs-58.2-r2 @@ -130,7 +130,7 @@ lzo-2.10-r0 m4-1.4.18-r0 make-4.2.1-r0 mesa-gbm-17.0.3-r1 -mkinitfs-3.1.0_rc1-r0 +mkinitfs-3.1.0-r0 mpc1-1.0.3-r0 mpfr3-3.1.5-r0 mtools-4.0.18-r1 From d3e0898fb7de5fed65c21f8667dba9937269569c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 16 Jun 2017 11:43:11 -0700 Subject: [PATCH 2/3] Update containerd hash in all YAML files Signed-off-by: Rolf Neugebauer --- examples/aws.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- linuxkit.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 2 +- test/cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test-binfmt.yml | 2 +- .../040_packages/003_ca-certificates/test-ca-certificates.yml | 2 +- test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test-sysctl.yml | 2 +- test/cases/040_packages/020_containerd/test-containerd.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index d89f63928..2407e9da9 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index 70241cce6..a4fa74426 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 5d0dce48f..0a44e1ffb 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 3284bc4fe..64ec4aba6 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 380bff9ea..556f28e83 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e services: - name: getty image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" diff --git a/examples/packet.yml b/examples/packet.yml index 3c828f1da..e66a954e4 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e231d209f..e6e66cfb2 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/sshd.yml b/examples/sshd.yml index ad098c435..5f6faeca2 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index 4645be7a7..450b044b7 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 9856d1454..7844e621a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 56443354a..40aa8ec1f 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 7eab63c29..d66eb2f25 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/linuxkit.yml b/linuxkit.yml index 45e44c33b..984c946bd 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index b1242f01d..7f1f1667d 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 9f62e945a..ed1828af9 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index bba91eeff..402b065ff 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 47675a6c7..e918254df 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 076cdd1ac..b854d05b1 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 # with runc, logwrite, startmemlogd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 1e6915b51..09a25db7d 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: sysctl image: linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index ae92b6198..134f55ad6 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 5d158de3d..ee25c58db 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 162852e0e..ebcb3c198 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index ba70b8e84..f0843b890 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index afc6a0979..14f0f1b2c 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index ba70b8e84..f0843b890 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index ba70b8e84..f0843b890 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index ba70b8e84..f0843b890 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 890990de4..09a1afcbc 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index ba70b8e84..f0843b890 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 1ae34aa05..8be062ad7 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index 109a9198f..eb0b1e728 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index 4cff3d755..912ae7f3b 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 31b3dc457..4a21bdcd3 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: check image: "kmod-test" diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index 676912f4d..a57c37690 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 286edd365..33f87d724 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: test image: "alpine:3.6" diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index ec89b116f..87ed4b8ae 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: binfmt image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index b3669f245..46a4a7a21 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: test diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index d6008c800..239457d63 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index fd49a20e0..bbed48ee2 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: mkimage image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3" diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 4a977f146..da78ff808 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index 3125a4248..116056dfc 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" diff --git a/test/cases/040_packages/020_containerd/test-containerd.yml b/test/cases/040_packages/020_containerd/test-containerd.yml index c39321e7b..46fbc7ccf 100644 --- a/test/cases/040_packages/020_containerd/test-containerd.yml +++ b/test/cases/040_packages/020_containerd/test-containerd.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" - name: test - image: "test-containerd:latest" # maintainers please push and update + image: "linuxkit/test-containerd:b9b6046f1eb8ed8a15eb70523bc584e7da657baa" - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" trust: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index fe3f69bb3..7f82a7701 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: ltp image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d" diff --git a/test/hack/test.yml b/test/hack/test.yml index 200b640e0..3989ffe0f 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 + - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" From 9fb4780493143a6c98f9c432f3e57b8d3e912337 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 16 Jun 2017 11:48:53 -0700 Subject: [PATCH 3/3] tests: Move containerd test into alphabetical order Signed-off-by: Rolf Neugebauer --- .../{020_containerd => 003_containerd}/test-containerd.yml | 0 .../cases/040_packages/{020_containerd => 003_containerd}/test.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/cases/040_packages/{020_containerd => 003_containerd}/test-containerd.yml (100%) rename test/cases/040_packages/{020_containerd => 003_containerd}/test.sh (100%) diff --git a/test/cases/040_packages/020_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml similarity index 100% rename from test/cases/040_packages/020_containerd/test-containerd.yml rename to test/cases/040_packages/003_containerd/test-containerd.yml diff --git a/test/cases/040_packages/020_containerd/test.sh b/test/cases/040_packages/003_containerd/test.sh similarity index 100% rename from test/cases/040_packages/020_containerd/test.sh rename to test/cases/040_packages/003_containerd/test.sh