From 00737bd8596d0b4ff7290352364bf8fd4b784a4f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 26 May 2017 13:33:49 +0100 Subject: [PATCH] Remove outputs from the yaml files The latest version of the `moby` tool now requires that the output formats be specified in the CLI not in the yaml file. Signed-off-by: Justin Cormack --- Makefile | 2 +- README.md | 5 ++--- docs/yaml.md | 19 ------------------- examples/docker.yml | 2 -- examples/gcp.yml | 3 --- examples/minimal.yml | 2 -- examples/node_exporter.yml | 2 -- examples/packet.yml | 2 -- examples/redis-os.yml | 2 -- examples/sshd.yml | 4 ---- examples/swap.yml | 4 ---- examples/vmware.yml | 2 -- linuxkit.yml | 4 ---- .../clear-containers/clear-containers.yml | 2 -- projects/etcd/etcd.yml | 8 -------- projects/etcd/prom-us-central1-f.yml | 7 ------- projects/ima-namespace/ima-namespace.yml | 2 -- projects/kubernetes/kube-master.yml | 2 -- projects/kubernetes/kube-node.yml | 2 -- projects/landlock/landlock.yml | 4 ---- projects/logging/examples/logging.yml | 4 ---- projects/miragesdk/examples/mirage-dhcp.yml | 4 ---- projects/okernel/examples/okernel_simple.yaml | 4 ---- projects/selinux/selinux.yml | 4 ---- projects/swarmd/swarmd.yml | 4 ---- projects/wireguard/examples/wireguard.yml | 4 ---- test/Makefile | 4 ++-- test/cases/000_build/000_outputs/test.sh | 3 +-- test/cases/000_build/000_outputs/test.yml | 11 ----------- .../000_qemu/000_run_kernel/test.sh | 2 +- .../000_qemu/000_run_kernel/test.yml | 2 -- .../000_qemu/010_run_iso/test.sh | 2 +- .../000_qemu/010_run_iso/test.yml | 2 -- .../000_qemu/020_run_efi/test.sh | 2 +- .../000_qemu/020_run_efi/test.yml | 2 -- .../000_qemu/030_run_qcow/test.sh | 2 +- .../000_qemu/030_run_qcow/test.yml | 2 -- .../000_qemu/100_container/test.sh | 2 +- .../000_qemu/100_container/test.yml | 2 -- .../010_hyperkit/000_run_kernel/test.sh | 2 +- .../010_hyperkit/000_run_kernel/test.yml | 2 -- .../000_config_4.4.x/test-kernel-config.yml | 2 -- .../cases/020_kernel/000_config_4.4.x/test.sh | 2 +- .../001_config_4.9.x/test-kernel-config.yml | 2 -- .../cases/020_kernel/001_config_4.9.x/test.sh | 2 +- .../002_config_4.10.x/test-kernel-config.yml | 2 -- .../020_kernel/002_config_4.10.x/test.sh | 2 +- .../003_config_4.11.x/test-kernel-config.yml | 2 -- .../020_kernel/003_config_4.11.x/test.sh | 2 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 2 -- test/cases/020_kernel/010_kmod_4.9.x/test.sh | 2 +- .../000_docker-bench/test-docker-bench.yml | 2 -- .../040_packages/000_sysctl/test-sysctl.yml | 2 -- test/cases/040_packages/000_sysctl/test.sh | 2 +- .../040_packages/001_mkimage/mkimage.yml | 2 -- test/cases/040_packages/001_mkimage/run.yml | 2 -- test/cases/040_packages/001_mkimage/test.sh | 4 ++-- test/hack/test-ltp.yml | 2 -- test/hack/test.yml | 2 -- 59 files changed, 20 insertions(+), 164 deletions(-) diff --git a/Makefile b/Makefile index c7d7ac140..6d260e195 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ endif PREFIX?=/usr/local/ -MOBY_COMMIT=b47f3dec4a8357bc3ee4da878c402700d3fed62e +MOBY_COMMIT=1cb9fab3e13c8d3931c6f989c5d36087382e8710 bin/moby: | bin docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar tar xf tmp_moby_bin.tar > $@ diff --git a/README.md b/README.md index 9a748be9c..d4ec74729 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,8 @@ rtf -x run linuxkit.examples To customise, copy or modify the [`linuxkit.yml`](linuxkit.yml) to your own `file.yml` or use one of the [examples](examples/) and then run `moby build file.yml` to generate its specified output. You can run the output with `linuxkit run file`. -The yaml file specifies a kernel and base init system, a set of containers that are built into the generated image and started at boot time. It also specifies what -formats to output, such as bootable ISOs and images for various platforms. +The yaml file specifies a kernel and base init system, a set of containers that are built into the generated image and started at boot time. You can specify the type +of artifact to build with the `moby` tool eg `moby build -output vhd linuxkit.yml`. ### Yaml Specification @@ -89,7 +89,6 @@ The yaml format specifies the image to be built: - `onboot` are the system containers, executed sequentially in order. They should terminate quickly when done. - `services` is the system services, which normally run for the whole time the system is up - `files` are additional files to add to the image -- `outputs` are descriptions of what to build, such as ISOs. For a more detailed overview of the options see [yaml documentation](docs/yaml.md). diff --git a/docs/yaml.md b/docs/yaml.md index b435a0858..8bce1081e 100644 --- a/docs/yaml.md +++ b/docs/yaml.md @@ -47,25 +47,6 @@ integrity, and freshness guarantees for the components it verifies. The LinuxKi The image name may include tag or digest, but the matching also succeeds if the base image name is the same. - `org` lists which organizations for which Docker Content Trust is to be enforced across all images (ex: `mobylinux` is the org for `mobylinux/kernel`) -## `output` - -This section specifies the output formats that are created. Files are created with the base name of -the config file, eg `moby` for `moby.yml` or the name specified with `moby build --name ...`. Then -they will have a suffix related to the file type created, such as `moby-bzImage` or `moby.img.tar.gz`. -The generated names are output by the command for reference or scripting. - -- `kernel+initrd` outputs the raw kernel (`bzImage`), the init ramdisk, and a file with the specified - command line. This is used for example by the hyperkit driver. -- `iso-bios` outputs a CD image that is bootable via a traditional BIOS. Can also be used with Qemu. -- `iso-efi` outputs a CD image that can be used by an EFI BIOS, as required by Hyper-V and newer hardware. -- `gcp-img` outputs a compressed tarred filesystem image as used on Google Cloud Platform. -- `gcp-storage` stores the `gcp-img` in a GCP bucket. `bucket` and `project` must be specified. -- `gcp` stores the `gcp-img` as a bootable machine image, after uploading to the bucket. `bucket` and `project` - must be specified. Use `replace: true` to replace any existing image. You can specify an image `family`. -- `qcow` or `qcow2` creates a `qcow2` image for Qemu and similar systems -- `vhd` creates a VHD image. -- `vmdk` creates a VMDK image, suitable for use with VMWare. - ## Image specification For each image in the `system` and `daemon` sections you can specify the OCI options that are passed to diff --git a/examples/docker.yml b/examples/docker.yml index d040f98a0..8c82e91e3 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -62,5 +62,3 @@ trust: - linuxkit/kernel - linuxkit/binfmt - linuxkit/rngd -outputs: - - format: kernel+initrd diff --git a/examples/gcp.yml b/examples/gcp.yml index cb70e5222..d238fadc8 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -46,6 +46,3 @@ trust: image: - linuxkit/kernel - linuxkit/rngd -outputs: - - format: kernel+initrd - - format: gcp-img diff --git a/examples/minimal.yml b/examples/minimal.yml index abec67db4..6fa42fcb8 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -12,5 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: kernel+initrd diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index b4873637d..945149d92 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -24,5 +24,3 @@ trust: image: - linuxkit/kernel - linuxkit/rngd -outputs: - - format: kernel+initrd diff --git a/examples/packet.yml b/examples/packet.yml index 82d283a12..279cb1d80 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -30,5 +30,3 @@ trust: files: - path: root/.ssh/authorized_keys contents: '#your ssh key here' -outputs: - - format: kernel+initrd diff --git a/examples/redis-os.yml b/examples/redis-os.yml index a8b4494a0..98cf178f2 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -21,5 +21,3 @@ services: - CAP_SETGID - CAP_DAC_OVERRIDE net: host -outputs: - - format: kernel+initrd diff --git a/examples/sshd.yml b/examples/sshd.yml index 5cccf8733..44a501884 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -30,7 +30,3 @@ trust: files: - path: root/.ssh/authorized_keys contents: '#your ssh key here' -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/examples/swap.yml b/examples/swap.yml index fc93173a3..d1f974682 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -59,7 +59,3 @@ services: trust: image: - linuxkit/kernel -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/examples/vmware.yml b/examples/vmware.yml index cfd0a20b7..a692fa368 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -27,5 +27,3 @@ trust: image: - linuxkit/kernel - linuxkit/rngd -outputs: - - format: vmdk diff --git a/linuxkit.yml b/linuxkit.yml index 6c3e0db4f..cd6b54619 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -34,7 +34,3 @@ trust: - linuxkit/kernel - linuxkit/binfmt - linuxkit/rngd -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 1a27497ea..966051367 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -22,5 +22,3 @@ services: files: - path: etc/docker/daemon.json contents: '{"debug": true}' -outputs: - - format: kernel+initrd diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 40916a6ef..0472c5e18 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -72,11 +72,3 @@ services: binds: - /var/lib/etcd:/var/lib/etcd - /var/config/etcd:/etc/etcd - -outputs: - - format: kernel+initrd - - format: gcp - project: docker4x - bucket: rolf - family: moby-demo - replace: true diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index 7c2d03472..12d4694ba 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -35,10 +35,3 @@ services: trust: image: - mobylinux/kernel -outputs: - - format: kernel+initrd - - format: gcp - project: docker4x - bucket: rolf - family: moby-demo - replace: true diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 5da7a46b2..23e4814be 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -50,5 +50,3 @@ trust: - linuxkit/kernel - linuxkit/binfmt - linuxkit/rngd -outputs: - - format: kernel+initrd diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 3063f2eba..d3b008057 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -97,5 +97,3 @@ files: contents: '# Your ssh key goes here' - {path: etc/cni, directory: true} - {path: opt/cni, directory: true} -outputs: - - format: kernel+initrd diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 904ccb4e9..442b9279d 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -93,5 +93,3 @@ files: contents: '# Your ssh key goes here' - {path: etc/cni, directory: true} - {path: opt/cni, directory: true} -outputs: - - format: kernel+initrd diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index e1e1049cc..2ec5dc650 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -22,7 +22,3 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index c17fc96b2..801a6452e 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -33,7 +33,3 @@ files: trust: image: - mobylinux/kernel -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 6eea22d3a..0ed22cba1 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -38,7 +38,3 @@ services: files: - path: /var/run/dhcp-client/README contents: 'data for dhcp-client' -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 1fbbc1dbc..eec90e476 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -26,7 +26,3 @@ services: files: - path: root/.ssh/authorized_keys contents: '#your ssh key here' -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/projects/selinux/selinux.yml b/projects/selinux/selinux.yml index 86f6dbe1f..5f499afc3 100644 --- a/projects/selinux/selinux.yml +++ b/projects/selinux/selinux.yml @@ -19,7 +19,3 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 532fb58d7..89e115529 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -74,7 +74,3 @@ services: - /var/lib/containerd:/var/lib/containerd - /var/lib/swarmd:/var/lib/swarmd - /etc/resolv.conf:/etc/resolv.conf -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/projects/wireguard/examples/wireguard.yml b/projects/wireguard/examples/wireguard.yml index 0d0c408a4..83b661396 100644 --- a/projects/wireguard/examples/wireguard.yml +++ b/projects/wireguard/examples/wireguard.yml @@ -19,7 +19,3 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true -outputs: - - format: kernel+initrd - - format: iso-bios - - format: iso-efi diff --git a/test/Makefile b/test/Makefile index b4943e997..f68c8db32 100644 --- a/test/Makefile +++ b/test/Makefile @@ -31,7 +31,7 @@ gcp-hack: ../artifacts/test.img.tar.gz ../artifacts/test.img.tar.gz: rm -rf ../artifacts mkdir -p ../artifacts - $(MOBY) build --pull -name ../artifacts/test hack/test.yml + $(MOBY) build -output gcp-img -pull -name ../artifacts/test hack/test.yml define check_test_log @cat $1 |grep -q 'test suite PASSED' @@ -40,7 +40,7 @@ endef .PHONY: ltp ltp: export CLOUDSDK_IMAGE_NAME?=test-ltp ltp: $(LINUXKIT) test-ltp.img.tar.gz - $(MOBY) build --pull hack/test-ltp.yml + $(MOBY) build -output gcp-img -pull hack/test-ltp.yml $(LINUXKIT) push gcp test-ltp.img.tar.gz $(LINUXKIT) run gcp -skip-cleanup -machine n1-highcpu-4 $(CLOUDSDK_IMAGE_NAME) | tee test-ltp.log $(call check_test_log, test-ltp.log) diff --git a/test/cases/000_build/000_outputs/test.sh b/test/cases/000_build/000_outputs/test.sh index 7a213d778..b9bde5f65 100644 --- a/test/cases/000_build/000_outputs/test.sh +++ b/test/cases/000_build/000_outputs/test.sh @@ -17,8 +17,7 @@ clean_up() { trap clean_up EXIT -moby build -name "${NAME}" test.yml - +moby build -output tar,kernel+initrd,iso-bios,iso-efi,img-gz,qcow2,vmdk -name "${NAME}" test.yml [ -f "${NAME}.tar" ] || exit 1 [ -f "${NAME}-kernel" ] || exit 1 [ -f "${NAME}-initrd.img" ] || exit 1 diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index e4c46ec52..6fa42fcb8 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -12,14 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: tar - - format: kernel+initrd - - format: iso-bios - - format: iso-efi - - format: img-gz - - format: gcp-img - - format: qcow2 -# Disable VHD for now. It requires a lot of memory, which our CI instance currently doesn't have -# - format: vhd - - format: vmdk diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh b/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh index e44de4b5d..1095542b1 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT -moby build -name "${NAME}" test.yml +moby build -output kernel+initrd -name "${NAME}" test.yml [ -f "${NAME}-kernel" ] || exit 1 [ -f "${NAME}-initrd.img" ] || exit 1 [ -f "${NAME}-cmdline" ]|| exit 1 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 a372778b5..56a5ba4b6 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 @@ -12,5 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: kernel+initrd diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh index cba24b920..cbac96266 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh @@ -16,7 +16,7 @@ clean_up() { trap clean_up EXIT -moby build -name "${NAME}" test.yml +moby build -output iso-bios -name "${NAME}" test.yml [ -f "${NAME}.iso" ] || exit 1 linuxkit run qemu -iso "${NAME}.iso" | grep -q "Welcome to LinuxKit" exit 0 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 938e911de..56a5ba4b6 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 @@ -12,5 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: iso-bios diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.sh b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh index 08204f2fd..2552dcf8b 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.sh +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh @@ -23,7 +23,7 @@ if command -v qemu-system-x86_64; then fi fi -moby build -name "${NAME}" test.yml +moby build -output iso-efi -name "${NAME}" test.yml [ -f "${NAME}-efi.iso" ] || exit 1 linuxkit run qemu -iso -uefi "${NAME}-efi.iso" | grep -q "Welcome to LinuxKit" exit 0 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 8add0fcbb..56a5ba4b6 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 @@ -12,5 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: iso-efi diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh b/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh index 18b01fa77..4eeed1dcf 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT -moby build -name "${NAME}" test.yml +moby build -output qcow2 -name "${NAME}" test.yml [ -f "${NAME}.qcow2" ] || exit 1 linuxkit run qemu -disk-format qcow2 "${NAME}.qcow2" | grep -q "Welcome to LinuxKit" exit 0 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 ef9a6961e..56a5ba4b6 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 @@ -12,5 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: qcow2 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.sh b/test/cases/010_platforms/000_qemu/100_container/test.sh index a49216826..9433ed7d3 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.sh +++ b/test/cases/010_platforms/000_qemu/100_container/test.sh @@ -26,7 +26,7 @@ if [ -z "${QEMU}" ]; then exit $RT_CANCEL fi -moby build -name "${NAME}" test.yml +moby build -output kernel+initrd -name "${NAME}" test.yml [ -f "${NAME}-kernel" ] || exit 1 [ -f "${NAME}-initrd.img" ] || exit 1 [ -f "${NAME}-cmdline" ]|| exit 1 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 5f5a5da05..3b0cd9b69 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -12,5 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: kernel+initrd diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh index c5e41947d..31d312579 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh @@ -18,7 +18,7 @@ clean_up() { } trap clean_up EXIT -moby build -name "${NAME}" test.yml +moby build -output kernel+initrd -name "${NAME}" test.yml [ -f "${NAME}-kernel" ] || exit 1 [ -f "${NAME}-initrd.img" ] || exit 1 [ -f "${NAME}-cmdline" ]|| exit 1 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 a372778b5..56a5ba4b6 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 @@ -12,5 +12,3 @@ onboot: trust: image: - linuxkit/kernel -outputs: - - format: kernel+initrd 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 6c0db2dfb..67985faac 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 @@ -12,5 +12,3 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] -outputs: - - format: kernel+initrd diff --git a/test/cases/020_kernel/000_config_4.4.x/test.sh b/test/cases/020_kernel/000_config_4.4.x/test.sh index e01aebd06..12908d5d3 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.sh +++ b/test/cases/020_kernel/000_config_4.4.x/test.sh @@ -15,7 +15,7 @@ clean_up() { trap clean_up EXIT # Test code goes here -moby build test-kernel-config +moby build -output kernel+initrd test-kernel-config RESULT="$(linuxkit run qemu -kernel test-kernel-config)" echo "${RESULT}" | grep -q "suite PASSED" 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 ac928292b..8102961be 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 @@ -12,5 +12,3 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] -outputs: - - format: kernel+initrd diff --git a/test/cases/020_kernel/001_config_4.9.x/test.sh b/test/cases/020_kernel/001_config_4.9.x/test.sh index 17f371699..b0b4e5c02 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.sh +++ b/test/cases/020_kernel/001_config_4.9.x/test.sh @@ -15,7 +15,7 @@ clean_up() { trap clean_up EXIT # Test code goes here -moby build test-kernel-config +moby build -output kernel+initrd test-kernel-config RESULT="$(linuxkit run qemu test-kernel-config)" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml b/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml index f54ef34a3..6b8c96c52 100644 --- a/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml +++ b/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml @@ -12,5 +12,3 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] -outputs: - - format: kernel+initrd diff --git a/test/cases/020_kernel/002_config_4.10.x/test.sh b/test/cases/020_kernel/002_config_4.10.x/test.sh index 17f371699..b0b4e5c02 100644 --- a/test/cases/020_kernel/002_config_4.10.x/test.sh +++ b/test/cases/020_kernel/002_config_4.10.x/test.sh @@ -15,7 +15,7 @@ clean_up() { trap clean_up EXIT # Test code goes here -moby build test-kernel-config +moby build -output kernel+initrd test-kernel-config RESULT="$(linuxkit run qemu test-kernel-config)" echo "${RESULT}" | grep -q "suite PASSED" 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 412fb2a11..1c3c6d7ee 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 @@ -12,5 +12,3 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] -outputs: - - format: kernel+initrd diff --git a/test/cases/020_kernel/003_config_4.11.x/test.sh b/test/cases/020_kernel/003_config_4.11.x/test.sh index 17f371699..b0b4e5c02 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test.sh +++ b/test/cases/020_kernel/003_config_4.11.x/test.sh @@ -15,7 +15,7 @@ clean_up() { trap clean_up EXIT # Test code goes here -moby build test-kernel-config +moby build -output kernel+initrd test-kernel-config RESULT="$(linuxkit run qemu test-kernel-config)" echo "${RESULT}" | grep -q "suite PASSED" 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 20e430954..e4c896e68 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 @@ -16,5 +16,3 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] -outputs: - - format: kernel+initrd diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.9.x/test.sh index 528f02b0b..efff37070 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.sh +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.sh @@ -22,6 +22,6 @@ docker pull linuxkit/kernel:4.9.x # Build a package docker build -t ${IMAGE_NAME} . # Build a LinuxKit image with kernel module (and test script) -moby build kmod +moby build -output kernel+initrd kmod # Run it linuxkit run qemu kmod | grep -q "Hello LinuxKit" 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 29e6b5154..4a56fea7a 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 @@ -60,5 +60,3 @@ trust: - linuxkit/kernel - linuxkit/binfmt - linuxkit/rngd -outputs: - - format: kernel+initrd diff --git a/test/cases/040_packages/000_sysctl/test-sysctl.yml b/test/cases/040_packages/000_sysctl/test-sysctl.yml index 3edd4dd78..6471deba2 100644 --- a/test/cases/040_packages/000_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/000_sysctl/test-sysctl.yml @@ -18,5 +18,3 @@ trust: - linuxkit/kernel - linuxkit/binfmt - linuxkit/rngd -outputs: - - format: kernel+initrd diff --git a/test/cases/040_packages/000_sysctl/test.sh b/test/cases/040_packages/000_sysctl/test.sh index ebe109138..24ecb6093 100644 --- a/test/cases/040_packages/000_sysctl/test.sh +++ b/test/cases/040_packages/000_sysctl/test.sh @@ -15,7 +15,7 @@ clean_up() { trap clean_up EXIT # Test code goes here -moby build test-sysctl +moby build -output kernel+initrd test-sysctl RESULT="$(linuxkit run qemu -kernel test-sysctl)" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/001_mkimage/mkimage.yml b/test/cases/040_packages/001_mkimage/mkimage.yml index 7ff26285a..bfa8c90c4 100644 --- a/test/cases/040_packages/001_mkimage/mkimage.yml +++ b/test/cases/040_packages/001_mkimage/mkimage.yml @@ -22,5 +22,3 @@ trust: - linuxkit/kernel - linuxkit/binfmt - linuxkit/rngd -outputs: - - format: kernel+initrd diff --git a/test/cases/040_packages/001_mkimage/run.yml b/test/cases/040_packages/001_mkimage/run.yml index 69ba7fe6d..e0e14cb47 100644 --- a/test/cases/040_packages/001_mkimage/run.yml +++ b/test/cases/040_packages/001_mkimage/run.yml @@ -14,5 +14,3 @@ trust: - linuxkit/kernel - linuxkit/binfmt - linuxkit/rngd -outputs: - - format: kernel+initrd diff --git a/test/cases/040_packages/001_mkimage/test.sh b/test/cases/040_packages/001_mkimage/test.sh index 6afa72a93..c34a4452d 100644 --- a/test/cases/040_packages/001_mkimage/test.sh +++ b/test/cases/040_packages/001_mkimage/test.sh @@ -17,8 +17,8 @@ clean_up() { trap clean_up EXIT # Test code goes here -moby build run.yml -moby build mkimage.yml +moby build -output kernel+initrd run.yml +moby build -output kernel+initrd mkimage.yml linuxkit run qemu -disk-size 200 -disk-format qcow2 -disk disk.qcow2 -kernel mkimage linuxkit run qemu disk.qcow2 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 97507aa8f..f0c793650 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -20,5 +20,3 @@ onboot: files: - path: /etc/ltp/baseline contents: "100" -outputs: - - format: gcp-img diff --git a/test/hack/test.yml b/test/hack/test.yml index 806b2e9a2..44d057164 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -18,5 +18,3 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] -outputs: - - format: gcp-img