Commit Graph

12 Commits

Author SHA1 Message Date
Ian Campbell
0db9131e90 tests: update containerd test container
- xfsprogs is required for mkfs.xfs for some tests.
- mount persistent disk on /var/lib instead of /var.
- include host /dev (for loop devices) in mounts.
- /tmp need not be exec.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 18:07:12 +01:00
Ian Campbell
e11c1c0224 pkg: Bump to containerd v1.0.0-alpha4 and runc v1.0.0-rc4
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:16:33 +01:00
Ian Campbell
ff6d5b384a test-containerd: Drop net:host and /dev mount
net:host is the default and this test does not need the host /dev.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:11:11 +01:00
Ian Campbell
3c269d4320 test-containerd: output the revision in the test tree
So it'll appear in the logs.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:11:11 +01:00
Ian Campbell
b194a96584 test-containerd: move git clone into mirror
`${CONTAINERD_COMMIT}` is only defined in the `FROM linuxkit/alpine` section
and not the in `FROM scratch` section.

This means we were always checking out the current master at the time of build
rather than the expected commit because `git checkout $CONTAINERD_COMMIT` was
expanding to `git checkout `.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:11:11 +01:00
Rolf Neugebauer
551e43294f tests: Update alpine base to multi-arch
The following packages did not work on aarch64:
- linuxkit/test-docker-bench
- linuxkit/test-ltp
- linuxkit/test-ns
- linuxkit/test-virtsock

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Justin Cormack
b3378652e3 Fix tests that fail with true read only
Mounting a directory inside a read only container requires that to be
created in advance, but `runc` worked around that if the rootfs was not
originally read only.

You cannot even bind mount a file that does not exist into a
read only container.

The containerd test is given a disk, as running on an overlay does
not work; however it is also disabled as one of the parts of the test
is failing, needs investigation.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 13:49:40 +01:00
Ian Campbell
88ab788749 tests: reenable linuxkit.packages.containerd
The newest tests actually run containerd and therefore have some additional
requirements:
- containerd + shim + runc binaries are needed. We bind these in from the host.
  The test code should, by design, be from matching containerd source, assuming
  we remember to update test/pkg/container/Dockerfile when we bump
  CONTAINERD_COMMIT.  5217b9973b added a reminder
  to do so.
- the tests need networking (to pull images). So add dhcp to onboot and bind
  /etc/resolv.conf into the test container.
- running containers requires a writeable cgroup mount.
- containerd wants /etc/localtime, so install the UTC one (as we do in
  pkg/containerd).

The test image already has `net: host` and `capabilities: all`.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 12:06:59 +01:00
Ian Campbell
017d3304fc Update yml after containerd bump
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:45:56 +01:00
Ian Campbell
8eb6709a3c containerd: Bump to new alpine (with v1.0.0-alpha2)
The logrus import path has changed, so adjust. Also there is a minor API change
to the containerd.IOCreation() function spec, it now takes a string id which we
can ignore.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:07:03 +01:00
Ian Campbell
acbe38d8a1 tests/pkg: Update remaining builds to pkg/package.mk
Also update the base tools/alpine to latest.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:46:41 +01:00
Akihiro Suda
4699f80ef7 test: add test-containerd
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-19 11:04:58 -07:00