From 21fdbc283aa66166344fe3e0814751579f8d438b Mon Sep 17 00:00:00 2001 From: Christopher Obbard Date: Thu, 13 Aug 2020 17:50:49 +0100 Subject: [PATCH] docker: recipes-test: move tests to project root directory The tests are first-class citizens; they should be present in the directory as such. Signed-off-by: Christopher Obbard --- docker/recipes.test.yml | 22 +++++++++--------- .../tests => tests}/separatedirs/base.tar.gz | Bin .../tests => tests}/separatedirs/main.yaml | 0 {docker/tests => tests}/simple/A/A/A/A/a.txt | 0 {docker/tests => tests}/simple/base.tar.gz | Bin {docker/tests => tests}/simple/main.yaml | 0 {docker/tests => tests}/subdirs/base.tar.gz | Bin {docker/tests => tests}/subdirs/main.yaml | 0 .../subdirs/overlay-a/A/A/A/A/a.txt | 0 .../subdirs/overlay-a/overlay-A.yaml | 0 {docker/tests => tests}/tests.sh | 0 11 files changed, 11 insertions(+), 11 deletions(-) rename {docker/tests => tests}/separatedirs/base.tar.gz (100%) rename {docker/tests => tests}/separatedirs/main.yaml (100%) rename {docker/tests => tests}/simple/A/A/A/A/a.txt (100%) rename {docker/tests => tests}/simple/base.tar.gz (100%) rename {docker/tests => tests}/simple/main.yaml (100%) rename {docker/tests => tests}/subdirs/base.tar.gz (100%) rename {docker/tests => tests}/subdirs/main.yaml (100%) rename {docker/tests => tests}/subdirs/overlay-a/A/A/A/A/a.txt (100%) rename {docker/tests => tests}/subdirs/overlay-a/overlay-A.yaml (100%) rename {docker/tests => tests}/tests.sh (100%) diff --git a/docker/recipes.test.yml b/docker/recipes.test.yml index fde59b5..ae7ccdc 100644 --- a/docker/recipes.test.yml +++ b/docker/recipes.test.yml @@ -1,14 +1,14 @@ version: '3.4' services: - sut: - build: - context: .. - dockerfile: docker/Dockerfile - target: runner - volumes: - - type: bind - source: ./tests - target: /recipes - working_dir: /recipes - entrypoint: ./tests.sh + sut: + build: + context: .. + dockerfile: docker/Dockerfile + target: runner + volumes: + - type: bind + source: ../tests + target: /recipes + working_dir: /recipes + entrypoint: ./tests.sh diff --git a/docker/tests/separatedirs/base.tar.gz b/tests/separatedirs/base.tar.gz similarity index 100% rename from docker/tests/separatedirs/base.tar.gz rename to tests/separatedirs/base.tar.gz diff --git a/docker/tests/separatedirs/main.yaml b/tests/separatedirs/main.yaml similarity index 100% rename from docker/tests/separatedirs/main.yaml rename to tests/separatedirs/main.yaml diff --git a/docker/tests/simple/A/A/A/A/a.txt b/tests/simple/A/A/A/A/a.txt similarity index 100% rename from docker/tests/simple/A/A/A/A/a.txt rename to tests/simple/A/A/A/A/a.txt diff --git a/docker/tests/simple/base.tar.gz b/tests/simple/base.tar.gz similarity index 100% rename from docker/tests/simple/base.tar.gz rename to tests/simple/base.tar.gz diff --git a/docker/tests/simple/main.yaml b/tests/simple/main.yaml similarity index 100% rename from docker/tests/simple/main.yaml rename to tests/simple/main.yaml diff --git a/docker/tests/subdirs/base.tar.gz b/tests/subdirs/base.tar.gz similarity index 100% rename from docker/tests/subdirs/base.tar.gz rename to tests/subdirs/base.tar.gz diff --git a/docker/tests/subdirs/main.yaml b/tests/subdirs/main.yaml similarity index 100% rename from docker/tests/subdirs/main.yaml rename to tests/subdirs/main.yaml diff --git a/docker/tests/subdirs/overlay-a/A/A/A/A/a.txt b/tests/subdirs/overlay-a/A/A/A/A/a.txt similarity index 100% rename from docker/tests/subdirs/overlay-a/A/A/A/A/a.txt rename to tests/subdirs/overlay-a/A/A/A/A/a.txt diff --git a/docker/tests/subdirs/overlay-a/overlay-A.yaml b/tests/subdirs/overlay-a/overlay-A.yaml similarity index 100% rename from docker/tests/subdirs/overlay-a/overlay-A.yaml rename to tests/subdirs/overlay-a/overlay-A.yaml diff --git a/docker/tests/tests.sh b/tests/tests.sh similarity index 100% rename from docker/tests/tests.sh rename to tests/tests.sh