From 140374e25d8ba4e01d46a38744987914261c4f41 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:31:00 -0700 Subject: [PATCH] *: move "scripts/docker-*" to "tests" Signed-off-by: Gyuho Lee --- Makefile | 46 +++++++++---------- {scripts => tests}/docker-dns-srv/Dockerfile | 0 .../docker-dns-srv/certs-gateway/Procfile | 0 .../docker-dns-srv/certs-gateway/ca-csr.json | 0 .../docker-dns-srv/certs-gateway/ca.crt | 0 .../docker-dns-srv/certs-gateway/gencert.json | 0 .../docker-dns-srv/certs-gateway/gencerts.sh | 0 .../docker-dns-srv/certs-gateway/run.sh | 0 .../certs-gateway/server-ca-csr.json | 0 .../docker-dns-srv/certs-gateway/server.crt | 0 .../certs-gateway/server.key.insecure | 0 .../docker-dns-srv/certs-wildcard/Procfile | 0 .../docker-dns-srv/certs-wildcard/ca-csr.json | 0 .../docker-dns-srv/certs-wildcard/ca.crt | 0 .../certs-wildcard/gencert.json | 0 .../docker-dns-srv/certs-wildcard/gencerts.sh | 0 .../docker-dns-srv/certs-wildcard/run.sh | 0 .../certs-wildcard/server-ca-csr.json | 0 .../docker-dns-srv/certs-wildcard/server.crt | 0 .../certs-wildcard/server.key.insecure | 0 .../docker-dns-srv/certs/Procfile | 0 .../docker-dns-srv/certs/ca-csr.json | 0 .../docker-dns-srv/certs/ca.crt | 0 .../docker-dns-srv/certs/gencert.json | 0 .../docker-dns-srv/certs/gencerts.sh | 0 .../docker-dns-srv/certs/run.sh | 0 .../docker-dns-srv/certs/server-ca-csr.json | 0 .../docker-dns-srv/certs/server.crt | 0 .../docker-dns-srv/certs/server.key.insecure | 0 {scripts => tests}/docker-dns-srv/etcd.zone | 0 {scripts => tests}/docker-dns-srv/named.conf | 0 {scripts => tests}/docker-dns-srv/rdns.zone | 0 {scripts => tests}/docker-dns-srv/resolv.conf | 0 {scripts => tests}/docker-dns/Dockerfile | 0 .../certs-common-name-auth/Procfile | 0 .../certs-common-name-auth/ca-csr.json | 0 .../docker-dns/certs-common-name-auth/ca.crt | 0 .../certs-common-name-auth/gencert.json | 0 .../certs-common-name-auth/gencerts.sh | 0 .../docker-dns/certs-common-name-auth/run.sh | 0 .../certs-common-name-auth/server-ca-csr.json | 0 .../certs-common-name-auth/server.crt | 0 .../server.key.insecure | 0 .../certs-common-name-multi/Procfile | 0 .../certs-common-name-multi/ca-csr.json | 0 .../docker-dns/certs-common-name-multi/ca.crt | 0 .../certs-common-name-multi/gencert.json | 0 .../certs-common-name-multi/gencerts.sh | 0 .../docker-dns/certs-common-name-multi/run.sh | 0 .../certs-common-name-multi/server-1.crt | 0 .../server-1.key.insecure | 0 .../certs-common-name-multi/server-2.crt | 0 .../server-2.key.insecure | 0 .../certs-common-name-multi/server-3.crt | 0 .../server-3.key.insecure | 0 .../server-ca-csr-1.json | 0 .../server-ca-csr-2.json | 0 .../server-ca-csr-3.json | 0 .../docker-dns/certs-gateway/Procfile | 0 .../docker-dns/certs-gateway/ca-csr.json | 0 .../docker-dns/certs-gateway/ca.crt | 0 .../docker-dns/certs-gateway/gencert.json | 0 .../docker-dns/certs-gateway/gencerts.sh | 0 .../docker-dns/certs-gateway/run.sh | 0 .../certs-gateway/server-ca-csr.json | 0 .../docker-dns/certs-gateway/server.crt | 0 .../certs-gateway/server.key.insecure | 0 .../docker-dns/certs-wildcard/Procfile | 0 .../docker-dns/certs-wildcard/ca-csr.json | 0 .../docker-dns/certs-wildcard/ca.crt | 0 .../docker-dns/certs-wildcard/gencert.json | 0 .../docker-dns/certs-wildcard/gencerts.sh | 0 .../docker-dns/certs-wildcard/run.sh | 0 .../certs-wildcard/server-ca-csr.json | 0 .../docker-dns/certs-wildcard/server.crt | 0 .../certs-wildcard/server.key.insecure | 0 {scripts => tests}/docker-dns/certs/Procfile | 0 .../docker-dns/certs/ca-csr.json | 0 {scripts => tests}/docker-dns/certs/ca.crt | 0 .../docker-dns/certs/gencert.json | 0 .../docker-dns/certs/gencerts.sh | 0 {scripts => tests}/docker-dns/certs/run.sh | 0 .../docker-dns/certs/server-ca-csr.json | 0 .../docker-dns/certs/server.crt | 0 .../docker-dns/certs/server.key.insecure | 0 {scripts => tests}/docker-dns/etcd.zone | 0 .../docker-dns/insecure/Procfile | 0 {scripts => tests}/docker-dns/insecure/run.sh | 0 {scripts => tests}/docker-dns/named.conf | 0 {scripts => tests}/docker-dns/rdns.zone | 0 {scripts => tests}/docker-dns/resolv.conf | 0 .../docker-static-ip/Dockerfile | 0 .../certs-metrics-proxy/Procfile | 0 .../certs-metrics-proxy/ca-csr.json | 0 .../certs-metrics-proxy/ca.crt | 0 .../certs-metrics-proxy/gencert.json | 0 .../certs-metrics-proxy/gencerts.sh | 0 .../certs-metrics-proxy/run.sh | 0 .../certs-metrics-proxy/server-ca-csr.json | 0 .../certs-metrics-proxy/server.crt | 0 .../certs-metrics-proxy/server.key.insecure | 0 .../docker-static-ip/certs/Procfile | 0 .../docker-static-ip/certs/ca-csr.json | 0 .../docker-static-ip/certs/ca.crt | 0 .../docker-static-ip/certs/gencert.json | 0 .../docker-static-ip/certs/gencerts.sh | 0 .../docker-static-ip/certs/run.sh | 0 .../docker-static-ip/certs/server-ca-csr.json | 0 .../docker-static-ip/certs/server.crt | 0 .../certs/server.key.insecure | 0 110 files changed, 23 insertions(+), 23 deletions(-) rename {scripts => tests}/docker-dns-srv/Dockerfile (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/Procfile (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/ca-csr.json (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/ca.crt (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/gencert.json (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/gencerts.sh (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/run.sh (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/server-ca-csr.json (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/server.crt (100%) rename {scripts => tests}/docker-dns-srv/certs-gateway/server.key.insecure (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/Procfile (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/ca-csr.json (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/ca.crt (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/gencert.json (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/gencerts.sh (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/run.sh (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/server-ca-csr.json (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/server.crt (100%) rename {scripts => tests}/docker-dns-srv/certs-wildcard/server.key.insecure (100%) rename {scripts => tests}/docker-dns-srv/certs/Procfile (100%) rename {scripts => tests}/docker-dns-srv/certs/ca-csr.json (100%) rename {scripts => tests}/docker-dns-srv/certs/ca.crt (100%) rename {scripts => tests}/docker-dns-srv/certs/gencert.json (100%) rename {scripts => tests}/docker-dns-srv/certs/gencerts.sh (100%) rename {scripts => tests}/docker-dns-srv/certs/run.sh (100%) rename {scripts => tests}/docker-dns-srv/certs/server-ca-csr.json (100%) rename {scripts => tests}/docker-dns-srv/certs/server.crt (100%) rename {scripts => tests}/docker-dns-srv/certs/server.key.insecure (100%) rename {scripts => tests}/docker-dns-srv/etcd.zone (100%) rename {scripts => tests}/docker-dns-srv/named.conf (100%) rename {scripts => tests}/docker-dns-srv/rdns.zone (100%) rename {scripts => tests}/docker-dns-srv/resolv.conf (100%) rename {scripts => tests}/docker-dns/Dockerfile (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/Procfile (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/ca.crt (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/gencert.json (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/gencerts.sh (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/run.sh (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/server-ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/server.crt (100%) rename {scripts => tests}/docker-dns/certs-common-name-auth/server.key.insecure (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/Procfile (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/ca.crt (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/gencert.json (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/gencerts.sh (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/run.sh (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-1.crt (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-1.key.insecure (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-2.crt (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-2.key.insecure (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-3.crt (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-3.key.insecure (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-ca-csr-1.json (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-ca-csr-2.json (100%) rename {scripts => tests}/docker-dns/certs-common-name-multi/server-ca-csr-3.json (100%) rename {scripts => tests}/docker-dns/certs-gateway/Procfile (100%) rename {scripts => tests}/docker-dns/certs-gateway/ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs-gateway/ca.crt (100%) rename {scripts => tests}/docker-dns/certs-gateway/gencert.json (100%) rename {scripts => tests}/docker-dns/certs-gateway/gencerts.sh (100%) rename {scripts => tests}/docker-dns/certs-gateway/run.sh (100%) rename {scripts => tests}/docker-dns/certs-gateway/server-ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs-gateway/server.crt (100%) rename {scripts => tests}/docker-dns/certs-gateway/server.key.insecure (100%) rename {scripts => tests}/docker-dns/certs-wildcard/Procfile (100%) rename {scripts => tests}/docker-dns/certs-wildcard/ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs-wildcard/ca.crt (100%) rename {scripts => tests}/docker-dns/certs-wildcard/gencert.json (100%) rename {scripts => tests}/docker-dns/certs-wildcard/gencerts.sh (100%) rename {scripts => tests}/docker-dns/certs-wildcard/run.sh (100%) rename {scripts => tests}/docker-dns/certs-wildcard/server-ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs-wildcard/server.crt (100%) rename {scripts => tests}/docker-dns/certs-wildcard/server.key.insecure (100%) rename {scripts => tests}/docker-dns/certs/Procfile (100%) rename {scripts => tests}/docker-dns/certs/ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs/ca.crt (100%) rename {scripts => tests}/docker-dns/certs/gencert.json (100%) rename {scripts => tests}/docker-dns/certs/gencerts.sh (100%) rename {scripts => tests}/docker-dns/certs/run.sh (100%) rename {scripts => tests}/docker-dns/certs/server-ca-csr.json (100%) rename {scripts => tests}/docker-dns/certs/server.crt (100%) rename {scripts => tests}/docker-dns/certs/server.key.insecure (100%) rename {scripts => tests}/docker-dns/etcd.zone (100%) rename {scripts => tests}/docker-dns/insecure/Procfile (100%) rename {scripts => tests}/docker-dns/insecure/run.sh (100%) rename {scripts => tests}/docker-dns/named.conf (100%) rename {scripts => tests}/docker-dns/rdns.zone (100%) rename {scripts => tests}/docker-dns/resolv.conf (100%) rename {scripts => tests}/docker-static-ip/Dockerfile (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/Procfile (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/ca-csr.json (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/ca.crt (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/gencert.json (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/gencerts.sh (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/run.sh (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/server-ca-csr.json (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/server.crt (100%) rename {scripts => tests}/docker-static-ip/certs-metrics-proxy/server.key.insecure (100%) rename {scripts => tests}/docker-static-ip/certs/Procfile (100%) rename {scripts => tests}/docker-static-ip/certs/ca-csr.json (100%) rename {scripts => tests}/docker-static-ip/certs/ca.crt (100%) rename {scripts => tests}/docker-static-ip/certs/gencert.json (100%) rename {scripts => tests}/docker-static-ip/certs/gencerts.sh (100%) rename {scripts => tests}/docker-static-ip/certs/run.sh (100%) rename {scripts => tests}/docker-static-ip/certs/server-ca-csr.json (100%) rename {scripts => tests}/docker-static-ip/certs/server.crt (100%) rename {scripts => tests}/docker-static-ip/certs/server.key.insecure (100%) diff --git a/Makefile b/Makefile index ae6cb4aab..a2bf9fa8b 100644 --- a/Makefile +++ b/Makefile @@ -219,12 +219,12 @@ push-docker-release-master: build-docker-static-ip-test: $(info GO_VERSION: $(GO_VERSION)) - @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./scripts/docker-static-ip/Dockerfile + @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./tests/docker-static-ip/Dockerfile docker build \ --tag gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \ - --file ./scripts/docker-static-ip/Dockerfile \ - ./scripts/docker-static-ip - @mv ./scripts/docker-static-ip/Dockerfile.bak ./scripts/docker-static-ip/Dockerfile + --file ./tests/docker-static-ip/Dockerfile \ + ./tests/docker-static-ip + @mv ./tests/docker-static-ip/Dockerfile.bak ./tests/docker-static-ip/Dockerfile push-docker-static-ip-test: $(info GO_VERSION: $(GO_VERSION)) @@ -243,7 +243,7 @@ docker-static-ip-test-certs-run: --tty \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-static-ip/certs,destination=/certs \ + --mount type=bind,source=`pwd`/tests/docker-static-ip/certs,destination=/certs \ gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd" @@ -256,7 +256,7 @@ docker-static-ip-test-certs-metrics-proxy-run: --tty \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-static-ip/certs-metrics-proxy,destination=/certs-metrics-proxy \ + --mount type=bind,source=`pwd`/tests/docker-static-ip/certs-metrics-proxy,destination=/certs-metrics-proxy \ gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs-metrics-proxy/run.sh && rm -rf m*.etcd" @@ -282,12 +282,12 @@ docker-static-ip-test-certs-metrics-proxy-run: build-docker-dns-test: $(info GO_VERSION: $(GO_VERSION)) - @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./scripts/docker-dns/Dockerfile + @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./tests/docker-dns/Dockerfile docker build \ --tag gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - --file ./scripts/docker-dns/Dockerfile \ - ./scripts/docker-dns - @mv ./scripts/docker-dns/Dockerfile.bak ./scripts/docker-dns/Dockerfile + --file ./tests/docker-dns/Dockerfile \ + ./tests/docker-dns + @mv ./tests/docker-dns/Dockerfile.bak ./tests/docker-dns/Dockerfile docker run \ --rm \ @@ -313,7 +313,7 @@ docker-dns-test-insecure-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns/insecure,destination=/insecure \ + --mount type=bind,source=`pwd`/tests/docker-dns/insecure,destination=/insecure \ gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /insecure/run.sh && rm -rf m*.etcd" @@ -327,7 +327,7 @@ docker-dns-test-certs-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns/certs,destination=/certs \ + --mount type=bind,source=`pwd`/tests/docker-dns/certs,destination=/certs \ gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd" @@ -341,7 +341,7 @@ docker-dns-test-certs-gateway-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns/certs-gateway,destination=/certs-gateway \ + --mount type=bind,source=`pwd`/tests/docker-dns/certs-gateway,destination=/certs-gateway \ gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd" @@ -355,7 +355,7 @@ docker-dns-test-certs-wildcard-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns/certs-wildcard,destination=/certs-wildcard \ + --mount type=bind,source=`pwd`/tests/docker-dns/certs-wildcard,destination=/certs-wildcard \ gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd" @@ -369,7 +369,7 @@ docker-dns-test-certs-common-name-auth-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns/certs-common-name-auth,destination=/certs-common-name-auth \ + --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-auth,destination=/certs-common-name-auth \ gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs-common-name-auth/run.sh && rm -rf m*.etcd" @@ -383,7 +383,7 @@ docker-dns-test-certs-common-name-multi-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns/certs-common-name-multi,destination=/certs-common-name-multi \ + --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-multi,destination=/certs-common-name-multi \ gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs-common-name-multi/run.sh && rm -rf m*.etcd" @@ -403,12 +403,12 @@ docker-dns-test-certs-common-name-multi-run: build-docker-dns-srv-test: $(info GO_VERSION: $(GO_VERSION)) - @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./scripts/docker-dns-srv/Dockerfile + @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./tests/docker-dns-srv/Dockerfile docker build \ --tag gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ - --file ./scripts/docker-dns-srv/Dockerfile \ - ./scripts/docker-dns-srv - @mv ./scripts/docker-dns-srv/Dockerfile.bak ./scripts/docker-dns-srv/Dockerfile + --file ./tests/docker-dns-srv/Dockerfile \ + ./tests/docker-dns-srv + @mv ./tests/docker-dns-srv/Dockerfile.bak ./tests/docker-dns-srv/Dockerfile docker run \ --rm \ @@ -434,7 +434,7 @@ docker-dns-srv-test-certs-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns-srv/certs,destination=/certs \ + --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs,destination=/certs \ gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd" @@ -448,7 +448,7 @@ docker-dns-srv-test-certs-gateway-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns-srv/certs-gateway,destination=/certs-gateway \ + --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-gateway,destination=/certs-gateway \ gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd" @@ -462,7 +462,7 @@ docker-dns-srv-test-certs-wildcard-run: --dns 127.0.0.1 \ $(TMP_DIR_MOUNT_FLAG) \ --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/scripts/docker-dns-srv/certs-wildcard,destination=/certs-wildcard \ + --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-wildcard,destination=/certs-wildcard \ gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd" diff --git a/scripts/docker-dns-srv/Dockerfile b/tests/docker-dns-srv/Dockerfile similarity index 100% rename from scripts/docker-dns-srv/Dockerfile rename to tests/docker-dns-srv/Dockerfile diff --git a/scripts/docker-dns-srv/certs-gateway/Procfile b/tests/docker-dns-srv/certs-gateway/Procfile similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/Procfile rename to tests/docker-dns-srv/certs-gateway/Procfile diff --git a/scripts/docker-dns-srv/certs-gateway/ca-csr.json b/tests/docker-dns-srv/certs-gateway/ca-csr.json similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/ca-csr.json rename to tests/docker-dns-srv/certs-gateway/ca-csr.json diff --git a/scripts/docker-dns-srv/certs-gateway/ca.crt b/tests/docker-dns-srv/certs-gateway/ca.crt similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/ca.crt rename to tests/docker-dns-srv/certs-gateway/ca.crt diff --git a/scripts/docker-dns-srv/certs-gateway/gencert.json b/tests/docker-dns-srv/certs-gateway/gencert.json similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/gencert.json rename to tests/docker-dns-srv/certs-gateway/gencert.json diff --git a/scripts/docker-dns-srv/certs-gateway/gencerts.sh b/tests/docker-dns-srv/certs-gateway/gencerts.sh similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/gencerts.sh rename to tests/docker-dns-srv/certs-gateway/gencerts.sh diff --git a/scripts/docker-dns-srv/certs-gateway/run.sh b/tests/docker-dns-srv/certs-gateway/run.sh similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/run.sh rename to tests/docker-dns-srv/certs-gateway/run.sh diff --git a/scripts/docker-dns-srv/certs-gateway/server-ca-csr.json b/tests/docker-dns-srv/certs-gateway/server-ca-csr.json similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/server-ca-csr.json rename to tests/docker-dns-srv/certs-gateway/server-ca-csr.json diff --git a/scripts/docker-dns-srv/certs-gateway/server.crt b/tests/docker-dns-srv/certs-gateway/server.crt similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/server.crt rename to tests/docker-dns-srv/certs-gateway/server.crt diff --git a/scripts/docker-dns-srv/certs-gateway/server.key.insecure b/tests/docker-dns-srv/certs-gateway/server.key.insecure similarity index 100% rename from scripts/docker-dns-srv/certs-gateway/server.key.insecure rename to tests/docker-dns-srv/certs-gateway/server.key.insecure diff --git a/scripts/docker-dns-srv/certs-wildcard/Procfile b/tests/docker-dns-srv/certs-wildcard/Procfile similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/Procfile rename to tests/docker-dns-srv/certs-wildcard/Procfile diff --git a/scripts/docker-dns-srv/certs-wildcard/ca-csr.json b/tests/docker-dns-srv/certs-wildcard/ca-csr.json similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/ca-csr.json rename to tests/docker-dns-srv/certs-wildcard/ca-csr.json diff --git a/scripts/docker-dns-srv/certs-wildcard/ca.crt b/tests/docker-dns-srv/certs-wildcard/ca.crt similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/ca.crt rename to tests/docker-dns-srv/certs-wildcard/ca.crt diff --git a/scripts/docker-dns-srv/certs-wildcard/gencert.json b/tests/docker-dns-srv/certs-wildcard/gencert.json similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/gencert.json rename to tests/docker-dns-srv/certs-wildcard/gencert.json diff --git a/scripts/docker-dns-srv/certs-wildcard/gencerts.sh b/tests/docker-dns-srv/certs-wildcard/gencerts.sh similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/gencerts.sh rename to tests/docker-dns-srv/certs-wildcard/gencerts.sh diff --git a/scripts/docker-dns-srv/certs-wildcard/run.sh b/tests/docker-dns-srv/certs-wildcard/run.sh similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/run.sh rename to tests/docker-dns-srv/certs-wildcard/run.sh diff --git a/scripts/docker-dns-srv/certs-wildcard/server-ca-csr.json b/tests/docker-dns-srv/certs-wildcard/server-ca-csr.json similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/server-ca-csr.json rename to tests/docker-dns-srv/certs-wildcard/server-ca-csr.json diff --git a/scripts/docker-dns-srv/certs-wildcard/server.crt b/tests/docker-dns-srv/certs-wildcard/server.crt similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/server.crt rename to tests/docker-dns-srv/certs-wildcard/server.crt diff --git a/scripts/docker-dns-srv/certs-wildcard/server.key.insecure b/tests/docker-dns-srv/certs-wildcard/server.key.insecure similarity index 100% rename from scripts/docker-dns-srv/certs-wildcard/server.key.insecure rename to tests/docker-dns-srv/certs-wildcard/server.key.insecure diff --git a/scripts/docker-dns-srv/certs/Procfile b/tests/docker-dns-srv/certs/Procfile similarity index 100% rename from scripts/docker-dns-srv/certs/Procfile rename to tests/docker-dns-srv/certs/Procfile diff --git a/scripts/docker-dns-srv/certs/ca-csr.json b/tests/docker-dns-srv/certs/ca-csr.json similarity index 100% rename from scripts/docker-dns-srv/certs/ca-csr.json rename to tests/docker-dns-srv/certs/ca-csr.json diff --git a/scripts/docker-dns-srv/certs/ca.crt b/tests/docker-dns-srv/certs/ca.crt similarity index 100% rename from scripts/docker-dns-srv/certs/ca.crt rename to tests/docker-dns-srv/certs/ca.crt diff --git a/scripts/docker-dns-srv/certs/gencert.json b/tests/docker-dns-srv/certs/gencert.json similarity index 100% rename from scripts/docker-dns-srv/certs/gencert.json rename to tests/docker-dns-srv/certs/gencert.json diff --git a/scripts/docker-dns-srv/certs/gencerts.sh b/tests/docker-dns-srv/certs/gencerts.sh similarity index 100% rename from scripts/docker-dns-srv/certs/gencerts.sh rename to tests/docker-dns-srv/certs/gencerts.sh diff --git a/scripts/docker-dns-srv/certs/run.sh b/tests/docker-dns-srv/certs/run.sh similarity index 100% rename from scripts/docker-dns-srv/certs/run.sh rename to tests/docker-dns-srv/certs/run.sh diff --git a/scripts/docker-dns-srv/certs/server-ca-csr.json b/tests/docker-dns-srv/certs/server-ca-csr.json similarity index 100% rename from scripts/docker-dns-srv/certs/server-ca-csr.json rename to tests/docker-dns-srv/certs/server-ca-csr.json diff --git a/scripts/docker-dns-srv/certs/server.crt b/tests/docker-dns-srv/certs/server.crt similarity index 100% rename from scripts/docker-dns-srv/certs/server.crt rename to tests/docker-dns-srv/certs/server.crt diff --git a/scripts/docker-dns-srv/certs/server.key.insecure b/tests/docker-dns-srv/certs/server.key.insecure similarity index 100% rename from scripts/docker-dns-srv/certs/server.key.insecure rename to tests/docker-dns-srv/certs/server.key.insecure diff --git a/scripts/docker-dns-srv/etcd.zone b/tests/docker-dns-srv/etcd.zone similarity index 100% rename from scripts/docker-dns-srv/etcd.zone rename to tests/docker-dns-srv/etcd.zone diff --git a/scripts/docker-dns-srv/named.conf b/tests/docker-dns-srv/named.conf similarity index 100% rename from scripts/docker-dns-srv/named.conf rename to tests/docker-dns-srv/named.conf diff --git a/scripts/docker-dns-srv/rdns.zone b/tests/docker-dns-srv/rdns.zone similarity index 100% rename from scripts/docker-dns-srv/rdns.zone rename to tests/docker-dns-srv/rdns.zone diff --git a/scripts/docker-dns-srv/resolv.conf b/tests/docker-dns-srv/resolv.conf similarity index 100% rename from scripts/docker-dns-srv/resolv.conf rename to tests/docker-dns-srv/resolv.conf diff --git a/scripts/docker-dns/Dockerfile b/tests/docker-dns/Dockerfile similarity index 100% rename from scripts/docker-dns/Dockerfile rename to tests/docker-dns/Dockerfile diff --git a/scripts/docker-dns/certs-common-name-auth/Procfile b/tests/docker-dns/certs-common-name-auth/Procfile similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/Procfile rename to tests/docker-dns/certs-common-name-auth/Procfile diff --git a/scripts/docker-dns/certs-common-name-auth/ca-csr.json b/tests/docker-dns/certs-common-name-auth/ca-csr.json similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/ca-csr.json rename to tests/docker-dns/certs-common-name-auth/ca-csr.json diff --git a/scripts/docker-dns/certs-common-name-auth/ca.crt b/tests/docker-dns/certs-common-name-auth/ca.crt similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/ca.crt rename to tests/docker-dns/certs-common-name-auth/ca.crt diff --git a/scripts/docker-dns/certs-common-name-auth/gencert.json b/tests/docker-dns/certs-common-name-auth/gencert.json similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/gencert.json rename to tests/docker-dns/certs-common-name-auth/gencert.json diff --git a/scripts/docker-dns/certs-common-name-auth/gencerts.sh b/tests/docker-dns/certs-common-name-auth/gencerts.sh similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/gencerts.sh rename to tests/docker-dns/certs-common-name-auth/gencerts.sh diff --git a/scripts/docker-dns/certs-common-name-auth/run.sh b/tests/docker-dns/certs-common-name-auth/run.sh similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/run.sh rename to tests/docker-dns/certs-common-name-auth/run.sh diff --git a/scripts/docker-dns/certs-common-name-auth/server-ca-csr.json b/tests/docker-dns/certs-common-name-auth/server-ca-csr.json similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/server-ca-csr.json rename to tests/docker-dns/certs-common-name-auth/server-ca-csr.json diff --git a/scripts/docker-dns/certs-common-name-auth/server.crt b/tests/docker-dns/certs-common-name-auth/server.crt similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/server.crt rename to tests/docker-dns/certs-common-name-auth/server.crt diff --git a/scripts/docker-dns/certs-common-name-auth/server.key.insecure b/tests/docker-dns/certs-common-name-auth/server.key.insecure similarity index 100% rename from scripts/docker-dns/certs-common-name-auth/server.key.insecure rename to tests/docker-dns/certs-common-name-auth/server.key.insecure diff --git a/scripts/docker-dns/certs-common-name-multi/Procfile b/tests/docker-dns/certs-common-name-multi/Procfile similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/Procfile rename to tests/docker-dns/certs-common-name-multi/Procfile diff --git a/scripts/docker-dns/certs-common-name-multi/ca-csr.json b/tests/docker-dns/certs-common-name-multi/ca-csr.json similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/ca-csr.json rename to tests/docker-dns/certs-common-name-multi/ca-csr.json diff --git a/scripts/docker-dns/certs-common-name-multi/ca.crt b/tests/docker-dns/certs-common-name-multi/ca.crt similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/ca.crt rename to tests/docker-dns/certs-common-name-multi/ca.crt diff --git a/scripts/docker-dns/certs-common-name-multi/gencert.json b/tests/docker-dns/certs-common-name-multi/gencert.json similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/gencert.json rename to tests/docker-dns/certs-common-name-multi/gencert.json diff --git a/scripts/docker-dns/certs-common-name-multi/gencerts.sh b/tests/docker-dns/certs-common-name-multi/gencerts.sh similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/gencerts.sh rename to tests/docker-dns/certs-common-name-multi/gencerts.sh diff --git a/scripts/docker-dns/certs-common-name-multi/run.sh b/tests/docker-dns/certs-common-name-multi/run.sh similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/run.sh rename to tests/docker-dns/certs-common-name-multi/run.sh diff --git a/scripts/docker-dns/certs-common-name-multi/server-1.crt b/tests/docker-dns/certs-common-name-multi/server-1.crt similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-1.crt rename to tests/docker-dns/certs-common-name-multi/server-1.crt diff --git a/scripts/docker-dns/certs-common-name-multi/server-1.key.insecure b/tests/docker-dns/certs-common-name-multi/server-1.key.insecure similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-1.key.insecure rename to tests/docker-dns/certs-common-name-multi/server-1.key.insecure diff --git a/scripts/docker-dns/certs-common-name-multi/server-2.crt b/tests/docker-dns/certs-common-name-multi/server-2.crt similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-2.crt rename to tests/docker-dns/certs-common-name-multi/server-2.crt diff --git a/scripts/docker-dns/certs-common-name-multi/server-2.key.insecure b/tests/docker-dns/certs-common-name-multi/server-2.key.insecure similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-2.key.insecure rename to tests/docker-dns/certs-common-name-multi/server-2.key.insecure diff --git a/scripts/docker-dns/certs-common-name-multi/server-3.crt b/tests/docker-dns/certs-common-name-multi/server-3.crt similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-3.crt rename to tests/docker-dns/certs-common-name-multi/server-3.crt diff --git a/scripts/docker-dns/certs-common-name-multi/server-3.key.insecure b/tests/docker-dns/certs-common-name-multi/server-3.key.insecure similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-3.key.insecure rename to tests/docker-dns/certs-common-name-multi/server-3.key.insecure diff --git a/scripts/docker-dns/certs-common-name-multi/server-ca-csr-1.json b/tests/docker-dns/certs-common-name-multi/server-ca-csr-1.json similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-ca-csr-1.json rename to tests/docker-dns/certs-common-name-multi/server-ca-csr-1.json diff --git a/scripts/docker-dns/certs-common-name-multi/server-ca-csr-2.json b/tests/docker-dns/certs-common-name-multi/server-ca-csr-2.json similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-ca-csr-2.json rename to tests/docker-dns/certs-common-name-multi/server-ca-csr-2.json diff --git a/scripts/docker-dns/certs-common-name-multi/server-ca-csr-3.json b/tests/docker-dns/certs-common-name-multi/server-ca-csr-3.json similarity index 100% rename from scripts/docker-dns/certs-common-name-multi/server-ca-csr-3.json rename to tests/docker-dns/certs-common-name-multi/server-ca-csr-3.json diff --git a/scripts/docker-dns/certs-gateway/Procfile b/tests/docker-dns/certs-gateway/Procfile similarity index 100% rename from scripts/docker-dns/certs-gateway/Procfile rename to tests/docker-dns/certs-gateway/Procfile diff --git a/scripts/docker-dns/certs-gateway/ca-csr.json b/tests/docker-dns/certs-gateway/ca-csr.json similarity index 100% rename from scripts/docker-dns/certs-gateway/ca-csr.json rename to tests/docker-dns/certs-gateway/ca-csr.json diff --git a/scripts/docker-dns/certs-gateway/ca.crt b/tests/docker-dns/certs-gateway/ca.crt similarity index 100% rename from scripts/docker-dns/certs-gateway/ca.crt rename to tests/docker-dns/certs-gateway/ca.crt diff --git a/scripts/docker-dns/certs-gateway/gencert.json b/tests/docker-dns/certs-gateway/gencert.json similarity index 100% rename from scripts/docker-dns/certs-gateway/gencert.json rename to tests/docker-dns/certs-gateway/gencert.json diff --git a/scripts/docker-dns/certs-gateway/gencerts.sh b/tests/docker-dns/certs-gateway/gencerts.sh similarity index 100% rename from scripts/docker-dns/certs-gateway/gencerts.sh rename to tests/docker-dns/certs-gateway/gencerts.sh diff --git a/scripts/docker-dns/certs-gateway/run.sh b/tests/docker-dns/certs-gateway/run.sh similarity index 100% rename from scripts/docker-dns/certs-gateway/run.sh rename to tests/docker-dns/certs-gateway/run.sh diff --git a/scripts/docker-dns/certs-gateway/server-ca-csr.json b/tests/docker-dns/certs-gateway/server-ca-csr.json similarity index 100% rename from scripts/docker-dns/certs-gateway/server-ca-csr.json rename to tests/docker-dns/certs-gateway/server-ca-csr.json diff --git a/scripts/docker-dns/certs-gateway/server.crt b/tests/docker-dns/certs-gateway/server.crt similarity index 100% rename from scripts/docker-dns/certs-gateway/server.crt rename to tests/docker-dns/certs-gateway/server.crt diff --git a/scripts/docker-dns/certs-gateway/server.key.insecure b/tests/docker-dns/certs-gateway/server.key.insecure similarity index 100% rename from scripts/docker-dns/certs-gateway/server.key.insecure rename to tests/docker-dns/certs-gateway/server.key.insecure diff --git a/scripts/docker-dns/certs-wildcard/Procfile b/tests/docker-dns/certs-wildcard/Procfile similarity index 100% rename from scripts/docker-dns/certs-wildcard/Procfile rename to tests/docker-dns/certs-wildcard/Procfile diff --git a/scripts/docker-dns/certs-wildcard/ca-csr.json b/tests/docker-dns/certs-wildcard/ca-csr.json similarity index 100% rename from scripts/docker-dns/certs-wildcard/ca-csr.json rename to tests/docker-dns/certs-wildcard/ca-csr.json diff --git a/scripts/docker-dns/certs-wildcard/ca.crt b/tests/docker-dns/certs-wildcard/ca.crt similarity index 100% rename from scripts/docker-dns/certs-wildcard/ca.crt rename to tests/docker-dns/certs-wildcard/ca.crt diff --git a/scripts/docker-dns/certs-wildcard/gencert.json b/tests/docker-dns/certs-wildcard/gencert.json similarity index 100% rename from scripts/docker-dns/certs-wildcard/gencert.json rename to tests/docker-dns/certs-wildcard/gencert.json diff --git a/scripts/docker-dns/certs-wildcard/gencerts.sh b/tests/docker-dns/certs-wildcard/gencerts.sh similarity index 100% rename from scripts/docker-dns/certs-wildcard/gencerts.sh rename to tests/docker-dns/certs-wildcard/gencerts.sh diff --git a/scripts/docker-dns/certs-wildcard/run.sh b/tests/docker-dns/certs-wildcard/run.sh similarity index 100% rename from scripts/docker-dns/certs-wildcard/run.sh rename to tests/docker-dns/certs-wildcard/run.sh diff --git a/scripts/docker-dns/certs-wildcard/server-ca-csr.json b/tests/docker-dns/certs-wildcard/server-ca-csr.json similarity index 100% rename from scripts/docker-dns/certs-wildcard/server-ca-csr.json rename to tests/docker-dns/certs-wildcard/server-ca-csr.json diff --git a/scripts/docker-dns/certs-wildcard/server.crt b/tests/docker-dns/certs-wildcard/server.crt similarity index 100% rename from scripts/docker-dns/certs-wildcard/server.crt rename to tests/docker-dns/certs-wildcard/server.crt diff --git a/scripts/docker-dns/certs-wildcard/server.key.insecure b/tests/docker-dns/certs-wildcard/server.key.insecure similarity index 100% rename from scripts/docker-dns/certs-wildcard/server.key.insecure rename to tests/docker-dns/certs-wildcard/server.key.insecure diff --git a/scripts/docker-dns/certs/Procfile b/tests/docker-dns/certs/Procfile similarity index 100% rename from scripts/docker-dns/certs/Procfile rename to tests/docker-dns/certs/Procfile diff --git a/scripts/docker-dns/certs/ca-csr.json b/tests/docker-dns/certs/ca-csr.json similarity index 100% rename from scripts/docker-dns/certs/ca-csr.json rename to tests/docker-dns/certs/ca-csr.json diff --git a/scripts/docker-dns/certs/ca.crt b/tests/docker-dns/certs/ca.crt similarity index 100% rename from scripts/docker-dns/certs/ca.crt rename to tests/docker-dns/certs/ca.crt diff --git a/scripts/docker-dns/certs/gencert.json b/tests/docker-dns/certs/gencert.json similarity index 100% rename from scripts/docker-dns/certs/gencert.json rename to tests/docker-dns/certs/gencert.json diff --git a/scripts/docker-dns/certs/gencerts.sh b/tests/docker-dns/certs/gencerts.sh similarity index 100% rename from scripts/docker-dns/certs/gencerts.sh rename to tests/docker-dns/certs/gencerts.sh diff --git a/scripts/docker-dns/certs/run.sh b/tests/docker-dns/certs/run.sh similarity index 100% rename from scripts/docker-dns/certs/run.sh rename to tests/docker-dns/certs/run.sh diff --git a/scripts/docker-dns/certs/server-ca-csr.json b/tests/docker-dns/certs/server-ca-csr.json similarity index 100% rename from scripts/docker-dns/certs/server-ca-csr.json rename to tests/docker-dns/certs/server-ca-csr.json diff --git a/scripts/docker-dns/certs/server.crt b/tests/docker-dns/certs/server.crt similarity index 100% rename from scripts/docker-dns/certs/server.crt rename to tests/docker-dns/certs/server.crt diff --git a/scripts/docker-dns/certs/server.key.insecure b/tests/docker-dns/certs/server.key.insecure similarity index 100% rename from scripts/docker-dns/certs/server.key.insecure rename to tests/docker-dns/certs/server.key.insecure diff --git a/scripts/docker-dns/etcd.zone b/tests/docker-dns/etcd.zone similarity index 100% rename from scripts/docker-dns/etcd.zone rename to tests/docker-dns/etcd.zone diff --git a/scripts/docker-dns/insecure/Procfile b/tests/docker-dns/insecure/Procfile similarity index 100% rename from scripts/docker-dns/insecure/Procfile rename to tests/docker-dns/insecure/Procfile diff --git a/scripts/docker-dns/insecure/run.sh b/tests/docker-dns/insecure/run.sh similarity index 100% rename from scripts/docker-dns/insecure/run.sh rename to tests/docker-dns/insecure/run.sh diff --git a/scripts/docker-dns/named.conf b/tests/docker-dns/named.conf similarity index 100% rename from scripts/docker-dns/named.conf rename to tests/docker-dns/named.conf diff --git a/scripts/docker-dns/rdns.zone b/tests/docker-dns/rdns.zone similarity index 100% rename from scripts/docker-dns/rdns.zone rename to tests/docker-dns/rdns.zone diff --git a/scripts/docker-dns/resolv.conf b/tests/docker-dns/resolv.conf similarity index 100% rename from scripts/docker-dns/resolv.conf rename to tests/docker-dns/resolv.conf diff --git a/scripts/docker-static-ip/Dockerfile b/tests/docker-static-ip/Dockerfile similarity index 100% rename from scripts/docker-static-ip/Dockerfile rename to tests/docker-static-ip/Dockerfile diff --git a/scripts/docker-static-ip/certs-metrics-proxy/Procfile b/tests/docker-static-ip/certs-metrics-proxy/Procfile similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/Procfile rename to tests/docker-static-ip/certs-metrics-proxy/Procfile diff --git a/scripts/docker-static-ip/certs-metrics-proxy/ca-csr.json b/tests/docker-static-ip/certs-metrics-proxy/ca-csr.json similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/ca-csr.json rename to tests/docker-static-ip/certs-metrics-proxy/ca-csr.json diff --git a/scripts/docker-static-ip/certs-metrics-proxy/ca.crt b/tests/docker-static-ip/certs-metrics-proxy/ca.crt similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/ca.crt rename to tests/docker-static-ip/certs-metrics-proxy/ca.crt diff --git a/scripts/docker-static-ip/certs-metrics-proxy/gencert.json b/tests/docker-static-ip/certs-metrics-proxy/gencert.json similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/gencert.json rename to tests/docker-static-ip/certs-metrics-proxy/gencert.json diff --git a/scripts/docker-static-ip/certs-metrics-proxy/gencerts.sh b/tests/docker-static-ip/certs-metrics-proxy/gencerts.sh similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/gencerts.sh rename to tests/docker-static-ip/certs-metrics-proxy/gencerts.sh diff --git a/scripts/docker-static-ip/certs-metrics-proxy/run.sh b/tests/docker-static-ip/certs-metrics-proxy/run.sh similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/run.sh rename to tests/docker-static-ip/certs-metrics-proxy/run.sh diff --git a/scripts/docker-static-ip/certs-metrics-proxy/server-ca-csr.json b/tests/docker-static-ip/certs-metrics-proxy/server-ca-csr.json similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/server-ca-csr.json rename to tests/docker-static-ip/certs-metrics-proxy/server-ca-csr.json diff --git a/scripts/docker-static-ip/certs-metrics-proxy/server.crt b/tests/docker-static-ip/certs-metrics-proxy/server.crt similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/server.crt rename to tests/docker-static-ip/certs-metrics-proxy/server.crt diff --git a/scripts/docker-static-ip/certs-metrics-proxy/server.key.insecure b/tests/docker-static-ip/certs-metrics-proxy/server.key.insecure similarity index 100% rename from scripts/docker-static-ip/certs-metrics-proxy/server.key.insecure rename to tests/docker-static-ip/certs-metrics-proxy/server.key.insecure diff --git a/scripts/docker-static-ip/certs/Procfile b/tests/docker-static-ip/certs/Procfile similarity index 100% rename from scripts/docker-static-ip/certs/Procfile rename to tests/docker-static-ip/certs/Procfile diff --git a/scripts/docker-static-ip/certs/ca-csr.json b/tests/docker-static-ip/certs/ca-csr.json similarity index 100% rename from scripts/docker-static-ip/certs/ca-csr.json rename to tests/docker-static-ip/certs/ca-csr.json diff --git a/scripts/docker-static-ip/certs/ca.crt b/tests/docker-static-ip/certs/ca.crt similarity index 100% rename from scripts/docker-static-ip/certs/ca.crt rename to tests/docker-static-ip/certs/ca.crt diff --git a/scripts/docker-static-ip/certs/gencert.json b/tests/docker-static-ip/certs/gencert.json similarity index 100% rename from scripts/docker-static-ip/certs/gencert.json rename to tests/docker-static-ip/certs/gencert.json diff --git a/scripts/docker-static-ip/certs/gencerts.sh b/tests/docker-static-ip/certs/gencerts.sh similarity index 100% rename from scripts/docker-static-ip/certs/gencerts.sh rename to tests/docker-static-ip/certs/gencerts.sh diff --git a/scripts/docker-static-ip/certs/run.sh b/tests/docker-static-ip/certs/run.sh similarity index 100% rename from scripts/docker-static-ip/certs/run.sh rename to tests/docker-static-ip/certs/run.sh diff --git a/scripts/docker-static-ip/certs/server-ca-csr.json b/tests/docker-static-ip/certs/server-ca-csr.json similarity index 100% rename from scripts/docker-static-ip/certs/server-ca-csr.json rename to tests/docker-static-ip/certs/server-ca-csr.json diff --git a/scripts/docker-static-ip/certs/server.crt b/tests/docker-static-ip/certs/server.crt similarity index 100% rename from scripts/docker-static-ip/certs/server.crt rename to tests/docker-static-ip/certs/server.crt diff --git a/scripts/docker-static-ip/certs/server.key.insecure b/tests/docker-static-ip/certs/server.key.insecure similarity index 100% rename from scripts/docker-static-ip/certs/server.key.insecure rename to tests/docker-static-ip/certs/server.key.insecure