Commit Graph

934 Commits

Author SHA1 Message Date
Ian Campbell
89e7627576 Split linuxkit.build.outputs into distinct tests
This test was building all the supported output formats and so was taking
orders of magnitude longer than every other test. It was also obscuring which
output formats were slow and/or broken.

The vhd test remains skipped.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 13:42:24 +01:00
Ian Campbell
3891a179e5 tests: Bump containerd to linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4
All tests are now using the same init+runc+containerd as the top-level
linuxkit.yml

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 10:59:43 +01:00
Ian Campbell
fa1ac99dfb Update yml's to linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4
Only those which used the same value as linuxkit.yml are updated.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 10:45:45 +01:00
Ian Campbell
a2d3be0e6f Update runc and containerd
pull in newer containerd v1.0.0-alpha0 via updated alpine base, update runc to
429a5387123625040bacfbb60d96b1cbd02293ab which is vendored by that version of
containerd (and also update alpine base for runc)

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-13 10:37:15 +01:00
Justin Cormack
298f4aab32 Consistently don't use quotes around image names
These are not needed, but we are inconsistent. Been waiting for a
quiet moment to fix this since I noticed while doing a presentation...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-09 17:47:30 +01:00
Rolf Neugebauer
be5fbb0481 tests: Add stress tests for network namespaces
These test specific combinations of TCP/UDP/IPv4/IPv6/veth/loopback
for all the kernels.

Tests take quite a while to run so there are two new labels:
'kernel' and 'kernel-extra'. 'kernel' runs the more important
tests for the two kernels we care most about. 'kernel-extra'
are additional tests for completeness.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-08 14:56:44 +01:00
Rolf Neugebauer
9fad2e8b31 tests: Add a package for network namespace stress tests
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-08 14:52:49 +01:00
Rolf Neugebauer
dca5671fc1 Update kernel version in all YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-07 18:41:33 +01:00
Magnus Skjegstad
184f643f47 tests: add hyperkit test for acpi shutdown on SIGTERM
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-06 14:07:00 +02:00
Justin Cormack
779fdc9499 Update init and containerd hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-03 14:51:23 +01:00
Rolf Neugebauer
89c40eaddb Update hashes in YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-01 19:24:16 +01:00
Rolf Neugebauer
c2c8ea8689 test: Update docker-bench to 17.06.0-ce and new URL scheme
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-01 19:24:16 +01:00
Rolf Neugebauer
699a864302 pkg: Update to new Alpine base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-01 18:11:45 +01:00
Rolf Neugebauer
4c6e0264b9 Update kernels in YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-30 18:23:29 +01:00
Magnus Skjegstad
7c2c3af3c1 tests: update DfM build test to use new blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-30 16:03:03 +02:00
Rolf Neugebauer
736713dc8f Merge pull request #2120 from dave-tucker/getty
Make it more obvious that getty/sshd are namespaced
2017-06-29 23:30:17 +01:00
Justin Cormack
c8a8bb047c Update docker-ce in Yaml files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-29 15:30:45 +01:00
Dave Tucker
71bccd6967 examples: Update to use new getty and sshd images
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-29 15:01:33 +01:00
Rolf Neugebauer
093dae22d5 Update YAML files
- Use the new style kernel tags with the full kernel version
- Update packages with new alpine base and new/simplified Makefiles.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 19:56:08 +01:00
Ian Campbell
3809391545 test: ensure ctr works in getty container
This is based on examples/getty.yml modified to drop console=tty0 from the
command line since we will be capturing/logging only the serial so want
everything to go there.

Also updates the getty example to pickup the latest containerd and
ca-certificates as used in the top level linuxkit.yml.

Fix a typo in the containerd test too.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-27 12:29:29 +01:00
Ian Campbell
ea79748830 pkg/containerd: Add /etc/localtime set to UTC
containerd/ctr includes this in the default set of bind mounts for a container.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-26 11:52:30 +01:00
Justin Cormack
c2bd284ccb Disable Qemu EFI ISO test for now
See #1872 this is very flaky and without a controlled known
working environment this is not helpful.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-23 09:46:45 -07:00
Rolf Neugebauer
8d4dfb25e6 test: Load modules before testing for filesystems
The previous commit moved some filesystems to kernel modules.
modprobe them before checking if they are enabled.

Also update the YAML files for the tests.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-22 23:31:39 +01:00
Magnus Skjegstad
7bbc39374e tests: add build test for Docker for Mac blueprint
Adds a new test group "linuxkit.build.blueprints" and a test for
building blueprints/docker-for-mac.yml.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-22 16:30:31 +02:00
Rolf Neugebauer
9fb4780493 tests: Move containerd test into alphabetical order
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-19 11:04:58 -07:00
Rolf Neugebauer
d3e0898fb7 Update containerd hash in all YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-19 11:04:58 -07: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
Ian Campbell
9d2da9cabc Update to containerd c215531a8f63a98a69134e804fea4ee6d354bb90
This includes https://github.com/containerd/containerd/pull/994 and hence
requires updating the various instances of `/etc/containerd/config.toml`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-16 13:42:24 +01:00
Ian Campbell
d51784adc0 Allow /etc/init.d/010-containerd to exit when complete
Don't think there is a need for it to remain and it drops an unnecessary
process.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-16 11:49:52 +01:00
Ian Campbell
5833d1b6bc init: replace ctr with a custom client using the containerd client library
Currently it supports only `service start <SERVICE>`, but it could grow e.g.
`stop`, `exec` etc in the future (although you can still use `ctr` for those).

In order to be able to use go-compile.sh the containerd build needs to move
from /root/go to /go as the GOPATH.

The vendoring situation is not ideal, but since this tool wants to be an exact
match for the containerd it seems tollerable to reuse its vendoring.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-16 11:48:53 +01:00
Justin Cormack
684b77d62b Merge pull request #2048 from MagnusS/vpnkit-docker-ce
pkg/docker-ce: add vpnkit-expose-port
2017-06-15 15:18:54 -07:00
Magnus Skjegstad
cc59b458f1 Update to latest pkg/docker-ce
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-15 21:50:07 +01:00
Rolf Neugebauer
9b6f708fc3 Update init in all YAML files
The new init adds the usermode helper which is needed with
the soon to be pushed new 4.11 kernel update.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-15 13:17:28 -07:00
Rolf Neugebauer
90c441ef67 Update YAML files to new init
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-13 15:57:24 -07:00
Ian Campbell
58d61d0846 tests: traverse directories before removing them during cleanup
Without `-depth` find will first `rm -rf foo` and then try to recurse into
`foo` resulting in `No such file or directory`.

With this the various `|| true` suffixes should no longer be required.

Lastly, in test/cases/040_packages/013_mkimage/test.sh cleanup any
`disk.qcow2*` detritus as well as the image itself.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 17:15:33 +01:00
Riyaz Faizullabhoy
35977c53d6 Merge pull request #2022 from justincormack/sys-in-getty
mount /sys in getty container and add and fix kernel tests
2017-06-12 09:29:44 -07:00
Justin Cormack
90a5cad216 Add filesystem tests into kernel test and fix failure cases
Make sure we do not remove filesystems we expect to have.

Fix the failure cases for the kernel tests which were not working properly
due to shell code.

Fix some 4.11 kernel changes in config that show up once tests are fixed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-12 17:25:25 +02:00
Justin Cormack
5764fba5d6 Only use console=ttyS0 for tests
If you also use console=tty0 you lose the output of commands running from
the system, as they run on the second console which is discarded.

Also drop page-poison as not relevant for tests.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-12 10:22:23 +02:00
Justin Cormack
53279e030a Migrate base linuxkit.yml to getty, and tests to new init
Missed in #2004

Not updated projects.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2017-06-10 18:40:33 +01:00
Riyaz Faizullabhoy
8726adaa78 s/moby/linuxkit for run
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-08 17:10:14 -07:00
Justin Cormack
985ddbd4d8 Re-enable content trust on build test
I disabled this for speed when content trust cache was not working

See also #1995

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-08 11:19:20 +01:00
Riyaz Faizullabhoy
b5ae1260ab Merge pull request #1982 from rneugeba/hyperkit
Convert some tests to run on hyperkit when run on OSX
2017-06-07 17:54:35 -07:00
Rolf Neugebauer
4195ff8553 tests: Run the package tests on HyperKit when running on OSX
With the updated HyperKit go bindings we can redirect the VM output
and check for test results. Use this for all kernel tests as this
speeds up running the tests on OSX.

Also use 'set -x' instead of 'set -v' for consistency and don't fail
when the clean up code fails.

The mkimage package test currently doesn't work on HyperKit as it
requires support for multiple disks to be added.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 23:31:18 +01:00
Rolf Neugebauer
d449ef6901 tests: Run kernel tests on HyperKit when running on OSX
With the updated HyperKit go bindings we can redirect the VM output
and check for test results. Use this for all kernel tests as this
speeds up running the tests on OSX.

Also enable 'set -x' so we see the commands being executed and don't
fail the test if the cleanup failed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 23:31:18 +01:00
Tycho Andersen
a208413ac0 fix package builds in some cases
0eb21735ae accidentally broke some package
builds by switching linuxkit/alpine to linuxkit/containerd. Let's revert
the ones that shouldn't be there.

Closes #1991

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-07 16:19:40 -06:00
Justin Cormack
fc52966150 Merge pull request #1983 from justincormack/mobyup
Update Moby tool
2017-06-07 20:56:26 +01:00
Justin Cormack
c8a3fd0e7a Update Moby tool
- rename img→raw and gcp-img→gcp
- support creating `docker` outputs, see https://github.com/moby/tool/tree/master/examples
- less memory usage via streaming outputs
- allow specification of multiple yaml files in a single command line, improves modularity
- notary fixes and local cache, so does not pull as much
- you now have to specify the full filename of the yaml file, you cannot omit the suffix

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-07 20:11:37 +01:00
Dave Tucker
8763da79c9 tests: Add a test case to ensure no ports are open
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-07 17:57:21 +01:00
Dave Tucker
1598b11375 Update YAML files to use new containerd package
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-07 15:30:39 +01:00
Ian Campbell
0eb21735ae Update to containerd bdf9f5f7388e8203e63a74b89800f7f3dd4a7743
Note that this is not the latest (which was 95efd45db073 at time of writing)
but the next commit 6428b4bad0c2 merges "Port ctr to use client package" breaks
the use of `ctr run --runtime-config` (by removing that option).

This contains https://github.com/containerd/containerd/pull/954 which was
causing some services to fail to start.

All previous uses of 15541037b9 are updated to
5749f2e9e6.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-07 09:38:10 +01:00