From 05767273f3ceb2be00da5f85b88033d8404f64ff Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Wed, 12 Apr 2017 11:20:11 +0100 Subject: [PATCH] tests: cleanup test directory - add a `pkg` directory for packages - add a `cases` directory for yml files Signed-off-by: Dave Tucker --- test/{docker-bench => cases}/test-docker-bench.yml | 0 test/{test.yml => cases/test-kernel-config.yml} | 4 ++-- test/{ltp => cases}/test-ltp.yml | 0 test/{virtsock => cases}/test-virtsock-server.yml | 0 test/{ => pkg}/docker-bench/Dockerfile | 0 test/{ => pkg}/docker-bench/Makefile | 0 test/{ => pkg}/docker-bench/bench_runner.sh | 0 test/{check => pkg/kernel-config}/Dockerfile | 0 test/{check => pkg/kernel-config}/Makefile | 2 +- test/{check => pkg/kernel-config}/check-kernel-config.sh | 0 test/{check => pkg/kernel-config}/check.sh | 0 test/{check => pkg/kernel-config}/etc/linuxkit | 0 test/{ => pkg}/ltp/.gitignore | 0 test/{ => pkg}/ltp/Dockerfile.build | 0 test/{ => pkg}/ltp/Dockerfile.pkg | 0 test/{ => pkg}/ltp/Makefile | 0 test/{ => pkg}/ltp/README.md | 0 test/{ => pkg}/ltp/check.sh | 0 test/{ => pkg}/poweroff/Dockerfile | 0 test/{ => pkg}/poweroff/Makefile | 0 test/{ => pkg}/poweroff/poweroff.sh | 0 test/{ => pkg}/virtsock/.gitignore | 0 test/{ => pkg}/virtsock/Dockerfile | 0 test/{ => pkg}/virtsock/Makefile | 0 test/{ => pkg}/virtsock/README.md | 4 ++-- 25 files changed, 5 insertions(+), 5 deletions(-) rename test/{docker-bench => cases}/test-docker-bench.yml (100%) rename test/{test.yml => cases/test-kernel-config.yml} (88%) rename test/{ltp => cases}/test-ltp.yml (100%) rename test/{virtsock => cases}/test-virtsock-server.yml (100%) rename test/{ => pkg}/docker-bench/Dockerfile (100%) rename test/{ => pkg}/docker-bench/Makefile (100%) rename test/{ => pkg}/docker-bench/bench_runner.sh (100%) rename test/{check => pkg/kernel-config}/Dockerfile (100%) rename test/{check => pkg/kernel-config}/Makefile (97%) rename test/{check => pkg/kernel-config}/check-kernel-config.sh (100%) rename test/{check => pkg/kernel-config}/check.sh (100%) rename test/{check => pkg/kernel-config}/etc/linuxkit (100%) rename test/{ => pkg}/ltp/.gitignore (100%) rename test/{ => pkg}/ltp/Dockerfile.build (100%) rename test/{ => pkg}/ltp/Dockerfile.pkg (100%) rename test/{ => pkg}/ltp/Makefile (100%) rename test/{ => pkg}/ltp/README.md (100%) rename test/{ => pkg}/ltp/check.sh (100%) rename test/{ => pkg}/poweroff/Dockerfile (100%) rename test/{ => pkg}/poweroff/Makefile (100%) rename test/{ => pkg}/poweroff/poweroff.sh (100%) rename test/{ => pkg}/virtsock/.gitignore (100%) rename test/{ => pkg}/virtsock/Dockerfile (100%) rename test/{ => pkg}/virtsock/Makefile (100%) rename test/{ => pkg}/virtsock/README.md (85%) diff --git a/test/docker-bench/test-docker-bench.yml b/test/cases/test-docker-bench.yml similarity index 100% rename from test/docker-bench/test-docker-bench.yml rename to test/cases/test-docker-bench.yml diff --git a/test/test.yml b/test/cases/test-kernel-config.yml similarity index 88% rename from test/test.yml rename to test/cases/test-kernel-config.yml index 4412a9302..24ef97b21 100644 --- a/test/test.yml +++ b/test/cases/test-kernel-config.yml @@ -18,8 +18,8 @@ onboot: - CAP_NET_RAW net: host command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - - name: check - image: "linuxkit/check:43c4147dda4e02d066ef158cd81718dbff8c8bd0" + - name: check-kernel-config + image: "mobylinux/kernel-config:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f" pid: host capabilities: - CAP_SYS_BOOT diff --git a/test/ltp/test-ltp.yml b/test/cases/test-ltp.yml similarity index 100% rename from test/ltp/test-ltp.yml rename to test/cases/test-ltp.yml diff --git a/test/virtsock/test-virtsock-server.yml b/test/cases/test-virtsock-server.yml similarity index 100% rename from test/virtsock/test-virtsock-server.yml rename to test/cases/test-virtsock-server.yml diff --git a/test/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile similarity index 100% rename from test/docker-bench/Dockerfile rename to test/pkg/docker-bench/Dockerfile diff --git a/test/docker-bench/Makefile b/test/pkg/docker-bench/Makefile similarity index 100% rename from test/docker-bench/Makefile rename to test/pkg/docker-bench/Makefile diff --git a/test/docker-bench/bench_runner.sh b/test/pkg/docker-bench/bench_runner.sh similarity index 100% rename from test/docker-bench/bench_runner.sh rename to test/pkg/docker-bench/bench_runner.sh diff --git a/test/check/Dockerfile b/test/pkg/kernel-config/Dockerfile similarity index 100% rename from test/check/Dockerfile rename to test/pkg/kernel-config/Dockerfile diff --git a/test/check/Makefile b/test/pkg/kernel-config/Makefile similarity index 97% rename from test/check/Makefile rename to test/pkg/kernel-config/Makefile index de24bfc86..96d172c7a 100644 --- a/test/check/Makefile +++ b/test/pkg/kernel-config/Makefile @@ -1,7 +1,7 @@ .PHONY: tag push BASE=alpine:3.5 -IMAGE=check +IMAGE=kernel-config default: push diff --git a/test/check/check-kernel-config.sh b/test/pkg/kernel-config/check-kernel-config.sh similarity index 100% rename from test/check/check-kernel-config.sh rename to test/pkg/kernel-config/check-kernel-config.sh diff --git a/test/check/check.sh b/test/pkg/kernel-config/check.sh similarity index 100% rename from test/check/check.sh rename to test/pkg/kernel-config/check.sh diff --git a/test/check/etc/linuxkit b/test/pkg/kernel-config/etc/linuxkit similarity index 100% rename from test/check/etc/linuxkit rename to test/pkg/kernel-config/etc/linuxkit diff --git a/test/ltp/.gitignore b/test/pkg/ltp/.gitignore similarity index 100% rename from test/ltp/.gitignore rename to test/pkg/ltp/.gitignore diff --git a/test/ltp/Dockerfile.build b/test/pkg/ltp/Dockerfile.build similarity index 100% rename from test/ltp/Dockerfile.build rename to test/pkg/ltp/Dockerfile.build diff --git a/test/ltp/Dockerfile.pkg b/test/pkg/ltp/Dockerfile.pkg similarity index 100% rename from test/ltp/Dockerfile.pkg rename to test/pkg/ltp/Dockerfile.pkg diff --git a/test/ltp/Makefile b/test/pkg/ltp/Makefile similarity index 100% rename from test/ltp/Makefile rename to test/pkg/ltp/Makefile diff --git a/test/ltp/README.md b/test/pkg/ltp/README.md similarity index 100% rename from test/ltp/README.md rename to test/pkg/ltp/README.md diff --git a/test/ltp/check.sh b/test/pkg/ltp/check.sh similarity index 100% rename from test/ltp/check.sh rename to test/pkg/ltp/check.sh diff --git a/test/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile similarity index 100% rename from test/poweroff/Dockerfile rename to test/pkg/poweroff/Dockerfile diff --git a/test/poweroff/Makefile b/test/pkg/poweroff/Makefile similarity index 100% rename from test/poweroff/Makefile rename to test/pkg/poweroff/Makefile diff --git a/test/poweroff/poweroff.sh b/test/pkg/poweroff/poweroff.sh similarity index 100% rename from test/poweroff/poweroff.sh rename to test/pkg/poweroff/poweroff.sh diff --git a/test/virtsock/.gitignore b/test/pkg/virtsock/.gitignore similarity index 100% rename from test/virtsock/.gitignore rename to test/pkg/virtsock/.gitignore diff --git a/test/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile similarity index 100% rename from test/virtsock/Dockerfile rename to test/pkg/virtsock/Dockerfile diff --git a/test/virtsock/Makefile b/test/pkg/virtsock/Makefile similarity index 100% rename from test/virtsock/Makefile rename to test/pkg/virtsock/Makefile diff --git a/test/virtsock/README.md b/test/pkg/virtsock/README.md similarity index 85% rename from test/virtsock/README.md rename to test/pkg/virtsock/README.md index 9b132f87d..7d7f41297 100644 --- a/test/virtsock/README.md +++ b/test/pkg/virtsock/README.md @@ -1,11 +1,11 @@ This directory contains the files to build and run a container containing the -virtio and Hyper-V socket stress tests. `test-virtsock-server.yml` builds images which start the server inside the VM. +virtio and Hyper-V socket stress tests. `../../cases/test-virtsock-server.yml` builds images which start the server inside the VM. The client, to be run on the host as per this [README](https://github.com/rneugeba/virtsock/blob/master/examples/README.md), can be obtained compiled from [here](https://github.com/rneugeba/virtsock). ## How to use (on Windows) -- Build the images: `moby build test-virtsock-server` +- Build the images: `moby build tests/cases/test-virtsock-server.yml` - Copy the `test-virtsock-server.iso` to a Windows system - Create a Type 1 Hyper-V VM (called `virtsock`). - No Disk or network required