Merge pull request #2517 from rn/tests

Update/Unify tests

Makefile

@@ -31,7 +31,7 @@ bin/moby: tmp_moby_bin.tar | bin
 tmp_moby_bin.tar: Makefile
 	docker run --rm --log-driver=none -e http_proxy=$(http_proxy) -e https_proxy=$(https_proxy) $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone $(MOBY_REPO) --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(MOBY_COMMIT) -X main.Version=$(MOBY_VERSION)" -o bin/moby > $@
 
-RTF_COMMIT=a5c5885a833d6378fa61fcd66374cc55f0dde503
+RTF_COMMIT=3e8ed35ca934259cb644c2492bf9b181954a07e1
 RTF_CMD=github.com/linuxkit/rtf/cmd
 RTF_VERSION=0.0
 bin/rtf: tmp_rtf_bin.tar | bin

test/cases/000_build/000_outputs/000_kernel+initrd/test.sh

@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT

test/cases/000_build/000_outputs/001_iso-bios/test.sh

@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT

test/cases/000_build/000_outputs/002_iso-efi/test.sh

@@ -11,14 +11,12 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 moby build -format iso-efi -name "${NAME}" ../test.yml
-[ -f "${NAME}-efi.iso" ] || exit 1
+[ -f "${NAME}"-efi.iso ] || exit 1
 
 exit 0

test/cases/000_build/000_outputs/003_gcp/test.sh

@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT

test/cases/000_build/000_outputs/004_raw/test.sh

@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT

test/cases/000_build/000_outputs/005_qcow2/test.sh

@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT

test/cases/000_build/000_outputs/006_vhd/test.sh

@@ -12,9 +12,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT

test/cases/000_build/000_outputs/007_vmdk/test.sh

@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT

test/cases/000_build/100_examples/000_minimal/test.sh

@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=minimal
+NAME=minimal
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 

test/cases/000_build/100_examples/010_docker/test.sh

@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=docker
+NAME=docker
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 

test/cases/000_build/100_examples/020_sshd/test.sh

@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=sshd
+NAME=sshd
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 

test/cases/000_build/100_examples/030_redis/test.sh

@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=redis-os
+NAME=redis-os
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 

test/cases/000_build/100_examples/040_swap/test.sh

@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=swap
+NAME=swap
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 

test/cases/000_build/100_examples/050_node_exporter/test.sh

@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=node_exporter
+NAME=node_exporter
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 

test/cases/000_build/100_examples/060_tpm/test.sh

@@ -8,16 +8,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=tpm
+NAME=tpm
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml"
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml"
 
 exit 0

test/cases/000_build/100_examples/070_wireguard/test.sh

@@ -8,16 +8,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=wireguard
+NAME=wireguard
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0

test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh

@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=docker-for-mac
+NAME=docker-for-mac
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-ce.yml" 
+moby build -name "${NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/docker-ce.yml"
 
 exit 0
 

test/cases/000_build/200_blueprints/020_lcow/test.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# SUMMARY: Test the build of LCOW blueprint
+# LABELS:
+
+set -e
+
+# Source libraries. Uncomment if needed/defined
+#. "${RT_LIB}"
+. "${RT_PROJECT_ROOT}/_lib/lib.sh"
+
+NAME=lcow
+
+clean_up() {
+	rm -f ${NAME}-*
+}
+
+trap clean_up EXIT
+
+# Test code goes here
+moby build -format kernel+initrd -name "${NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/lcow.yml" 
+[ -f "${NAME}-kernel" ] || exit 1
+[ -f "${NAME}-initrd.img" ] || exit 1
+[ -f "${NAME}-cmdline" ] || exit 1
+
+exit 0
+

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

@@ -11,10 +11,8 @@ set -e
 NAME=qemu-kernel
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}-*
 }
-
 trap clean_up EXIT
 
 moby build -format kernel+initrd -name "${NAME}" test.yml
@@ -22,4 +20,5 @@ moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
 linuxkit run qemu -kernel "${NAME}" | grep -q "Welcome to LinuxKit"
+
 exit 0

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

@@ -11,12 +11,12 @@ set -e
 NAME=qemu-iso
 
 clean_up() {
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 moby build -format 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/020_run_efi/test.sh

@@ -11,10 +11,8 @@ set -e
 NAME=qemu-efi
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}-*
 }
-
 trap clean_up EXIT
 
 # see https://github.com/linuxkit/linuxkit/issues/1872 this is very flaky in qemu
@@ -30,4 +28,5 @@ fi
 moby build -format 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/030_run_qcow/test.sh

@@ -11,13 +11,12 @@ set -e
 NAME=qemu-qcow2
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 moby build -format qcow2 -name "${NAME}" test.yml
 [ -f "${NAME}.qcow2" ] || exit 1
 linuxkit run qemu "${NAME}.qcow2" | grep -q "Welcome to LinuxKit"
+
 exit 0

test/cases/010_platforms/000_qemu/040_run_raw/test.sh

@@ -11,13 +11,12 @@ set -e
 NAME=qemu-raw
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 moby build -format raw -name "${NAME}" test.yml
 [ -f "${NAME}.raw" ] || exit 1
 linuxkit run qemu "${NAME}.raw" | grep -q "Welcome to LinuxKit"
+
 exit 0

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

@@ -13,10 +13,8 @@ set -e
 NAME=qemu-kernel
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 # check if qemu is installed locally
@@ -33,4 +31,5 @@ moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
 linuxkit run qemu -containerized "${NAME}" | grep -q "Welcome to LinuxKit"
+
 exit 0

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

@@ -3,7 +3,6 @@
 # LABELS:
 
 set -e
-set -x
 
 # Source libraries. Uncomment if needed/defined
 #. "${RT_LIB}"
@@ -12,9 +11,7 @@ set -x
 NAME=hyperkit-kernel
 
 clean_up() {
-	echo $(pwd)
-	# remove any files, containers, images etc
-	rm -rf "${NAME}"* || true
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
@@ -23,4 +20,5 @@ moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
 ./test.exp
+
 exit 0

test/cases/010_platforms/010_hyperkit/010_acpi/test.sh

@@ -3,7 +3,6 @@
 # LABELS:
 
 set -e
-set -x
 
 # Source libraries. Uncomment if needed/defined
 #. "${RT_LIB}"
@@ -12,15 +11,14 @@ set -x
 NAME=hyperkit-acpi
 
 clean_up() {
-	echo $(pwd)
-	# remove any files, containers, images etc
-	rm -rf "${NAME}"* || true
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
-[ -f "${NAME}-cmdline" ]|| exit 1
+[ -f "${NAME}-cmdline" ] || exit 1
 ./test.exp
+
 exit 0

test/cases/020_kernel/000_config_4.4.x/test.sh

@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=kconfig
+
 clean_up() {
-	find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-kernel-config.yml
-RESULT="$(linuxkit run test-kernel-config)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/001_config_4.9.x/test.sh

@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=kconfig
+
 clean_up() {
-	find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-kernel-config.yml
-RESULT="$(linuxkit run test-kernel-config)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/004_config_4.12.x/test.sh

@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=kconfig
+
 clean_up() {
-	find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-kernel-config.yml
-RESULT="$(linuxkit run test-kernel-config)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/010_kmod_4.9.x/test.sh

@@ -9,11 +9,12 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME="kmod-test"
+NAME=kmod
+IMAGE_NAME=kmod-test
 
 clean_up() {
 	docker rmi ${IMAGE_NAME} || true
-	find . -depth -iname "kmod*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
@@ -23,8 +24,8 @@ docker pull linuxkit/kernel:4.9.50
 docker build -t ${IMAGE_NAME} .
 
 # Build and run a LinuxKit image with kernel module (and test script)
-moby build -format kernel+initrd kmod.yml
-RESULT="$(linuxkit run kmod)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "Hello LinuxKit"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml

@@ -1,9 +1,3 @@
-kernel:
-  image: linuxkit/kernel:4.4.88
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
 onboot:
   - name: test-ns
     image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf
@@ -14,6 +8,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998
     command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh

@@ -9,14 +9,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=test-ns
+
 clean_up() {
-    find . -depth -iname "test-ns*" -not -iname "*.yml" -exec rm -rf {} \;
+    rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-# Test code goes here
-moby build -format kernel+initrd test-ns.yml
-RESULT="$(linuxkit run -cpus 2 test-ns)"
+moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0