From 27839280f71005e3bff771cd2d96b585f4973d98 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 16 Sep 2017 17:56:44 +0100 Subject: [PATCH 1/8] build: Update rtf to the latest version Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f04cc54d..7e89db923 100644 --- a/Makefile +++ b/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 From 6842f10351cfc4f0898a91e461cba4a02e76cedd Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Sep 2017 16:20:19 +0100 Subject: [PATCH 2/8] tests: Clean up build tests Build tests don't need the 'find' nor 'rm -r' as they don't create directories. There is no need to delete the 'test.yml' file in the output tests. Consistently use NAME as the name argument Signed-off-by: Rolf Neugebauer --- test/cases/000_build/000_outputs/000_kernel+initrd/test.sh | 4 +--- test/cases/000_build/000_outputs/001_iso-bios/test.sh | 4 +--- test/cases/000_build/000_outputs/002_iso-efi/test.sh | 6 ++---- test/cases/000_build/000_outputs/003_gcp/test.sh | 4 +--- test/cases/000_build/000_outputs/004_raw/test.sh | 4 +--- test/cases/000_build/000_outputs/005_qcow2/test.sh | 4 +--- test/cases/000_build/000_outputs/006_vhd/test.sh | 4 +--- test/cases/000_build/000_outputs/007_vmdk/test.sh | 4 +--- test/cases/000_build/100_examples/000_minimal/test.sh | 7 +++---- test/cases/000_build/100_examples/010_docker/test.sh | 7 +++---- test/cases/000_build/100_examples/020_sshd/test.sh | 7 +++---- test/cases/000_build/100_examples/030_redis/test.sh | 7 +++---- test/cases/000_build/100_examples/040_swap/test.sh | 7 +++---- .../cases/000_build/100_examples/050_node_exporter/test.sh | 7 +++---- test/cases/000_build/100_examples/060_tpm/test.sh | 7 +++---- test/cases/000_build/100_examples/070_wireguard/test.sh | 7 +++---- .../000_build/200_blueprints/010_docker_for_mac/test.sh | 7 +++---- 17 files changed, 36 insertions(+), 61 deletions(-) diff --git a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh b/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh index 14479883a..a1e9c3cdc 100644 --- a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh +++ b/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 diff --git a/test/cases/000_build/000_outputs/001_iso-bios/test.sh b/test/cases/000_build/000_outputs/001_iso-bios/test.sh index e25ef03b0..e824f626c 100644 --- a/test/cases/000_build/000_outputs/001_iso-bios/test.sh +++ b/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 diff --git a/test/cases/000_build/000_outputs/002_iso-efi/test.sh b/test/cases/000_build/000_outputs/002_iso-efi/test.sh index b56f40515..e710b7c87 100644 --- a/test/cases/000_build/000_outputs/002_iso-efi/test.sh +++ b/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 diff --git a/test/cases/000_build/000_outputs/003_gcp/test.sh b/test/cases/000_build/000_outputs/003_gcp/test.sh index 8a92fa218..8eb53b3b5 100644 --- a/test/cases/000_build/000_outputs/003_gcp/test.sh +++ b/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 diff --git a/test/cases/000_build/000_outputs/004_raw/test.sh b/test/cases/000_build/000_outputs/004_raw/test.sh index c786679c8..bd1ac9c13 100644 --- a/test/cases/000_build/000_outputs/004_raw/test.sh +++ b/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 diff --git a/test/cases/000_build/000_outputs/005_qcow2/test.sh b/test/cases/000_build/000_outputs/005_qcow2/test.sh index 80af3372f..edba153c2 100644 --- a/test/cases/000_build/000_outputs/005_qcow2/test.sh +++ b/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 diff --git a/test/cases/000_build/000_outputs/006_vhd/test.sh b/test/cases/000_build/000_outputs/006_vhd/test.sh index 983ba94c9..a94c2f52b 100644 --- a/test/cases/000_build/000_outputs/006_vhd/test.sh +++ b/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 diff --git a/test/cases/000_build/000_outputs/007_vmdk/test.sh b/test/cases/000_build/000_outputs/007_vmdk/test.sh index 77d07bb2d..8a62bb2db 100644 --- a/test/cases/000_build/000_outputs/007_vmdk/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/000_minimal/test.sh b/test/cases/000_build/100_examples/000_minimal/test.sh index 0871a8488..0c7cd9e89 100644 --- a/test/cases/000_build/100_examples/000_minimal/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/010_docker/test.sh b/test/cases/000_build/100_examples/010_docker/test.sh index 9f2bd538f..cd54b477d 100644 --- a/test/cases/000_build/100_examples/010_docker/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/020_sshd/test.sh b/test/cases/000_build/100_examples/020_sshd/test.sh index 6b0436af3..85eaa701a 100644 --- a/test/cases/000_build/100_examples/020_sshd/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/030_redis/test.sh b/test/cases/000_build/100_examples/030_redis/test.sh index 1e36eb2cf..1732d8cd4 100644 --- a/test/cases/000_build/100_examples/030_redis/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/040_swap/test.sh b/test/cases/000_build/100_examples/040_swap/test.sh index 06996de2e..f8abdd5e1 100644 --- a/test/cases/000_build/100_examples/040_swap/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/050_node_exporter/test.sh b/test/cases/000_build/100_examples/050_node_exporter/test.sh index f81d1ff9e..9855817fc 100644 --- a/test/cases/000_build/100_examples/050_node_exporter/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/060_tpm/test.sh b/test/cases/000_build/100_examples/060_tpm/test.sh index dbfa40ab5..7918d6ecd 100644 --- a/test/cases/000_build/100_examples/060_tpm/test.sh +++ b/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 diff --git a/test/cases/000_build/100_examples/070_wireguard/test.sh b/test/cases/000_build/100_examples/070_wireguard/test.sh index 4149a9d26..014b3d628 100644 --- a/test/cases/000_build/100_examples/070_wireguard/test.sh +++ b/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 diff --git a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh index 892ca0fed..edc8b9c6a 100644 --- a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh +++ b/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 From 4541e8511a59598a608290e99cf856ca71f0f7dd Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Sep 2017 15:20:48 +0100 Subject: [PATCH 3/8] tests: Unify test YAML files to test.yml While at it also unify the clean-up code and other bits in test.sh Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/000_config_4.4.x/test.sh | 8 +++++--- .../{test-kernel-config.yml => test.yml} | 0 test/cases/020_kernel/001_config_4.9.x/test.sh | 8 +++++--- .../{test-kernel-config.yml => test.yml} | 0 test/cases/020_kernel/004_config_4.12.x/test.sh | 8 +++++--- .../{test-kernel-config.yml => test.yml} | 0 test/cases/020_kernel/010_kmod_4.9.x/test.sh | 9 +++++---- .../020_kernel/010_kmod_4.9.x/{kmod.yml => test.yml} | 0 .../000_docker-bench/{test-docker-bench.yml => test.yml} | 0 test/cases/040_packages/002_binfmt/test.sh | 7 ++++--- .../002_binfmt/{test-binfmt.yml => test.yml} | 0 test/cases/040_packages/003_ca-certificates/test.sh | 7 ++++--- .../{test-ca-certificates.yml => test.yml} | 0 test/cases/040_packages/003_containerd/test.sh | 8 +++++--- .../003_containerd/{test-containerd.yml => test.yml} | 0 test/cases/040_packages/004_dhcpcd/test.sh | 8 +++++--- .../004_dhcpcd/{test-dhcpcd.yml => test.yml} | 0 test/cases/040_packages/007_getty-containerd/test.sh | 4 ++-- .../007_getty-containerd/{test-ctr.yml => test.yml} | 0 test/cases/040_packages/019_sysctl/test.sh | 8 +++++--- .../019_sysctl/{test-sysctl.yml => test.yml} | 0 test/cases/040_packages/023_wireguard/test.sh | 8 +++++--- .../023_wireguard/{test-wireguard.yml => test.yml} | 0 23 files changed, 50 insertions(+), 33 deletions(-) rename test/cases/020_kernel/000_config_4.4.x/{test-kernel-config.yml => test.yml} (100%) rename test/cases/020_kernel/001_config_4.9.x/{test-kernel-config.yml => test.yml} (100%) rename test/cases/020_kernel/004_config_4.12.x/{test-kernel-config.yml => test.yml} (100%) rename test/cases/020_kernel/010_kmod_4.9.x/{kmod.yml => test.yml} (100%) rename test/cases/030_security/000_docker-bench/{test-docker-bench.yml => test.yml} (100%) rename test/cases/040_packages/002_binfmt/{test-binfmt.yml => test.yml} (100%) rename test/cases/040_packages/003_ca-certificates/{test-ca-certificates.yml => test.yml} (100%) rename test/cases/040_packages/003_containerd/{test-containerd.yml => test.yml} (100%) rename test/cases/040_packages/004_dhcpcd/{test-dhcpcd.yml => test.yml} (100%) rename test/cases/040_packages/007_getty-containerd/{test-ctr.yml => test.yml} (100%) rename test/cases/040_packages/019_sysctl/{test-sysctl.yml => test.yml} (100%) rename test/cases/040_packages/023_wireguard/{test-wireguard.yml => test.yml} (100%) 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 1d3926a50..ec2bd3ed2 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 @@ -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 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.yml similarity index 100% rename from test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml rename to test/cases/020_kernel/000_config_4.4.x/test.yml 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 1d3926a50..ec2bd3ed2 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 @@ -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 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.yml similarity index 100% rename from test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml rename to test/cases/020_kernel/001_config_4.9.x/test.yml diff --git a/test/cases/020_kernel/004_config_4.12.x/test.sh b/test/cases/020_kernel/004_config_4.12.x/test.sh index 1d3926a50..ec2bd3ed2 100644 --- a/test/cases/020_kernel/004_config_4.12.x/test.sh +++ b/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 diff --git a/test/cases/020_kernel/004_config_4.12.x/test-kernel-config.yml b/test/cases/020_kernel/004_config_4.12.x/test.yml similarity index 100% rename from test/cases/020_kernel/004_config_4.12.x/test-kernel-config.yml rename to test/cases/020_kernel/004_config_4.12.x/test.yml 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 493fc40b6..22d4dfc65 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 @@ -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 diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/test.yml similarity index 100% rename from test/cases/020_kernel/010_kmod_4.9.x/kmod.yml rename to test/cases/020_kernel/010_kmod_4.9.x/test.yml diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test.yml similarity index 100% rename from test/cases/030_security/000_docker-bench/test-docker-bench.yml rename to test/cases/030_security/000_docker-bench/test.yml diff --git a/test/cases/040_packages/002_binfmt/test.sh b/test/cases/040_packages/002_binfmt/test.sh index f0f2bc926..d31df4406 100644 --- a/test/cases/040_packages/002_binfmt/test.sh +++ b/test/cases/040_packages/002_binfmt/test.sh @@ -8,15 +8,16 @@ set -e # Source libraries. Uncomment if needed/defined #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" +NAME=binfmt clean_up() { - find . -depth -iname "test-binfmt*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* } trap clean_up EXIT # Test code goes here -moby build -format kernel+initrd test-binfmt.yml -RESULT="$(linuxkit run test-binfmt)" +moby build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test.yml similarity index 100% rename from test/cases/040_packages/002_binfmt/test-binfmt.yml rename to test/cases/040_packages/002_binfmt/test.yml diff --git a/test/cases/040_packages/003_ca-certificates/test.sh b/test/cases/040_packages/003_ca-certificates/test.sh index 9674199a0..ea6554f03 100644 --- a/test/cases/040_packages/003_ca-certificates/test.sh +++ b/test/cases/040_packages/003_ca-certificates/test.sh @@ -8,15 +8,16 @@ set -e # Source libraries. Uncomment if needed/defined #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" +NAME=ca-certificates clean_up() { - find . -depth -iname "test-ca-certificates*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* } trap clean_up EXIT # Test code goes here -moby build -format kernel+initrd test-ca-certificates.yml -RESULT="$(linuxkit run test-ca-certificates)" +moby build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run $NAME)" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test.yml similarity index 100% rename from test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml rename to test/cases/040_packages/003_ca-certificates/test.yml diff --git a/test/cases/040_packages/003_containerd/test.sh b/test/cases/040_packages/003_containerd/test.sh index c1eb289a1..352616b28 100644 --- a/test/cases/040_packages/003_containerd/test.sh +++ b/test/cases/040_packages/003_containerd/test.sh @@ -9,14 +9,16 @@ set -e #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" +NAME=containerd + clean_up() { - find . -depth -iname "test-containerd*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* } trap clean_up EXIT # Test code goes here -moby build test-containerd.yml -RESULT="$(linuxkit run -mem 2048 -disk size=2G test-containerd)" +moby build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run -mem 2048 -disk size=2G ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test.yml similarity index 100% rename from test/cases/040_packages/003_containerd/test-containerd.yml rename to test/cases/040_packages/003_containerd/test.yml diff --git a/test/cases/040_packages/004_dhcpcd/test.sh b/test/cases/040_packages/004_dhcpcd/test.sh index 1efae049f..978112a52 100644 --- a/test/cases/040_packages/004_dhcpcd/test.sh +++ b/test/cases/040_packages/004_dhcpcd/test.sh @@ -9,14 +9,16 @@ set -e #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" +NAME=dhcpcd + clean_up() { - find . -depth -iname "test-dhcpcd*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* } trap clean_up EXIT # Test code goes here -moby build -format kernel+initrd test-dhcpcd.yml -RESULT="$(linuxkit run test-dhcpcd)" +moby build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run $NAME)" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test.yml similarity index 100% rename from test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml rename to test/cases/040_packages/004_dhcpcd/test.yml diff --git a/test/cases/040_packages/007_getty-containerd/test.sh b/test/cases/040_packages/007_getty-containerd/test.sh index 2e9b420cb..8b59f0c26 100755 --- a/test/cases/040_packages/007_getty-containerd/test.sh +++ b/test/cases/040_packages/007_getty-containerd/test.sh @@ -12,11 +12,11 @@ set -e NAME=test-ctr clean_up() { - find . -depth -iname "test-ctr*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* } trap clean_up EXIT -moby build "${NAME}.yml" +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 diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test.yml similarity index 100% rename from test/cases/040_packages/007_getty-containerd/test-ctr.yml rename to test/cases/040_packages/007_getty-containerd/test.yml diff --git a/test/cases/040_packages/019_sysctl/test.sh b/test/cases/040_packages/019_sysctl/test.sh index 41ad8e641..8f2169c88 100644 --- a/test/cases/040_packages/019_sysctl/test.sh +++ b/test/cases/040_packages/019_sysctl/test.sh @@ -9,14 +9,16 @@ set -e #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" +NAME=sysctl + clean_up() { - find . -depth -iname "test-sysctl*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* } trap clean_up EXIT # Test code goes here -moby build -format kernel+initrd test-sysctl.yml -RESULT="$(linuxkit run test-sysctl)" +moby build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test.yml similarity index 100% rename from test/cases/040_packages/019_sysctl/test-sysctl.yml rename to test/cases/040_packages/019_sysctl/test.yml diff --git a/test/cases/040_packages/023_wireguard/test.sh b/test/cases/040_packages/023_wireguard/test.sh index d0f048813..9976f7b46 100644 --- a/test/cases/040_packages/023_wireguard/test.sh +++ b/test/cases/040_packages/023_wireguard/test.sh @@ -9,14 +9,16 @@ set -e #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" +NAME=wireguard + clean_up() { - find . -depth -iname "test-wireguard*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* } trap clean_up EXIT # Test code goes here -moby build -format kernel+initrd test-wireguard.yml -RESULT="$(linuxkit run test-wireguard)" +moby build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/023_wireguard/test-wireguard.yml b/test/cases/040_packages/023_wireguard/test.yml similarity index 100% rename from test/cases/040_packages/023_wireguard/test-wireguard.yml rename to test/cases/040_packages/023_wireguard/test.yml From 59a085efc003c0c209d62141cb1618419efbf7d5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Sep 2017 20:01:18 +0100 Subject: [PATCH 4/8] tests: Clean-up and fix extend tests - Consistently use env variables for names - Make sure temporary files are removed (the 'create' images were left behind) Signed-off-by: Rolf Neugebauer --- .../040_packages/005_extend/000_ext4/test.sh | 25 +++++++++-------- .../040_packages/005_extend/001_btrfs/test.sh | 25 +++++++++-------- .../040_packages/005_extend/002_xfs/test.sh | 27 +++++++++---------- 3 files changed, 37 insertions(+), 40 deletions(-) diff --git a/test/cases/040_packages/005_extend/000_ext4/test.sh b/test/cases/040_packages/005_extend/000_ext4/test.sh index 63214b748..f4845d68b 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.sh +++ b/test/cases/040_packages/005_extend/000_ext4/test.sh @@ -9,24 +9,23 @@ set -ex #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" -NAME=test-extend-ext4 -DISK=disk0.img -clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; - rm -rf "create*" || true - rm -rf ${DISK} || true -} +NAME_CREATE=create-ext4 +NAME_EXTEND=extend-ext4 +DISK=disk.img +clean_up() { + rm -rf ${NAME_CREATE}-* ${NAME_EXTEND}-* ${DISK} +} trap clean_up EXIT # Test code goes here -moby build --name create -format kernel+initrd test-create.yml -linuxkit run -disk file=${DISK},format=raw,size=256M create -[ -f ${DISK} ] || exit 1 +moby build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml +linuxkit run -disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}" +[ -f "${DISK}" ] || exit 1 # osx takes issue with bs=1M -dd if=/dev/zero bs=1048576 count=256 >> ${DISK} -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${DISK} ${NAME})" +dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" +moby build -format kernel+initrd -name ${NAME_EXTEND} test.yml +RESULT="$(linuxkit run -disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.sh b/test/cases/040_packages/005_extend/001_btrfs/test.sh index e71b7aaf5..e393d4280 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.sh +++ b/test/cases/040_packages/005_extend/001_btrfs/test.sh @@ -9,24 +9,23 @@ set -ex #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" -NAME=test-extend-btrfs -DISK=disk0.img -clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; - rm -rf "create*" || true - rm -rf ${DISK} || true -} +NAME_CREATE=extend-btrfs +NAME_EXTEND=extend-btrfs +DISK=disk.img +clean_up() { + rm -rf ${NAME_CREATE}-* ${NAME_EXTEND}-* ${DISK} +} trap clean_up EXIT # Test code goes here -moby build --name create -format kernel+initrd test-create.yml -linuxkit run -disk file=${DISK},format=raw,size=256M create -[ -f ${DISK} ] || exit 1 +moby build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml +linuxkit run -disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}" +[ -f "${DISK}" ] || exit 1 # osx takes issue with bs=1M -dd if=/dev/zero bs=1048576 count=256 >> ${DISK} -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${DISK} ${NAME})" +dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" +moby build -format kernel+initrd -name ${NAME_EXTEND} test.yml +RESULT="$(linuxkit run -disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/005_extend/002_xfs/test.sh b/test/cases/040_packages/005_extend/002_xfs/test.sh index be333cd27..d53d6bf6f 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.sh +++ b/test/cases/040_packages/005_extend/002_xfs/test.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SUMMARY: Check that an XFS partition can be extended +# SUMMARY: Check that a xfs partition can be extended # LABELS: # REPEAT: @@ -9,24 +9,23 @@ set -ex #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" -NAME=test-extend-xfs -DISK=disk0.img -clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; - rm -rf "create*" || true - rm -rf ${DISK} || true -} +NAME_CREATE=extend-xfs +NAME_EXTEND=extend-xfs +DISK=disk.img +clean_up() { + rm -rf ${NAME_CREATE}-* ${NAME_EXTEND}-* ${DISK} +} trap clean_up EXIT # Test code goes here -moby build --name create -format kernel+initrd test-create.yml -linuxkit run -disk file=${DISK},format=raw,size=256M create -[ -f ${DISK} ] || exit 1 +moby build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml +linuxkit run -disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}" +[ -f "${DISK}" ] || exit 1 # osx takes issue with bs=1M -dd if=/dev/zero bs=1048576 count=256 >> ${DISK} -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${DISK} ${NAME})" +dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" +moby build -format kernel+initrd -name ${NAME_EXTEND} test.yml +RESULT="$(linuxkit run -disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" From a9538a57d4e1edc7ba8b1bea72008f6e6fc44d6c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Sep 2017 20:23:50 +0100 Subject: [PATCH 5/8] tests: Tidy up the format_mount tests - Consistently use env variables - Use simpler cleanup code Signed-off-by: Rolf Neugebauer --- .../040_packages/006_format_mount/000_auto/test.sh | 9 ++++----- .../006_format_mount/001_by_label/test.sh | 9 ++++----- .../040_packages/006_format_mount/002_by_name/test.sh | 11 +++++------ .../040_packages/006_format_mount/003_btrfs/test.sh | 10 +++++----- .../040_packages/006_format_mount/004_xfs/test.sh | 9 ++++----- .../006_format_mount/010_multiple/test.sh | 10 +++++----- 6 files changed, 27 insertions(+), 31 deletions(-) diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.sh b/test/cases/040_packages/006_format_mount/000_auto/test.sh index 59285cd34..3e1064584 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.sh +++ b/test/cases/040_packages/006_format_mount/000_auto/test.sh @@ -10,16 +10,15 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.sh b/test/cases/040_packages/006_format_mount/001_by_label/test.sh index 355e50bd0..58fac1bd9 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.sh +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.sh @@ -10,16 +10,15 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.sh b/test/cases/040_packages/006_format_mount/002_by_name/test.sh index 932b28779..603342be4 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.sh +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.sh @@ -10,14 +10,13 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; - rm -rf test.yml || true + rm -rf ${NAME}-* ${DISK} test.yml } - trap clean_up EXIT -# Test code goes here + if [ "${RT_OS}" = "osx" ]; then DEVICE="/dev/vda" else @@ -25,8 +24,8 @@ else fi sed -e "s,@DEVICE@,${DEVICE},g" test.yml.in > test.yml -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh index 610f0b2bb..cec0f437f 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh @@ -10,16 +10,16 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" + +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.sh b/test/cases/040_packages/006_format_mount/004_xfs/test.sh index 94338119b..b35b9db05 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.sh +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.sh @@ -10,16 +10,15 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.sh b/test/cases/040_packages/006_format_mount/010_multiple/test.sh index def83dd47..41fa9db78 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.sh +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.sh @@ -10,16 +10,16 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK1=disk1.img +DISK2=disk2.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK1} ${DISK2} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M -disk file=${NAME}2.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK1},size=512M -disk file=${DISK2},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" From 3ed9803ac312e116236bf7583d987e0db21c3964 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Sep 2017 20:32:53 +0100 Subject: [PATCH 6/8] tests: Minor tweaks to the platform tests Signed-off-by: Rolf Neugebauer --- test/cases/010_platforms/000_qemu/000_run_kernel/test.sh | 5 ++--- test/cases/010_platforms/000_qemu/010_run_iso/test.sh | 4 ++-- test/cases/010_platforms/000_qemu/020_run_efi/test.sh | 5 ++--- test/cases/010_platforms/000_qemu/030_run_qcow/test.sh | 5 ++--- test/cases/010_platforms/000_qemu/040_run_raw/test.sh | 5 ++--- test/cases/010_platforms/000_qemu/100_container/test.sh | 5 ++--- .../010_platforms/010_hyperkit/000_run_kernel/test.sh | 6 ++---- test/cases/010_platforms/010_hyperkit/010_acpi/test.sh | 8 +++----- 8 files changed, 17 insertions(+), 26 deletions(-) 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 6c1866900..ec71059c1 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 @@ -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 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 793ee8699..2803e24da 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 @@ -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 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 9dfa2a14f..6077ed991 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 @@ -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 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 3eb49d592..0de332136 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 @@ -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 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.sh b/test/cases/010_platforms/000_qemu/040_run_raw/test.sh index cd01eaf86..c9f18a310 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.sh +++ b/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 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 e686ead85..412c3f207 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.sh +++ b/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 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 13fb2f52a..6d72d9a0e 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 @@ -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 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh b/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh index c4a21f494..af6823279 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh +++ b/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 From 40afebb2c92ef2abff0f476c97fc470535c7e561 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 18 Sep 2017 11:13:07 +0100 Subject: [PATCH 7/8] tests: Update kernel namespace tests - Extract common portions from the YAML file This makes kernel/init/runc updates easier as only one files needs changing - Rename test-ns.yml to test.yml to make it more in line with the other tests - Use '-name' in the moby build - Simplify cleanup Signed-off-by: Rolf Neugebauer --- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../017_echo-tcp-ipv4-long-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../027_echo-tcp-ipv6-long-5con-multi/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../037_echo-udp-ipv4-long-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../047_echo-udp-ipv6-long-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../010_echo-short-1con-single/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../011_echo-short-10con-single/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../012_echo-short-5con-multi-reverse/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../012_echo-short-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../015_echo-long-1con-single-reverse/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../015_echo-long-1con-single/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../016_echo-long-10con-single/test.sh | 9 +++++---- .../016_echo-long-10con-single/test.yml} | 9 --------- .../017_echo-long-5con-multi-reverse/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../017_echo-long-5con-multi/test.sh | 9 +++++---- .../017_echo-long-5con-multi/test.yml} | 9 --------- .../100_mix/010_veth-unix-domain-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../011_veth-unix-domain-echo-reverse/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/012_veth-ipv4-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/013_veth-ipv6-echo/test.sh | 9 +++++---- .../100_mix/013_veth-ipv6-echo/test.yml} | 9 --------- .../100_mix/014_veth-tcp-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/015_veth-udp-echo/test.sh | 9 +++++---- .../100_mix/015_veth-udp-echo/test.yml} | 9 --------- .../100_mix/020_unix-domain-echo/test.sh | 9 +++++---- .../100_mix/020_unix-domain-echo/test.yml} | 9 --------- .../110_namespace/000_kernel-4.4.x/common.yml | 9 +++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../017_echo-tcp-ipv4-long-5con-multi/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../027_echo-tcp-ipv6-long-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../037_echo-udp-ipv4-long-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../047_echo-udp-ipv6-long-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../010_echo-short-1con-single/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../011_echo-short-10con-single/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../012_echo-short-5con-multi-reverse/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../012_echo-short-5con-multi/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../015_echo-long-1con-single-reverse/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../015_echo-long-1con-single/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../test.yml} | 9 --------- .../016_echo-long-10con-single/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../017_echo-long-5con-multi-reverse/test.sh | 9 +++++---- .../test.yml} | 9 --------- .../017_echo-long-5con-multi/test.sh | 9 +++++---- .../017_echo-long-5con-multi/test.yml} | 9 --------- .../100_mix/010_veth-unix-domain-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../011_veth-unix-domain-echo-reverse/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/012_veth-ipv4-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/013_veth-ipv6-echo/test.sh | 9 +++++---- .../100_mix/013_veth-ipv6-echo/test.yml} | 9 --------- .../100_mix/014_veth-tcp-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/015_veth-udp-echo/test.sh | 9 +++++---- .../100_mix/015_veth-udp-echo/test.yml} | 9 --------- .../100_mix/020_unix-domain-echo/test.sh | 9 +++++---- .../100_mix/020_unix-domain-echo/test.yml} | 9 --------- .../110_namespace/001_kernel-4.9.x/common.yml | 9 +++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../017_echo-tcp-ipv4-long-5con-multi/test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../027_echo-tcp-ipv6-long-5con-multi/test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../037_echo-udp-ipv4-long-5con-multi/test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../047_echo-udp-ipv6-long-5con-multi/test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../010_echo-short-1con-single/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../011_echo-short-10con-single/test-ns.yml | 19 ------------------- .../011_echo-short-10con-single/test.sh | 9 +++++---- .../011_echo-short-10con-single/test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../012_echo-short-5con-multi-reverse/test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../012_echo-short-5con-multi/test-ns.yml | 19 ------------------- .../012_echo-short-5con-multi/test.sh | 9 +++++---- .../012_echo-short-5con-multi/test.yml | 10 ++++++++++ .../015_echo-long-1con-single-reverse/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../015_echo-long-1con-single/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../test-ns.yml | 19 ------------------- .../test.sh | 9 +++++---- .../test.yml | 10 ++++++++++ .../016_echo-long-10con-single/test-ns.yml | 19 ------------------- .../016_echo-long-10con-single/test.sh | 9 +++++---- .../016_echo-long-10con-single/test.yml | 10 ++++++++++ .../test-ns.yml | 19 ------------------- .../017_echo-long-5con-multi-reverse/test.sh | 9 +++++---- .../017_echo-long-5con-multi-reverse/test.yml | 10 ++++++++++ .../017_echo-long-5con-multi/test-ns.yml | 19 ------------------- .../017_echo-long-5con-multi/test.sh | 9 +++++---- .../017_echo-long-5con-multi/test.yml | 10 ++++++++++ .../100_mix/010_veth-unix-domain-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../011_veth-unix-domain-echo-reverse/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/012_veth-ipv4-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/013_veth-ipv6-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/014_veth-tcp-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/015_veth-udp-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../100_mix/020_unix-domain-echo/test.sh | 9 +++++---- .../{test-ns.yml => test.yml} | 9 --------- .../004_kernel-4.12.x/common.yml | 9 +++++++++ 445 files changed, 1432 insertions(+), 3013 deletions(-) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/{016_echo-tcp-ipv4-long-10con-single/test-ns.yml => 016_echo-tcp-ipv4-long-10con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/{021_echo-tcp-ipv6-short-10con-single/test-ns.yml => 021_echo-tcp-ipv6-short-10con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/{021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml => 021_echo-tcp-ipv6-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/{036_echo-udp-ipv4-long-10con-single/test-ns.yml => 036_echo-udp-ipv4-long-10con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/{041_echo-udp-ipv6-short-10con-single/test-ns.yml => 041_echo-udp-ipv6-short-10con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml => 000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml => 000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml => 000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/{011_echo-short-10con-single-reverse/test-ns.yml => 011_echo-short-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml => 000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/{016_echo-long-10con-single/test-ns.yml => 016_echo-long-10con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml => 000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml => 000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml => 000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml} (64%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test-ns.yml => 000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml} (61%) rename test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/100_mix/015_veth-udp-echo/test-ns.yml => 000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml} (61%) rename test/cases/020_kernel/110_namespace/{001_kernel-4.9.x/100_mix/020_unix-domain-echo/test-ns.yml => 000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml} (61%) create mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml => 001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/{017_echo-tcp-ipv4-long-5con-multi/test-ns.yml => 017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/{021_echo-tcp-ipv6-short-10con-single/test-ns.yml => 021_echo-tcp-ipv6-short-10con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/{021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml => 021_echo-tcp-ipv6-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml => 001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml => 001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml => 001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml} (65%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml => 001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/{046_echo-udp-ipv6-long-10con-single/test-ns.yml => 046_echo-udp-ipv6-long-10con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/{046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml => 046_echo-udp-ipv6-long-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml => 001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/{011_echo-short-10con-single-reverse/test-ns.yml => 011_echo-short-10con-single/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml => 001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml => 001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml => 001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml} (64%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml => 001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml} (64%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test-ns.yml => 001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml} (61%) rename test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/100_mix/015_veth-udp-echo/test-ns.yml => 001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml} (61%) rename test/cases/020_kernel/110_namespace/{000_kernel-4.4.x/100_mix/020_unix-domain-echo/test-ns.yml => 001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml} (61%) create mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/{test-ns.yml => test.yml} (65%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/{test-ns.yml => test.yml} (64%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/{test-ns.yml => test.yml} (64%) delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml delete mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test.yml rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/{test-ns.yml => test.yml} (61%) rename test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/{test-ns.yml => test.yml} (61%) create mode 100644 test/cases/020_kernel/110_namespace/004_kernel-4.12.x/common.yml diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh index 021b7a47c..48440c966 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index 46ae45428..e72008944 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh index 117af71c2..2b842759d 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index ee55026bb..755e7d505 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh index ea135cd87..5db10bae2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 917e30bd5..6c782b2c3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh index 0bc13123a..f31241072 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 917e30bd5..6c782b2c3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh index 473642acc..d56fa1eca 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 064a15b71..374dcff74 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh index 93dd22a6e..451482015 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 307bbeec0..374dcff74 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh index b5a7faddb..681aa5690 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index 8fef4351d..fbe3f5daa 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh index bdc5f3218..2e439c023 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index c05790557..182776db1 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh index 377bfd01c..e3981dad8 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index c9b4416e9..00fc690a5 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh index 99c08abcf..e9b0a2fc6 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index 48187181f..00fc690a5 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh index c1363bed9..a3bde3083 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index 6156b467d..b5d309cdb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh index 8b96e0ece..217479cf1 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index 6d9b0b676..b5d309cdb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh index 5eb902edc..a63800d4d 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 0668941bb..59a79bf19 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh index 448676be1..cdac9a483 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index d09fdd657..edec86aa5 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh index 86889cefb..542be314f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index 707569906..c446cd0b8 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh index 977385887..2ddcd9280 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index 707569906..c446cd0b8 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh index 3b2ecc816..db48d1f2f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index f991ac8f1..51671ee1c 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh index 35f478630..50d4569f0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 5a86188a4..51671ee1c 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh index a79bd5301..512101bec 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 45c53a2d8..6c986c0fc 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh index 56989e4c0..e0bb379d2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 7f4b0b0d4..61e17dd62 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh index 061f2bedc..bd322b16c 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index 1df3a4e01..fd1a5968b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh index e4a356270..b1565660a 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index ee0f5dfd8..fd1a5968b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh index fda058124..eb1d1171d 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 5da56bb6c..17b9c32a8 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh index b5eba01c6..17bad482d 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 487c290b2..17b9c32a8 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh index 88bbf02d7..96ef9223d 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 887e92186..7e4f63898 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh index b26008022..471b4222f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 84c75afb9..8052c644f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh index 90aed3751..512042037 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 2d341c451..0b7e040db 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh index c9a1f64b0..8bf14b78b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index d0a18cd11..0b7e040db 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh index 044e49503..d1cca637e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index 41aa95c46..fe36d3bd2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh index 34a6bbacb..9e2b08ba0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index 41aa95c46..fe36d3bd2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh index c216a3854..af0286699 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 35c28beb4..afd5cc4cf 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh index d4265e141..17ba91764 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index fe0bd9b49..d7cabf9e3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh index b1c441a2a..6b0ff92cb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh +++ b/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index d3f1f2c7e..dcaf09d7b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh index b20698fc4..ed86fb859 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 04ccc5b14..dcaf09d7b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh index 5b6af8573..3071827da 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 337ba96a2..08c9e8a8b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh index 6115d8b0d..28d58bd06 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 337ba96a2..08c9e8a8b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh index 7475e6af2..770eed1b3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index 47b85b99a..d88ea49f1 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh index 40a210237..3dbb6e740 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index 4c58507b7..ae18acfb0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh index 2265b1d4f..96b781974 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 311b66fd2..44d33e25e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh index dd3b579b8..3355c8322 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 481d595dd..44d33e25e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh index 701f0a4cf..bb17ddcdb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index b3b8eab09..4a4401915 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh index affaa880e..8c8150f40 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index b3b8eab09..4a4401915 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh index c1c22e83e..919735129 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index aacd8d5f6..e10f6fa53 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh index b9f52015c..ec328b8fe 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index 7ad2521f9..ac9c41993 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh index 016929907..1fa811933 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 18127ae28..45ce6aa70 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh index fa6ff9ec5..8c106b5a6 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 18127ae28..45ce6aa70 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh index 75bdfadac..c3d419e85 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index 40ed19fc6..a06aa7cc0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh index ec498334b..77da56f79 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index 40ed19fc6..a06aa7cc0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh index 341a356b6..cde07a2a4 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 01a3ccb4b..06a5a2f3b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh index 4e9910fe3..389e227e9 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml index c25ec599c..39c633f37 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh index 1e1b5adc7..c2eff9ae5 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index e4853ccbf..8b9464d06 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh index 18f22375c..15f817161 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml index 775c199b4..8b9464d06 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh index 981a679c8..2d9f47982 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index c8e152ce4..95f120efc 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh index 17fa66692..8e532284f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml index c8e152ce4..95f120efc 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh index 5d6f4809e..fb1657082 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 373e0a67f..3733d77ba 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh index a36967b14..6c92f82d5 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml index 602ec0493..4c1744acf 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh index 2d5908f28..352beef41 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index 2febd257e..d31ad31b4 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh index 917a687f7..e0503fcf6 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml index 38683d77b..d31ad31b4 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh index 0af9e99b1..5b4cb13c0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index 21a2b2610..c50b3e3fa 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh index 42f54bb32..aa40686bc 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml index 21a2b2610..c50b3e3fa 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh index 186c80f7f..8b086cb4a 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml index bcabce514..37ac137d2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh index 9eea7787c..31470eacb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml index 9fa05d19b..a7a2e0c82 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh index 02a327d63..5a4068273 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml index 24139db96..2363ae368 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh index 667ef5994..45fbab7d0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml index 338422520..f1167a8a0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh index aa3e38e15..646888e7d 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml index 1b5ae5731..7d9481562 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh index a77c8e723..9a9f134e2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml index 946900c57..c3d178c51 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh index 64c916aac..9bf9c0dd9 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml index 5617e725e..fee7e114e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml new file mode 100644 index 000000000..5ed61e78c --- /dev/null +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -0,0 +1,9 @@ +kernel: + image: linuxkit/kernel:4.4.88 + cmdline: "console=ttyS0" +init: + - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f + - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a +trust: + org: + - linuxkit diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh index 021b7a47c..48440c966 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index 475623972..e72008944 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh index 117af71c2..2b842759d 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 9fedb64d1..755e7d505 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh index ea135cd87..5db10bae2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 1caa814e3..6c782b2c3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh index 0bc13123a..f31241072 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 1caa814e3..6c782b2c3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh index 473642acc..d56fa1eca 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 064a15b71..374dcff74 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh index 93dd22a6e..451482015 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 307bbeec0..374dcff74 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh index b5a7faddb..681aa5690 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index c308943ab..fbe3f5daa 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh index bdc5f3218..2e439c023 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 756081d68..182776db1 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh index 377bfd01c..e3981dad8 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index 48187181f..00fc690a5 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh index 99c08abcf..e9b0a2fc6 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index c9b4416e9..00fc690a5 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh index c1363bed9..a3bde3083 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index 6156b467d..b5d309cdb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh index 8b96e0ece..217479cf1 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index 6d9b0b676..b5d309cdb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh index 5eb902edc..a63800d4d 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 48ac9109f..59a79bf19 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh index 448676be1..cdac9a483 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index 50b105f40..edec86aa5 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh index 86889cefb..542be314f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index f3c6e7679..c446cd0b8 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh index 977385887..2ddcd9280 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index f3c6e7679..c446cd0b8 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh index 3b2ecc816..db48d1f2f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index f991ac8f1..51671ee1c 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh index 35f478630..50d4569f0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 5a86188a4..51671ee1c 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh index a79bd5301..512101bec 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 68b000280..6c986c0fc 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh index 56989e4c0..e0bb379d2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 8ba4954a4..61e17dd62 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh index 061f2bedc..bd322b16c 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index ee0f5dfd8..fd1a5968b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh index e4a356270..b1565660a 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index 1df3a4e01..fd1a5968b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh index fda058124..eb1d1171d 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 5da56bb6c..17b9c32a8 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh index b5eba01c6..17bad482d 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 487c290b2..17b9c32a8 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh index 88bbf02d7..96ef9223d 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 4783ec38e..7e4f63898 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh index b26008022..471b4222f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 23e385afc..8052c644f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh index 90aed3751..512042037 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index d0a18cd11..0b7e040db 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh index c9a1f64b0..8bf14b78b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 2d341c451..0b7e040db 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh index 044e49503..d1cca637e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index ff397ea92..fe36d3bd2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh index 34a6bbacb..9e2b08ba0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index ff397ea92..fe36d3bd2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh index c216a3854..af0286699 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 057941c23..afd5cc4cf 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh index d4265e141..17ba91764 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index 2a62197eb..d7cabf9e3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh index b1c441a2a..6b0ff92cb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 04ccc5b14..dcaf09d7b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh index b20698fc4..ed86fb859 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index d3f1f2c7e..dcaf09d7b 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh index 5b6af8573..3071827da 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index f7ccb9185..08c9e8a8b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh index 6115d8b0d..28d58bd06 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index f7ccb9185..08c9e8a8b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh index 7475e6af2..770eed1b3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index 5ed7c19b5..d88ea49f1 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh index 40a210237..3dbb6e740 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index a951107b1..ae18acfb0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh index 2265b1d4f..96b781974 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 481d595dd..44d33e25e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh index dd3b579b8..3355c8322 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 311b66fd2..44d33e25e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh index 701f0a4cf..bb17ddcdb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index a74f452d2..4a4401915 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh index affaa880e..8c8150f40 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index a74f452d2..4a4401915 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh index c1c22e83e..919735129 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index 347a55a39..e10f6fa53 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh index b9f52015c..ec328b8fe 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index 9b6ac72f6..ac9c41993 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh index 016929907..1fa811933 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 6730c4955..45ce6aa70 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh index fa6ff9ec5..8c106b5a6 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 6730c4955..45ce6aa70 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh index 75bdfadac..c3d419e85 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index a1667f614..a06aa7cc0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh index ec498334b..77da56f79 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index a1667f614..a06aa7cc0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh index 341a356b6..cde07a2a4 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 24d3a0f98..06a5a2f3b 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh index 4e9910fe3..389e227e9 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml index 26aacf04e..39c633f37 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh index 1e1b5adc7..c2eff9ae5 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 775c199b4..8b9464d06 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh index 18f22375c..15f817161 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml index e4853ccbf..8b9464d06 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh index 981a679c8..2d9f47982 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 094338a3e..95f120efc 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh index 17fa66692..8e532284f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml index 094338a3e..95f120efc 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh index 5d6f4809e..fb1657082 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 9ade9caf4..3733d77ba 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh index a36967b14..6c92f82d5 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml index 775d37a3a..4c1744acf 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh index 2d5908f28..352beef41 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index 2febd257e..d31ad31b4 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh index 917a687f7..e0503fcf6 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml index 38683d77b..d31ad31b4 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh index 0af9e99b1..5b4cb13c0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index ec43add2f..c50b3e3fa 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh index 42f54bb32..aa40686bc 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml index ec43add2f..c50b3e3fa 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh index 186c80f7f..8b086cb4a 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml index 01b8974d4..37ac137d2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh index 9eea7787c..31470eacb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml index 4fafc3e17..a7a2e0c82 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh index 02a327d63..5a4068273 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml index 98d781338..2363ae368 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh index 667ef5994..45fbab7d0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml index f2d28da27..f1167a8a0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh index aa3e38e15..646888e7d 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml index 99d8a9eae..7d9481562 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh index a77c8e723..9a9f134e2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml index 1579e427d..c3d178c51 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh index 64c916aac..9bf9c0dd9 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml index 0636cb1bc..fee7e114e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml new file mode 100644 index 000000000..2079146a8 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -0,0 +1,9 @@ +kernel: + image: linuxkit/kernel:4.9.50 + cmdline: "console=ttyS0" +init: + - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f + - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a +trust: + org: + - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh index 021b7a47c..48440c966 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index fcfe07b54..e72008944 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh index 117af71c2..2b842759d 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index d94b3cf54..755e7d505 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml deleted file mode 100644 index 16eeec2a1..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh index ea135cd87..5db10bae2 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml new file mode 100644 index 000000000..6c782b2c3 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml deleted file mode 100644 index 16eeec2a1..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh index 0bc13123a..f31241072 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml new file mode 100644 index 000000000..6c782b2c3 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml deleted file mode 100644 index f9949d3f5..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh index 473642acc..d56fa1eca 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml new file mode 100644 index 000000000..374dcff74 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml deleted file mode 100644 index f9949d3f5..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh index 93dd22a6e..451482015 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml new file mode 100644 index 000000000..374dcff74 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh index b5a7faddb..681aa5690 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index 1d2059110..fbe3f5daa 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh index bdc5f3218..2e439c023 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 82a560509..182776db1 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml deleted file mode 100644 index cf6e0110e..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh index 377bfd01c..e3981dad8 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml new file mode 100644 index 000000000..00fc690a5 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml deleted file mode 100644 index cf6e0110e..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh index 99c08abcf..e9b0a2fc6 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml new file mode 100644 index 000000000..00fc690a5 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml deleted file mode 100644 index 1dc9158bf..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh index c1363bed9..a3bde3083 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml new file mode 100644 index 000000000..b5d309cdb --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml deleted file mode 100644 index 1dc9158bf..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh index 8b96e0ece..217479cf1 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml new file mode 100644 index 000000000..b5d309cdb --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh index 5eb902edc..a63800d4d 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index e8420e9dd..59a79bf19 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh index 448676be1..cdac9a483 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index f3e7a960e..edec86aa5 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml deleted file mode 100644 index 1204112f6..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh index 86889cefb..542be314f 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml new file mode 100644 index 000000000..c446cd0b8 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml deleted file mode 100644 index 1204112f6..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh index 977385887..2ddcd9280 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml new file mode 100644 index 000000000..c446cd0b8 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml deleted file mode 100644 index e3303f315..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh index 3b2ecc816..db48d1f2f 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml new file mode 100644 index 000000000..51671ee1c --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml deleted file mode 100644 index e3303f315..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh index 35f478630..50d4569f0 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml new file mode 100644 index 000000000..51671ee1c --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh index a79bd5301..512101bec 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index cce955e56..6c986c0fc 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh index 56989e4c0..e0bb379d2 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 56f2c811b..61e17dd62 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml deleted file mode 100644 index 1d9aee97e..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh index 061f2bedc..bd322b16c 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml new file mode 100644 index 000000000..fd1a5968b --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml deleted file mode 100644 index 1d9aee97e..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh index e4a356270..b1565660a 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml new file mode 100644 index 000000000..fd1a5968b --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml deleted file mode 100644 index 118e7d4bd..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh index fda058124..eb1d1171d 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml new file mode 100644 index 000000000..17b9c32a8 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml deleted file mode 100644 index 118e7d4bd..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh index b5eba01c6..17bad482d 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml new file mode 100644 index 000000000..17b9c32a8 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh index 88bbf02d7..96ef9223d 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 0c8737c4c..7e4f63898 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh index b26008022..471b4222f 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 55ad0befb..8052c644f 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml deleted file mode 100644 index 783d7af16..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh index 90aed3751..512042037 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml new file mode 100644 index 000000000..0b7e040db --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml deleted file mode 100644 index 783d7af16..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh index c9a1f64b0..8bf14b78b 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml new file mode 100644 index 000000000..0b7e040db --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml deleted file mode 100644 index 85e6327ea..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh index 044e49503..d1cca637e 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml new file mode 100644 index 000000000..fe36d3bd2 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml deleted file mode 100644 index 85e6327ea..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh index 34a6bbacb..9e2b08ba0 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml new file mode 100644 index 000000000..fe36d3bd2 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh index c216a3854..af0286699 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index c8401885f..afd5cc4cf 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh index d4265e141..17ba91764 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index a4d1fbc76..d7cabf9e3 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml deleted file mode 100644 index fdda206b5..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh index b1c441a2a..6b0ff92cb 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml new file mode 100644 index 000000000..dcaf09d7b --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml deleted file mode 100644 index fdda206b5..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh index b20698fc4..ed86fb859 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml new file mode 100644 index 000000000..dcaf09d7b --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml deleted file mode 100644 index d0f9ce246..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh index 5b6af8573..3071827da 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml new file mode 100644 index 000000000..08c9e8a8b --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml deleted file mode 100644 index d0f9ce246..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh index 6115d8b0d..28d58bd06 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml new file mode 100644 index 000000000..08c9e8a8b --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh index 7475e6af2..770eed1b3 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml similarity index 65% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index ecb8e27c6..d88ea49f1 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh index 40a210237..3dbb6e740 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index a61a18765..ae18acfb0 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml deleted file mode 100644 index b793281a9..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh index 2265b1d4f..96b781974 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml new file mode 100644 index 000000000..44d33e25e --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml deleted file mode 100644 index b793281a9..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh index dd3b579b8..3355c8322 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml new file mode 100644 index 000000000..44d33e25e --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml deleted file mode 100644 index 64b7b2dbb..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh index 701f0a4cf..bb17ddcdb 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml new file mode 100644 index 000000000..4a4401915 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml deleted file mode 100644 index 64b7b2dbb..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh index affaa880e..8c8150f40 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml new file mode 100644 index 000000000..4a4401915 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh index c1c22e83e..919735129 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index c8f93576d..e10f6fa53 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh index b9f52015c..ec328b8fe 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index 34b927484..ac9c41993 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml deleted file mode 100644 index fe56667c8..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh index 016929907..1fa811933 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml new file mode 100644 index 000000000..45ce6aa70 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml deleted file mode 100644 index fe56667c8..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh index fa6ff9ec5..8c106b5a6 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml new file mode 100644 index 000000000..45ce6aa70 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml deleted file mode 100644 index 6c332f0e4..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh index 75bdfadac..c3d419e85 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml new file mode 100644 index 000000000..a06aa7cc0 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml deleted file mode 100644 index 6c332f0e4..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh index ec498334b..77da56f79 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml new file mode 100644 index 000000000..a06aa7cc0 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh index 341a356b6..cde07a2a4 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 2a3ee7252..06a5a2f3b 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test.sh index 4e9910fe3..389e227e9 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test.yml index 26e33110e..39c633f37 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml deleted file mode 100644 index f89d2854c..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh index 1e1b5adc7..c2eff9ae5 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml new file mode 100644 index 000000000..8b9464d06 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml deleted file mode 100644 index f89d2854c..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test.sh index 18f22375c..15f817161 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test.yml new file mode 100644 index 000000000..8b9464d06 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/011_echo-short-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml deleted file mode 100644 index 78f2ab6f8..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh index 981a679c8..2d9f47982 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml new file mode 100644 index 000000000..95f120efc --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml deleted file mode 100644 index 78f2ab6f8..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test.sh index 17fa66692..8e532284f 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test.yml new file mode 100644 index 000000000..95f120efc --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh index 5d6f4809e..fb1657082 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index dbe6d0b4d..3733d77ba 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test.sh index a36967b14..6c92f82d5 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test.yml similarity index 64% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test.yml index a390dcc39..4c1744acf 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml deleted file mode 100644 index 0a674d1d6..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh index 2d5908f28..352beef41 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml new file mode 100644 index 000000000..d31ad31b4 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml deleted file mode 100644 index 0a674d1d6..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test.sh index 917a687f7..e0503fcf6 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test.yml new file mode 100644 index 000000000..d31ad31b4 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/016_echo-long-10con-single/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml deleted file mode 100644 index 64e2097df..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh index 0af9e99b1..5b4cb13c0 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml new file mode 100644 index 000000000..c50b3e3fa --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml deleted file mode 100644 index 64e2097df..000000000 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test-ns.yml +++ /dev/null @@ -1,19 +0,0 @@ -kernel: - image: linuxkit/kernel:4.12.13 - cmdline: "console=ttyS0" -init: - - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a -onboot: - - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf - command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] - mounts: # for runc - - type: cgroup - options: ["rw"] - - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test.sh index 42f54bb32..aa40686bc 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test.yml new file mode 100644 index 000000000..c50b3e3fa --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -0,0 +1,10 @@ +onboot: + - name: test-ns + image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] + mounts: # for runc + - type: cgroup + options: ["rw"] + - name: poweroff + image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test.sh index 186c80f7f..8b086cb4a 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test.yml index 199a945a0..37ac137d2 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh index 9eea7787c..31470eacb 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml index 1dec2fcdc..a7a2e0c82 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test.sh index 02a327d63..5a4068273 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test.yml index 545234081..2363ae368 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/012_veth-ipv4-echo/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test.sh index 667ef5994..45fbab7d0 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test.yml index c474c18e9..f1167a8a0 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/013_veth-ipv6-echo/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test.sh index aa3e38e15..646888e7d 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test.yml index dc851b02c..7d9481562 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/014_veth-tcp-echo/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test.sh index a77c8e723..9a9f134e2 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test.yml index 064fe047d..c3d178c51 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/015_veth-udp-echo/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test.sh index 64c916aac..9bf9c0dd9 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test.sh +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test-ns.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test.yml similarity index 61% rename from test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test-ns.yml rename to test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test.yml index 8f42c866d..fee7e114e 100644 --- a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test-ns.yml +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/100_mix/020_unix-domain-echo/test.yml @@ -1,9 +1,3 @@ -kernel: - image: linuxkit/kernel:4.12.13 - 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 diff --git a/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/common.yml b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/common.yml new file mode 100644 index 000000000..1a7ec5dd0 --- /dev/null +++ b/test/cases/020_kernel/110_namespace/004_kernel-4.12.x/common.yml @@ -0,0 +1,9 @@ +kernel: + image: linuxkit/kernel:4.12.13 + cmdline: "console=ttyS0" +init: + - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f + - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a +trust: + org: + - linuxkit From a65b91c0c98f70067143f0450c09a15e807cda80 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 18 Sep 2017 13:38:26 +0100 Subject: [PATCH 8/8] tests: Add a build test for the LCOW blueprint Signed-off-by: Rolf Neugebauer --- .../000_build/200_blueprints/020_lcow/test.sh | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 test/cases/000_build/200_blueprints/020_lcow/test.sh diff --git a/test/cases/000_build/200_blueprints/020_lcow/test.sh b/test/cases/000_build/200_blueprints/020_lcow/test.sh new file mode 100644 index 000000000..731cf0491 --- /dev/null +++ b/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 +