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 <justin.cormack@docker.com>

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)

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

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

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

test/cases/010_platforms/000_qemu/000_run_kernel/test.yml

@@ -12,5 +12,3 @@ onboot:
 trust:
   image:
     - linuxkit/kernel
-outputs:
-  - format: kernel+initrd

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

test/cases/010_platforms/000_qemu/010_run_iso/test.yml

@@ -12,5 +12,3 @@ onboot:
 trust:
   image:
     - linuxkit/kernel
-outputs:
-  - format: iso-bios

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

test/cases/010_platforms/000_qemu/020_run_efi/test.yml

@@ -12,5 +12,3 @@ onboot:
 trust:
   image:
     - linuxkit/kernel
-outputs:
-  - format: iso-efi

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

test/cases/010_platforms/000_qemu/030_run_qcow/test.yml

@@ -12,5 +12,3 @@ onboot:
 trust:
   image:
     - linuxkit/kernel
-outputs:
-  - format: qcow2

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

test/cases/010_platforms/000_qemu/100_container/test.yml

@@ -12,5 +12,3 @@ onboot:
 trust:
   image:
     - linuxkit/kernel
-outputs:
-  - format: kernel+initrd

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

test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml

@@ -12,5 +12,3 @@ onboot:
 trust:
   image:
     - linuxkit/kernel
-outputs:
-  - format: kernel+initrd

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

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"
 

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

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"
 

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

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"
 

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

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"
 

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

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"

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

test/cases/040_packages/000_sysctl/test-sysctl.yml

@@ -18,5 +18,3 @@ trust:
     - linuxkit/kernel
     - linuxkit/binfmt
     - linuxkit/rngd
-outputs:
-  - format: kernel+initrd

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"
 

test/cases/040_packages/001_mkimage/mkimage.yml

@@ -22,5 +22,3 @@ trust:
     - linuxkit/kernel
     - linuxkit/binfmt
     - linuxkit/rngd
-outputs:
-  - format: kernel+initrd

test/cases/040_packages/001_mkimage/run.yml

@@ -14,5 +14,3 @@ trust:
     - linuxkit/kernel
     - linuxkit/binfmt
     - linuxkit/rngd
-outputs:
-  - format: kernel+initrd

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
 

test/hack/test-ltp.yml

@@ -20,5 +20,3 @@ onboot:
 files:
   - path: /etc/ltp/baseline
     contents: "100"
-outputs:
-  - format: gcp-img

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