From 1ee7b14c691cd8c18af4e28760dbbbd8909ecca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sat, 20 Jun 2020 19:25:48 +0200 Subject: [PATCH] move nginx test to seperate directory --- .gitignore | 1 + index.alpha.html => tests/index.alpha.html | 0 index.bravo.html => tests/index.bravo.html | 0 nginx.conf => tests/nginx.conf | 0 tests/result | 1 + tests/static_registry/default.nix | 5 +++++ {static_registry => tests/static_registry}/nginx/Dockerfile | 0 tests.nix => tests/tests.nix | 4 ++-- 8 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .gitignore rename index.alpha.html => tests/index.alpha.html (100%) rename index.bravo.html => tests/index.bravo.html (100%) rename nginx.conf => tests/nginx.conf (100%) create mode 120000 tests/result create mode 100644 tests/static_registry/default.nix rename {static_registry => tests/static_registry}/nginx/Dockerfile (100%) rename tests.nix => tests/tests.nix (96%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a49a8e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +tests/**/*.tar.gz diff --git a/index.alpha.html b/tests/index.alpha.html similarity index 100% rename from index.alpha.html rename to tests/index.alpha.html diff --git a/index.bravo.html b/tests/index.bravo.html similarity index 100% rename from index.bravo.html rename to tests/index.bravo.html diff --git a/nginx.conf b/tests/nginx.conf similarity index 100% rename from nginx.conf rename to tests/nginx.conf diff --git a/tests/result b/tests/result new file mode 120000 index 0000000..cbbc912 --- /dev/null +++ b/tests/result @@ -0,0 +1 @@ +/nix/store/xrls5la280q72grq3rvx44z95xqscyjy-vm-test-run-unnamed \ No newline at end of file diff --git a/tests/static_registry/default.nix b/tests/static_registry/default.nix new file mode 100644 index 0000000..22068c8 --- /dev/null +++ b/tests/static_registry/default.nix @@ -0,0 +1,5 @@ +{ + nginx = { + nginx_7d0cdcc60a96 = { image = "${/home/max/code/nixos/docker/tests/static_registry/nginx/7d0cdcc60a96.tar.gz}"; tag = "nginx:7d0cdcc60a96"; }; + }; +} diff --git a/static_registry/nginx/Dockerfile b/tests/static_registry/nginx/Dockerfile similarity index 100% rename from static_registry/nginx/Dockerfile rename to tests/static_registry/nginx/Dockerfile diff --git a/tests.nix b/tests/tests.nix similarity index 96% rename from tests.nix rename to tests/tests.nix index 2737c40..629e36c 100644 --- a/tests.nix +++ b/tests/tests.nix @@ -9,9 +9,9 @@ let nginx_image = registry.nginx.nginx_7d0cdcc60a96; in { - mytest = makeTest { + nginx = makeTest { machine = { ... }: { - imports = [ ./default.nix ]; + imports = [ ../default.nix ]; virtualisation.cores = 4; virtualisation.memorySize = 1024;