Commit Graph

6694 Commits

Author SHA1 Message Date
Justin Cormack
c734b47e9c Add support for override of parameters using a label
Using the label `org.mobyproject.config` will use that JSON
(or yaml, but it is very hard to get yaml into a label as newlines are
not respected) for parameters that are not explicitly set in the yaml file.

Had to change parameter definitions so override behaves as expected.

fix #16

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-18 17:48:15 +01:00
Ian Campbell
bb787b49be Allow forcing qemu backend to use container via command line
`linuxkit run --containerized foo`

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-18 17:19:01 +01:00
Justin Cormack
b0e506aa71 Merge pull request #1851 from riyazdf/sig-agenda-update
update SIG agenda with IMA namespace support
2017-05-18 14:35:16 +01:00
Riyaz Faizullabhoy
38e740b068 update SIG agenda with IMA namespace support
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-17 09:41:52 -07:00
Rolf Neugebauer
5fca56e356 Merge pull request #1830 from rneugeba/tests
Tidy up the tests
2017-05-17 15:14:55 +01:00
Rolf Neugebauer
cd354c2ab1 docs: Improve testing.md
- Add 'rtf list'
- Add section about test logs
- Fis a few typos

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
6fbbb4d756 test: Don't run 'rtf' in verbose mode
The detailed logs should be gathered by linuxkit-ci
and having the default output makes it easier to spot
which test failed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
b03beb94ef tests: Add back the hack for running tests on GCP
These tests should be run via rtf but currently are
run via linuxkit-ci. This is a hack and hopefully is now
marked more clearly as such.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
509be016d2 tests: Remove LINUXKIT_ARTIFACTS_DIR from tests
This was a hack in the first place and will be replaced by
another, more obvious hack in the next commit.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
188ee6d226 tests: Delete README.md. It contained mostly inaccurate information
This should be replaced with more comprehensive documentation in
./doc/testing.md once the CI is fixed

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
316a40f20a tests: Sanity check when we run GCP tests
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
ddb4221c1f tests: Consolidate platform tests
There is no need to split the build from run as we have separate build tests

Also shuffle the order around a little. Double digit numbers are for local hypervisor
tests and tripple digit tests are for cloud.

Removed GCP test as they weren't run.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
e975d95b03 Merge pull request #1849 from rneugeba/kbuild
kernel: Add vmlinux to debug builds
2017-05-17 13:50:27 +01:00
Rolf Neugebauer
e6f2b68419 kernel: Add vmlinux to debug builds
The vmlinux image is the un-stripped kernel image containing
full debug information which is useful for kernel debugging.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 11:40:56 +01:00
Justin Cormack
fb856cbc1d Merge pull request #1844 from rneugeba/4.11-up
Update Hyper-V patches for 4.11 and add Hub org override for kernel builds
2017-05-16 17:23:57 +01:00
Rolf Neugebauer
4b50134bde kernel: Make the Docker Hub organisation configurable
For local testinf it is useful to store packages under a different
organisation on the hub (or indeed to select a different registry).
This is enabled by making the ORG configurable when calling make.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-16 16:28:16 +01:00
Rolf Neugebauer
0f9ec7f1d2 kernel: Update Hyper-V socket patches for 4.11
While testing the patches on Windows we found some issues
which commit d0e6020dd2b25f8880 ("hvsock: fix a race in
hvs_stream_dequeue()") (cherry-picked as 0009) attempts to
fix.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-16 16:24:50 +01:00
Rolf Neugebauer
9eb710411a tests: Add a linux.build group to test 'moby build'
- Add a tests which generates all supported outputs
- move the examples build tests to the new group

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-16 15:53:56 +01:00
Rolf Neugebauer
cb2b74cfc9 tests: Rename linuxkit.config to linuxkit.kernel
Removed LTP tests and the stress test group as hey weren't run via rtf.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-16 15:39:34 +01:00
Justin Cormack
2aec868710 Merge pull request #1840 from dave-tucker/ci-docs
Document the CI setup
2017-05-16 15:36:28 +01:00
Justin Cormack
78d927104b Merge pull request #1842 from dave-tucker/fix-langs
Fix Github language detection
2017-05-16 15:34:19 +01:00
Dave Tucker
f266d4c59b Fix Github language detection
Ignore go files in `vendor`
Kernel config files are text and not Logos

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-16 15:03:04 +01:00
Justin Cormack
1fa78e42d4 Merge pull request #1838 from rneugeba/kerndoc
docs: Add a section on custom kernel builds
2017-05-16 13:24:08 +01:00
Dave Tucker
562b12a639 Document the CI setup
Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-16 13:02:31 +01:00
Rolf Neugebauer
6c4722d4a9 docs: Add a section on custom kernel builds
fixes #1835

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-16 10:09:22 +01:00
Justin Cormack
9fd743a28f Merge pull request #1834 from riyazdf/fix-links
Update security SIG reports link
2017-05-15 22:35:32 +01:00
Riyaz Faizullabhoy
1964102d4c Update SIG reports link
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-15 14:02:48 -07:00
Riyaz Faizullabhoy
94a5f5c869 Merge pull request #1833 from riyazdf/security-sig
Add security SIG info and notes
2017-05-15 14:00:04 -07:00
Riyaz Faizullabhoy
ab29274028 Add security SIG info and notes
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-15 13:34:51 -07:00
Justin Cormack
df7f50a755 Merge pull request #37 from riyazdf/circle-fix
Fixup circle CI
2017-05-15 19:59:51 +01:00
Riyaz Faizullabhoy
57f1a5bdf2 Fixup circle CI
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-15 11:55:53 -07:00
Rolf Neugebauer
70f9b60734 Merge pull request #1831 from MagnusS/add-hyperkit-vsock-fwd
Add option for forwarding vsock ports in linuxrun for hyperkit
2017-05-15 19:36:08 +01:00
Magnus Skjegstad
f0e7e41424 linuxrun: add -vsock-ports option to HyperKit
When `-vsock-ports` is specified, the listed guest vsock
ports will be made available through unix domain sockets
in the state directory.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-15 20:14:30 +02:00
Magnus Skjegstad
11bd203a91 vendor: Update hyperkit to latest version
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-15 20:14:30 +02:00
Justin Cormack
219847ff1a Merge pull request #36 from riyazdf/fix-circle
Update working dir and get golint for circle tests
2017-05-15 18:25:45 +01:00
Riyaz Faizullabhoy
62f8a69b38 Update working dir and get golint for circle tests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-15 10:17:16 -07:00
Riyaz Faizullabhoy
c168d99cc0 Merge pull request #1832 from justincormack/windows-fixes
Update vendoring and fix Windows build
2017-05-15 10:02:07 -07:00
Justin Cormack
b48e969bf8 Merge pull request #34 from riyazdf/simple-test
Simple test target
2017-05-15 17:59:22 +01:00
Riyaz Faizullabhoy
039e4f6f60 Change to tar output
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-15 09:58:26 -07:00
Justin Cormack
4751d70b18 Update vendoring and fix Windows build
We were missing one repo needed for Windows; but we have also not deleted
a bunch of vendored code that we are no longer using.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-15 17:43:04 +01:00
Justin Cormack
d7611ee0e3 Merge pull request #35 from justincormack/windows-fixes
Update vendoring for Windows support
2017-05-15 17:36:29 +01:00
Justin Cormack
5a226337a9 Update vendoring for Windows support
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-15 17:32:10 +01:00
Riyaz Faizullabhoy
d020a54aa7 Sample circle yml, not hooked in yet
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-15 09:27:34 -07:00
Riyaz Faizullabhoy
39d74773fc Simple make test target
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-15 09:27:29 -07:00
Justin Cormack
8c59c66943 Merge pull request #1829 from justincormack/report=15-may
Add development report for 15 May 2017
2017-05-15 15:00:51 +01:00
Justin Cormack
a199833cd8 Add development report for 15 May 2017
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-15 14:41:30 +01:00
Rolf Neugebauer
318cf6841c Merge pull request #1827 from rneugeba/state
Use a "state" directory for linuxkit run state and enable virtio sockets
2017-05-15 13:48:28 +01:00
Rolf Neugebauer
a16d1683f8 cmd: Add a -state argument to VMware runner
The state directory is used to store any user data disk images
and the .vmx file. At run time, it is also used to keep
various other files, such as the nvram, log and lock files, etc.

While at it, also clean up the code a little more and fix the
handling of the "-disk-size" argument when no "-disk" argument
is specified. This brings it in line with the other runners.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-15 12:13:55 +01:00
Rolf Neugebauer
243967db6f cmd: Unify the coding style somewhat
There is no need to prefix local variables and try to name
variables which refer to the same/simialr thing the same
across runners.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-15 12:09:48 +01:00
Rolf Neugebauer
5231e06dec cmd: Add a -state option to hyperkit runner (and enable vsock)
The state directory is used to store:
- the disk image, if not specified via '-disk'
- the ISO for metadata, if '-data' is used
- the Unix domain socket for virtio sockets
- the PID of the hyperkit process
- a JSON file with the hyperkit configuration

This patch also enables the virtio socket device for the VM.

While at it, also fix .gitignore to ignore kernel images again.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-15 12:09:48 +01:00