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