From 6e3652f42c2b764ff71079ac5d74bb4381cbca34 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:28:04 -0700 Subject: [PATCH 01/11] README: update "Community meetings" Signed-off-by: Gyuho Lee --- README.md | 3 +-- meeting.ics | 49 ------------------------------------------------- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 meeting.ics diff --git a/README.md b/README.md index ef3437f03..a9024f5bb 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,8 @@ See [etcdctl][etcdctl] for a simple command line client. ## Community meetings -etcd contributors and maintainers have bi-weekly meetings at 11:00 AM (USA Pacific) on Tuesdays. There is an [iCalendar][rfc5545] format for the meetings [here](meeting.ics). Anyone is welcome to join via [BlueJeans][bluejeans] or audio-only: +1 669 900 6833. An initial agenda will be posted to the [shared Google docs][shared-meeting-notes] a day before each meeting, and everyone is welcome to suggest additional topics or other agendas. +etcd contributors and maintainers have bi-weekly meetings at 11:00 AM (USA Pacific) on Tuesdays. Anyone is welcome to join via [BlueJeans][bluejeans]. An initial agenda will be posted to the [shared Google docs][shared-meeting-notes] a day before each meeting, and everyone is welcome to suggest additional topics or other agendas. -[rfc5545]: https://tools.ietf.org/html/rfc5545 [bluejeans]: https://bluejeans.com/2732309610 [shared-meeting-notes]: https://docs.google.com/document/d/1DbVXOHvd9scFsSmL2oNg4YGOHJdXqtx583DmeVWrB_M/edit# diff --git a/meeting.ics b/meeting.ics deleted file mode 100644 index 0157f9ab0..000000000 --- a/meeting.ics +++ /dev/null @@ -1,49 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//Google Inc//Google Calendar 70.9054//EN -VERSION:2.0 -CALSCALE:GREGORIAN -METHOD:REPLY -BEGIN:VTIMEZONE -TZID:America/Los_Angeles -X-LIC-LOCATION:America/Los_Angeles -BEGIN:DAYLIGHT -TZOFFSETFROM:-0800 -TZOFFSETTO:-0700 -TZNAME:PDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:-0700 -TZOFFSETTO:-0800 -TZNAME:PST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU -END:STANDARD -END:VTIMEZONE -BEGIN:VEVENT -DTSTART;TZID=America/Los_Angeles:20180116T110000 -DTEND;TZID=America/Los_Angeles:20180116T115000 -RRULE:FREQ=WEEKLY;INTERVAL=2;BYDAY=TU -DTSTAMP:20171213T131221Z -ORGANIZER;CN=Gyuho Lee:mailto:gyu_ho.lee@coreos.com -UID:11ivec3kg2egsng3vrl8t5alar@google.com -CREATED:20171212T194217Z -DESCRIPTION:
Please add your discussion items to the meeting notes.
< - br>Meeting notes
https://docs.google.com - /document/d/1DbVXOHvd9scFsSmL2oNg4YGOHJdXqtx583DmeVWrB_M/edit?usp=sharing

Zoom meeting
https://coreos.zoom - .us/j/854793406

Slack
https://kubernetes. - slack.com #etcd


 -LAST-MODIFIED:20171213T131220Z -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:etcd meeting -TRANSP:OPAQUE -END:VEVENT -END:VCALENDAR From b59e91d6762cd3a526795854c79bc24a8074ca6f Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:29:10 -0700 Subject: [PATCH 02/11] hack/benchmark: remove v2 benchmark Signed-off-by: Gyuho Lee --- hack/benchmark/README.md | 14 --------- hack/benchmark/bench.sh | 65 ---------------------------------------- 2 files changed, 79 deletions(-) delete mode 100644 hack/benchmark/README.md delete mode 100755 hack/benchmark/bench.sh diff --git a/hack/benchmark/README.md b/hack/benchmark/README.md deleted file mode 100644 index 6a09c5302..000000000 --- a/hack/benchmark/README.md +++ /dev/null @@ -1,14 +0,0 @@ -## Usage - -Benchmark 3-member etcd cluster to get its read and write performance. - -## Instructions - -1. Start 3-member etcd cluster on 3 machines -2. Update `$leader` and `$servers` in the script -3. Run the script in a separate machine - -## Caveat - -1. Set environment variable `GOMAXPROCS` as the number of available cores to maximize CPU resources for both etcd member and bench process. -2. Set the number of open files per process as 10000 for amounts of client connections for both etcd member and benchmark process. diff --git a/hack/benchmark/bench.sh b/hack/benchmark/bench.sh deleted file mode 100755 index d72efd3e2..000000000 --- a/hack/benchmark/bench.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -e - -leader=http://localhost:2379 -# assume three servers -servers=( http://localhost:2379 http://localhost:22379 http://localhost:32379 ) - -keyarray=( 64 256 ) - -for keysize in ${keyarray[@]}; do - - echo write, 1 client, $keysize key size, to leader - ./hey -m PUT -n 10 -d value=`head -c $keysize < /dev/zero | tr '\0' '\141'` -c 1 -T application/x-www-form-urlencoded $leader/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - - echo write, 64 client, $keysize key size, to leader - ./hey -m PUT -n 640 -d value=`head -c $keysize < /dev/zero | tr '\0' '\141'` -c 64 -T application/x-www-form-urlencoded $leader/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - - echo write, 256 client, $keysize key size, to leader - ./hey -m PUT -n 2560 -d value=`head -c $keysize < /dev/zero | tr '\0' '\141'` -c 256 -T application/x-www-form-urlencoded $leader/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - - echo write, 64 client, $keysize key size, to all servers - for i in ${servers[@]}; do - ./hey -m PUT -n 210 -d value=`head -c $keysize < /dev/zero | tr '\0' '\141'` -c 21 -T application/x-www-form-urlencoded $i/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo & - done - # wait for all heys to start running - sleep 3 - # wait for all heys to finish - for pid in $(pgrep 'hey'); do - while kill -0 "$pid" 2> /dev/null; do - sleep 3 - done - done - - echo write, 256 client, $keysize key size, to all servers - for i in ${servers[@]}; do - ./hey -m PUT -n 850 -d value=`head -c $keysize < /dev/zero | tr '\0' '\141'` -c 85 -T application/x-www-form-urlencoded $i/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo & - done - sleep 3 - for pid in $(pgrep 'hey'); do - while kill -0 "$pid" 2> /dev/null; do - sleep 3 - done - done - - echo read, 1 client, $keysize key size, to leader - ./hey -n 100 -c 1 $leader/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - - echo read, 64 client, $keysize key size, to leader - ./hey -n 6400 -c 64 $leader/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - - echo read, 256 client, $keysize key size, to leader - ./hey -n 25600 -c 256 $leader/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - - echo read, 64 client, $keysize key size, to all servers - # bench servers one by one, so it doesn't overload this benchmark machine - # It doesn't impact correctness because read request doesn't involve peer interaction. - for i in ${servers[@]}; do - ./hey -n 21000 -c 21 $i/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - done - - echo read, 256 client, $keysize key size, to all servers - for i in ${servers[@]}; do - ./hey -n 85000 -c 85 $i/v2/keys/foo | grep -e "Requests/sec" -e "Latency" -e "90%" | tr "\n" "\t" | xargs echo - done - -done From 140374e25d8ba4e01d46a38744987914261c4f41 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:31:00 -0700 Subject: [PATCH 03/11] *: 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 From 20e1179faca1ae9b8682cfdde05a2c731175efa4 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:33:25 -0700 Subject: [PATCH 04/11] Dockerfile-test: move to "tests" Signed-off-by: Gyuho Lee --- Makefile | 6 +++--- Dockerfile-test => tests/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename Dockerfile-test => tests/Dockerfile (97%) diff --git a/Makefile b/Makefile index a2bf9fa8b..732bd5af9 100644 --- a/Makefile +++ b/Makefile @@ -75,11 +75,11 @@ endif build-docker-test: $(info GO_VERSION: $(GO_VERSION)) - @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./Dockerfile-test + @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./tests/Dockerfile docker build \ --tag gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \ - --file ./Dockerfile-test . - @mv ./Dockerfile-test.bak ./Dockerfile-test + --file ./tests/Dockerfile . + @mv ./tests/Dockerfile.bak ./tests/Dockerfile push-docker-test: $(info GO_VERSION: $(GO_VERSION)) diff --git a/Dockerfile-test b/tests/Dockerfile similarity index 97% rename from Dockerfile-test rename to tests/Dockerfile index 44f768da3..3c69a8c5f 100644 --- a/Dockerfile-test +++ b/tests/Dockerfile @@ -15,7 +15,7 @@ RUN dnf check-update || true \ ENV GOROOT /usr/local/go ENV GOPATH /go ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION REPLACE_ME_GO_VERSION +ENV GO_VERSION 1.10.1 ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang RUN rm -rf ${GOROOT} \ && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \ From 784b6528d225e1c76fbb9210aee56f129f63372f Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:35:21 -0700 Subject: [PATCH 05/11] *: move "Dockerfile-functional" Signed-off-by: Gyuho Lee --- Makefile | 6 +++--- Dockerfile-functional => functional/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename Dockerfile-functional => functional/Dockerfile (94%) diff --git a/Makefile b/Makefile index 732bd5af9..71ff1ee18 100644 --- a/Makefile +++ b/Makefile @@ -486,12 +486,12 @@ build-functional: build-docker-functional: $(info GO_VERSION: $(GO_VERSION)) $(info ETCD_VERSION: $(ETCD_VERSION)) - @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./Dockerfile-functional + @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./functional/Dockerfile docker build \ --tag gcr.io/etcd-development/etcd-functional:go$(GO_VERSION) \ - --file ./Dockerfile-functional \ + --file ./functional/Dockerfile \ . - @mv ./Dockerfile-functional.bak ./Dockerfile-functional + @mv ./functional/Dockerfile.bak ./functional/Dockerfile docker run \ --rm \ diff --git a/Dockerfile-functional b/functional/Dockerfile similarity index 94% rename from Dockerfile-functional rename to functional/Dockerfile index fbcc34ec2..5e6a32bd9 100644 --- a/Dockerfile-functional +++ b/functional/Dockerfile @@ -13,7 +13,7 @@ RUN dnf check-update || true \ ENV GOROOT /usr/local/go ENV GOPATH /go ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION REPLACE_ME_GO_VERSION +ENV GO_VERSION 1.10.1 ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang RUN rm -rf ${GOROOT} \ && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \ From d636abc2d4f8e791ebd615c9141243d063e6d9a5 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:35:39 -0700 Subject: [PATCH 06/11] Dockerfile: remove We don't have build triggers anymore. Signed-off-by: Gyuho Lee --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e77526ad6..000000000 --- a/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM golang -ADD . /go/src/github.com/coreos/etcd -RUN go install github.com/coreos/etcd -EXPOSE 2379 2380 -ENTRYPOINT ["etcd"] From 72211db7cf97d6297d1594d6529f500a1cfb3de6 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:37:28 -0700 Subject: [PATCH 07/11] tests: move internal "e2e" Signed-off-by: Gyuho Lee --- {e2e => tests/e2e}/cluster_direct_test.go | 0 {e2e => tests/e2e}/cluster_proxy_test.go | 0 {e2e => tests/e2e}/cluster_test.go | 0 {e2e => tests/e2e}/ctl_v2_test.go | 0 {e2e => tests/e2e}/ctl_v3_alarm_test.go | 0 {e2e => tests/e2e}/ctl_v3_auth_test.go | 0 {e2e => tests/e2e}/ctl_v3_compact_test.go | 0 {e2e => tests/e2e}/ctl_v3_defrag_test.go | 0 {e2e => tests/e2e}/ctl_v3_elect_test.go | 0 {e2e => tests/e2e}/ctl_v3_endpoint_test.go | 0 {e2e => tests/e2e}/ctl_v3_kv_test.go | 0 {e2e => tests/e2e}/ctl_v3_lease_test.go | 0 {e2e => tests/e2e}/ctl_v3_lock_test.go | 0 {e2e => tests/e2e}/ctl_v3_make_mirror_test.go | 0 {e2e => tests/e2e}/ctl_v3_member_test.go | 0 {e2e => tests/e2e}/ctl_v3_migrate_test.go | 0 {e2e => tests/e2e}/ctl_v3_move_leader_test.go | 0 {e2e => tests/e2e}/ctl_v3_role_test.go | 0 {e2e => tests/e2e}/ctl_v3_snapshot_test.go | 0 {e2e => tests/e2e}/ctl_v3_test.go | 0 {e2e => tests/e2e}/ctl_v3_txn_test.go | 0 {e2e => tests/e2e}/ctl_v3_user_test.go | 0 {e2e => tests/e2e}/ctl_v3_watch_test.go | 0 {e2e => tests/e2e}/doc.go | 0 {e2e => tests/e2e}/etcd_config_test.go | 0 {e2e => tests/e2e}/etcd_corrupt_test.go | 0 {e2e => tests/e2e}/etcd_process.go | 0 {e2e => tests/e2e}/etcd_release_upgrade_test.go | 0 {e2e => tests/e2e}/etcd_spawn_cov.go | 0 {e2e => tests/e2e}/etcd_spawn_nocov.go | 0 {e2e => tests/e2e}/gateway_test.go | 0 {e2e => tests/e2e}/main_test.go | 0 {e2e => tests/e2e}/metrics_test.go | 0 {e2e => tests/e2e}/util.go | 0 {e2e => tests/e2e}/v2_curl_test.go | 0 {e2e => tests/e2e}/v2_test.go | 0 {e2e => tests/e2e}/v2v3_test.go | 0 {e2e => tests/e2e}/v3_curl_lease_test.go | 0 {e2e => tests/e2e}/v3_curl_test.go | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename {e2e => tests/e2e}/cluster_direct_test.go (100%) rename {e2e => tests/e2e}/cluster_proxy_test.go (100%) rename {e2e => tests/e2e}/cluster_test.go (100%) rename {e2e => tests/e2e}/ctl_v2_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_alarm_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_auth_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_compact_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_defrag_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_elect_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_endpoint_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_kv_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_lease_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_lock_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_make_mirror_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_member_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_migrate_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_move_leader_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_role_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_snapshot_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_txn_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_user_test.go (100%) rename {e2e => tests/e2e}/ctl_v3_watch_test.go (100%) rename {e2e => tests/e2e}/doc.go (100%) rename {e2e => tests/e2e}/etcd_config_test.go (100%) rename {e2e => tests/e2e}/etcd_corrupt_test.go (100%) rename {e2e => tests/e2e}/etcd_process.go (100%) rename {e2e => tests/e2e}/etcd_release_upgrade_test.go (100%) rename {e2e => tests/e2e}/etcd_spawn_cov.go (100%) rename {e2e => tests/e2e}/etcd_spawn_nocov.go (100%) rename {e2e => tests/e2e}/gateway_test.go (100%) rename {e2e => tests/e2e}/main_test.go (100%) rename {e2e => tests/e2e}/metrics_test.go (100%) rename {e2e => tests/e2e}/util.go (100%) rename {e2e => tests/e2e}/v2_curl_test.go (100%) rename {e2e => tests/e2e}/v2_test.go (100%) rename {e2e => tests/e2e}/v2v3_test.go (100%) rename {e2e => tests/e2e}/v3_curl_lease_test.go (100%) rename {e2e => tests/e2e}/v3_curl_test.go (100%) diff --git a/e2e/cluster_direct_test.go b/tests/e2e/cluster_direct_test.go similarity index 100% rename from e2e/cluster_direct_test.go rename to tests/e2e/cluster_direct_test.go diff --git a/e2e/cluster_proxy_test.go b/tests/e2e/cluster_proxy_test.go similarity index 100% rename from e2e/cluster_proxy_test.go rename to tests/e2e/cluster_proxy_test.go diff --git a/e2e/cluster_test.go b/tests/e2e/cluster_test.go similarity index 100% rename from e2e/cluster_test.go rename to tests/e2e/cluster_test.go diff --git a/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go similarity index 100% rename from e2e/ctl_v2_test.go rename to tests/e2e/ctl_v2_test.go diff --git a/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go similarity index 100% rename from e2e/ctl_v3_alarm_test.go rename to tests/e2e/ctl_v3_alarm_test.go diff --git a/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go similarity index 100% rename from e2e/ctl_v3_auth_test.go rename to tests/e2e/ctl_v3_auth_test.go diff --git a/e2e/ctl_v3_compact_test.go b/tests/e2e/ctl_v3_compact_test.go similarity index 100% rename from e2e/ctl_v3_compact_test.go rename to tests/e2e/ctl_v3_compact_test.go diff --git a/e2e/ctl_v3_defrag_test.go b/tests/e2e/ctl_v3_defrag_test.go similarity index 100% rename from e2e/ctl_v3_defrag_test.go rename to tests/e2e/ctl_v3_defrag_test.go diff --git a/e2e/ctl_v3_elect_test.go b/tests/e2e/ctl_v3_elect_test.go similarity index 100% rename from e2e/ctl_v3_elect_test.go rename to tests/e2e/ctl_v3_elect_test.go diff --git a/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go similarity index 100% rename from e2e/ctl_v3_endpoint_test.go rename to tests/e2e/ctl_v3_endpoint_test.go diff --git a/e2e/ctl_v3_kv_test.go b/tests/e2e/ctl_v3_kv_test.go similarity index 100% rename from e2e/ctl_v3_kv_test.go rename to tests/e2e/ctl_v3_kv_test.go diff --git a/e2e/ctl_v3_lease_test.go b/tests/e2e/ctl_v3_lease_test.go similarity index 100% rename from e2e/ctl_v3_lease_test.go rename to tests/e2e/ctl_v3_lease_test.go diff --git a/e2e/ctl_v3_lock_test.go b/tests/e2e/ctl_v3_lock_test.go similarity index 100% rename from e2e/ctl_v3_lock_test.go rename to tests/e2e/ctl_v3_lock_test.go diff --git a/e2e/ctl_v3_make_mirror_test.go b/tests/e2e/ctl_v3_make_mirror_test.go similarity index 100% rename from e2e/ctl_v3_make_mirror_test.go rename to tests/e2e/ctl_v3_make_mirror_test.go diff --git a/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go similarity index 100% rename from e2e/ctl_v3_member_test.go rename to tests/e2e/ctl_v3_member_test.go diff --git a/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go similarity index 100% rename from e2e/ctl_v3_migrate_test.go rename to tests/e2e/ctl_v3_migrate_test.go diff --git a/e2e/ctl_v3_move_leader_test.go b/tests/e2e/ctl_v3_move_leader_test.go similarity index 100% rename from e2e/ctl_v3_move_leader_test.go rename to tests/e2e/ctl_v3_move_leader_test.go diff --git a/e2e/ctl_v3_role_test.go b/tests/e2e/ctl_v3_role_test.go similarity index 100% rename from e2e/ctl_v3_role_test.go rename to tests/e2e/ctl_v3_role_test.go diff --git a/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go similarity index 100% rename from e2e/ctl_v3_snapshot_test.go rename to tests/e2e/ctl_v3_snapshot_test.go diff --git a/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go similarity index 100% rename from e2e/ctl_v3_test.go rename to tests/e2e/ctl_v3_test.go diff --git a/e2e/ctl_v3_txn_test.go b/tests/e2e/ctl_v3_txn_test.go similarity index 100% rename from e2e/ctl_v3_txn_test.go rename to tests/e2e/ctl_v3_txn_test.go diff --git a/e2e/ctl_v3_user_test.go b/tests/e2e/ctl_v3_user_test.go similarity index 100% rename from e2e/ctl_v3_user_test.go rename to tests/e2e/ctl_v3_user_test.go diff --git a/e2e/ctl_v3_watch_test.go b/tests/e2e/ctl_v3_watch_test.go similarity index 100% rename from e2e/ctl_v3_watch_test.go rename to tests/e2e/ctl_v3_watch_test.go diff --git a/e2e/doc.go b/tests/e2e/doc.go similarity index 100% rename from e2e/doc.go rename to tests/e2e/doc.go diff --git a/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go similarity index 100% rename from e2e/etcd_config_test.go rename to tests/e2e/etcd_config_test.go diff --git a/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go similarity index 100% rename from e2e/etcd_corrupt_test.go rename to tests/e2e/etcd_corrupt_test.go diff --git a/e2e/etcd_process.go b/tests/e2e/etcd_process.go similarity index 100% rename from e2e/etcd_process.go rename to tests/e2e/etcd_process.go diff --git a/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go similarity index 100% rename from e2e/etcd_release_upgrade_test.go rename to tests/e2e/etcd_release_upgrade_test.go diff --git a/e2e/etcd_spawn_cov.go b/tests/e2e/etcd_spawn_cov.go similarity index 100% rename from e2e/etcd_spawn_cov.go rename to tests/e2e/etcd_spawn_cov.go diff --git a/e2e/etcd_spawn_nocov.go b/tests/e2e/etcd_spawn_nocov.go similarity index 100% rename from e2e/etcd_spawn_nocov.go rename to tests/e2e/etcd_spawn_nocov.go diff --git a/e2e/gateway_test.go b/tests/e2e/gateway_test.go similarity index 100% rename from e2e/gateway_test.go rename to tests/e2e/gateway_test.go diff --git a/e2e/main_test.go b/tests/e2e/main_test.go similarity index 100% rename from e2e/main_test.go rename to tests/e2e/main_test.go diff --git a/e2e/metrics_test.go b/tests/e2e/metrics_test.go similarity index 100% rename from e2e/metrics_test.go rename to tests/e2e/metrics_test.go diff --git a/e2e/util.go b/tests/e2e/util.go similarity index 100% rename from e2e/util.go rename to tests/e2e/util.go diff --git a/e2e/v2_curl_test.go b/tests/e2e/v2_curl_test.go similarity index 100% rename from e2e/v2_curl_test.go rename to tests/e2e/v2_curl_test.go diff --git a/e2e/v2_test.go b/tests/e2e/v2_test.go similarity index 100% rename from e2e/v2_test.go rename to tests/e2e/v2_test.go diff --git a/e2e/v2v3_test.go b/tests/e2e/v2v3_test.go similarity index 100% rename from e2e/v2v3_test.go rename to tests/e2e/v2v3_test.go diff --git a/e2e/v3_curl_lease_test.go b/tests/e2e/v3_curl_lease_test.go similarity index 100% rename from e2e/v3_curl_lease_test.go rename to tests/e2e/v3_curl_lease_test.go diff --git a/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go similarity index 100% rename from e2e/v3_curl_test.go rename to tests/e2e/v3_curl_test.go From 0c327ea4561949b7941eba280d62a20b56ae494f Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:39:41 -0700 Subject: [PATCH 08/11] test: move "e2e" and "functional" Signed-off-by: Gyuho Lee --- functional/Dockerfile | 2 +- test | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/functional/Dockerfile b/functional/Dockerfile index 5e6a32bd9..fbcc34ec2 100644 --- a/functional/Dockerfile +++ b/functional/Dockerfile @@ -13,7 +13,7 @@ RUN dnf check-update || true \ ENV GOROOT /usr/local/go ENV GOPATH /go ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION 1.10.1 +ENV GO_VERSION REPLACE_ME_GO_VERSION ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang RUN rm -rf ${GOROOT} \ && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \ diff --git a/test b/test index c69f7a62b..aab75145a 100755 --- a/test +++ b/test @@ -51,11 +51,11 @@ COVER=${COVER:-"-cover"} # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt. IGNORE_PKGS="(vendor/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)" -INTEGRATION_PKGS="(integration|e2e|contrib|functional-tester)" +INTEGRATION_PKGS="(integration|tests/e2e|contrib|functional)" # all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools # shellcheck disable=SC1117 -PKGS=$(find . -name \*.go | while read -r a; do dirname "$a"; done | sort | uniq | grep -vE "$IGNORE_PKGS" | grep -vE "(tools/|contrib/|e2e|pb)" | sed "s|\.|${REPO_PATH}|g" | xargs echo) +PKGS=$(find . -name \*.go | while read -r a; do dirname "$a"; done | sort | uniq | grep -vE "$IGNORE_PKGS" | grep -vE "(tools/|contrib/|tests/e2e|pb)" | sed "s|\.|${REPO_PATH}|g" | xargs echo) # pkg1,pkg2,pkg3 PKGS_COMMA=${PKGS// /,} @@ -238,7 +238,7 @@ function cov_pass { # shellcheck disable=SC2206 GOCOVFLAGS=($GOCOVFLAGS) failed="" - for t in $(echo "${TEST_PKGS}" | grep -vE "(e2e|functional-tester)"); do + for t in $(echo "${TEST_PKGS}" | grep -vE "(tests/e2e|functional)"); do tf=$(echo "$t" | tr / _) # cache package compilation data for faster repeated builds go test "${GOCOVFLAGS[@]}" -i "${REPO_PATH}/$t" || true @@ -257,10 +257,10 @@ function cov_pass { # use 30m timeout because e2e coverage takes longer # due to many tests cause etcd process to wait # on leadership transfer timeout during gracefully shutdown - echo Testing e2e without proxy... - go test -tags cov -timeout 30m -v "${REPO_PATH}/e2e" || failed="$failed e2e" - echo Testing e2e with proxy... - go test -tags "cov cluster_proxy" -timeout 30m -v "${REPO_PATH}/e2e" || failed="$failed e2e-proxy" + echo Testing tests/e2e without proxy... + go test -tags cov -timeout 30m -v "${REPO_PATH}/tests/e2e" || failed="$failed tests/e2e" + echo Testing tests/e2e with proxy... + go test -tags "cov cluster_proxy" -timeout 30m -v "${REPO_PATH}/tests/e2e" || failed="$failed tests/e2e-proxy" # incrementally merge to get coverage data even if some coverage files are corrupted # optimistically assume etcdserver package's coverage file is OK since gocovmerge @@ -297,13 +297,13 @@ function e2e_pass { USERTIMEOUT="${TIMEOUT}" fi - go test -timeout "${USERTIMEOUT}" -v -cpu 1,2,4 "${RUN_ARG}" "$@" "${REPO_PATH}/e2e" + go test -timeout "${USERTIMEOUT}" -v -cpu 1,2,4 "${RUN_ARG}" "$@" "${REPO_PATH}/tests/e2e" } function integration_e2e_pass { echo "Running integration and e2e tests..." - go test -timeout 20m -v -cpu 1,2,4 "$@" "${REPO_PATH}/e2e" & + go test -timeout 20m -v -cpu 1,2,4 "$@" "${REPO_PATH}/tests/e2e" & e2epid="$!" go test -timeout 20m -v -cpu 1,2,4 "$@" "${REPO_PATH}/integration" & intpid="$!" @@ -315,7 +315,7 @@ function integration_e2e_pass { function grpcproxy_pass { go test -timeout 20m -v ${RACE} -tags cluster_proxy -cpu 1,2,4 "$@" "${REPO_PATH}/integration" go test -timeout 20m -v ${RACE} -tags cluster_proxy -cpu 1,2,4 "$@" "${REPO_PATH}/clientv3/integration" - go test -timeout 20m -v -tags cluster_proxy "$@" "${REPO_PATH}/e2e" + go test -timeout 20m -v -tags cluster_proxy "$@" "${REPO_PATH}/tests/e2e" } function release_pass { From 0e7f1100e332d2564a2508894fbe226d98d992fb Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:46:39 -0700 Subject: [PATCH 09/11] cover: move coverage test script to "tests" Signed-off-by: Gyuho Lee --- test | 2 +- cover => tests/cover.test.bash | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) rename cover => tests/cover.test.bash (71%) diff --git a/test b/test index aab75145a..cc94244ac 100755 --- a/test +++ b/test @@ -46,7 +46,7 @@ fi USERPKG=${PKG:-} -# Invoke ./cover for HTML output +# Invoke ./tests/cover.test.bash for HTML output COVER=${COVER:-"-cover"} # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt. diff --git a/cover b/tests/cover.test.bash similarity index 71% rename from cover rename to tests/cover.test.bash index b7ad39113..eb089a4d2 100755 --- a/cover +++ b/tests/cover.test.bash @@ -1,13 +1,18 @@ #!/usr/bin/env bash # # Generate coverage HTML for a package -# e.g. PKG=./unit ./cover +# e.g. PKG=./unit ./tests/cover.test.bash # set -e +if ! [[ "$0" =~ "tests/cover.test.bash" ]]; then + echo "must be run from repository root" + exit 255 +fi + if [ -z "$PKG" ]; then - echo "cover only works with a single package, sorry" - exit 255 + echo "cover only works with a single package, sorry" + exit 255 fi COVEROUT="coverage" From 774f6652df1045c1ffd5c42f56c6cc05833a8000 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:48:54 -0700 Subject: [PATCH 10/11] semaphore.sh: move to "tests/semaphore.test.bash" Signed-off-by: Gyuho Lee --- .semaphore.sh | 16 ---------------- tests/semaphore.test.bash | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 16 deletions(-) delete mode 100755 .semaphore.sh create mode 100755 tests/semaphore.test.bash diff --git a/.semaphore.sh b/.semaphore.sh deleted file mode 100755 index 887a0cc56..000000000 --- a/.semaphore.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -TEST_SUFFIX=$(date +%s | base64 | head -c 15) - -TEST_OPTS="PASSES='build unit release integration_e2e functional' MANUAL_VER=v3.3.3" -if [ "$TEST_ARCH" == "386" ]; then - TEST_OPTS="GOARCH=386 PASSES='build unit integration_e2e'" -fi - -docker run \ - --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd \ - gcr.io/etcd-development/etcd-test:go1.10.1 \ - /bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log" - -! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-${TEST_SUFFIX}.log diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash new file mode 100755 index 000000000..866be7b1c --- /dev/null +++ b/tests/semaphore.test.bash @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +if ! [[ "$0" =~ "tests/semaphore.test.bash" ]]; then + echo "must be run from repository root" + exit 255 +fi + +TEST_SUFFIX=$(date +%s | base64 | head -c 15) + +TEST_OPTS="PASSES='build unit release integration_e2e functional' MANUAL_VER=v3.3.3" +if [ "$TEST_ARCH" == "386" ]; then + TEST_OPTS="GOARCH=386 PASSES='build unit integration_e2e'" +fi + +docker run \ + --rm \ + --volume=`pwd`:/go/src/github.com/coreos/etcd \ + gcr.io/etcd-development/etcd-test:go1.10.1 \ + /bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log" + +! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-${TEST_SUFFIX}.log From a60bb6104c947a4ec08038a778905c6b04c4434f Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 10:59:52 -0700 Subject: [PATCH 11/11] *: regenerate "fixtures-expired" Signed-off-by: Gyuho Lee --- clientv3/integration/dial_test.go | 6 +- integration/cluster.go | 6 +- integration/fixtures-expired/ca-csr.json | 19 ++++ integration/fixtures-expired/ca.crt | 23 ++++ .../fixtures-expired/etcd-root-ca-key.pem | 51 --------- integration/fixtures-expired/etcd-root-ca.pem | 34 ------ integration/fixtures-expired/gencert.json | 13 +++ integration/fixtures-expired/gencerts.sh | 106 ++++-------------- .../fixtures-expired/server-ca-csr.json | 20 ++++ integration/fixtures-expired/server-key.pem | 51 --------- integration/fixtures-expired/server.crt | 24 ++++ .../fixtures-expired/server.key.insecure | 27 +++++ integration/fixtures-expired/server.pem | 35 ------ integration/fixtures/gencerts.sh | 42 +++---- 14 files changed, 177 insertions(+), 280 deletions(-) create mode 100644 integration/fixtures-expired/ca-csr.json create mode 100644 integration/fixtures-expired/ca.crt delete mode 100644 integration/fixtures-expired/etcd-root-ca-key.pem delete mode 100644 integration/fixtures-expired/etcd-root-ca.pem create mode 100644 integration/fixtures-expired/gencert.json create mode 100644 integration/fixtures-expired/server-ca-csr.json delete mode 100644 integration/fixtures-expired/server-key.pem create mode 100644 integration/fixtures-expired/server.crt create mode 100644 integration/fixtures-expired/server.key.insecure delete mode 100644 integration/fixtures-expired/server.pem diff --git a/clientv3/integration/dial_test.go b/clientv3/integration/dial_test.go index 6da7e2940..91eb597ea 100644 --- a/clientv3/integration/dial_test.go +++ b/clientv3/integration/dial_test.go @@ -37,9 +37,9 @@ var ( } testTLSInfoExpired = transport.TLSInfo{ - KeyFile: "../../integration/fixtures-expired/server-key.pem", - CertFile: "../../integration/fixtures-expired/server.pem", - TrustedCAFile: "../../integration/fixtures-expired/etcd-root-ca.pem", + KeyFile: "../../integration/fixtures-expired/server.key.insecure", + CertFile: "../../integration/fixtures-expired/server.crt", + TrustedCAFile: "../../integration/fixtures-expired/ca.crt", ClientCertAuth: true, } ) diff --git a/integration/cluster.go b/integration/cluster.go index d8f36b87f..11d136d75 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -84,9 +84,9 @@ var ( } testTLSInfoExpired = transport.TLSInfo{ - KeyFile: "./fixtures-expired/server-key.pem", - CertFile: "./fixtures-expired/server.pem", - TrustedCAFile: "./fixtures-expired/etcd-root-ca.pem", + KeyFile: "../../integration/fixtures-expired/server.key.insecure", + CertFile: "../../integration/fixtures-expired/server.crt", + TrustedCAFile: "../../integration/fixtures-expired/ca.crt", ClientCertAuth: true, } diff --git a/integration/fixtures-expired/ca-csr.json b/integration/fixtures-expired/ca-csr.json new file mode 100644 index 000000000..ecafabaad --- /dev/null +++ b/integration/fixtures-expired/ca-csr.json @@ -0,0 +1,19 @@ +{ + "key": { + "algo": "rsa", + "size": 2048 + }, + "names": [ + { + "O": "etcd", + "OU": "etcd Security", + "L": "San Francisco", + "ST": "California", + "C": "USA" + } + ], + "CN": "ca", + "ca": { + "expiry": "87600h" + } +} diff --git a/integration/fixtures-expired/ca.crt b/integration/fixtures-expired/ca.crt new file mode 100644 index 000000000..699bf7fb5 --- /dev/null +++ b/integration/fixtures-expired/ca.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID0jCCArqgAwIBAgIUbY6SSy/rF2TQzWsH4GxG+h+Pvw8wDQYJKoZIhvcNAQEL +BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl +Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODA0MDgxNzUzMDBaFw0yODA0MDUxNzUz +MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT +ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQCqhEOeNSLK5CcfvZgHFHPJzRWeDc/fAQ3U2GSF1+KEslOA0mmHiL1paloS +CbuwzoY/EGPCudFxIwFwjl2BAxbMdaCAKCxPwMHfn/38I45GgJFODjcOP0AX9i3O +z2jsAGm02HNicmF24TuQgij8lvhhKjNsy2Lrb8/i6NmX8AKZl9smkRRd5HpUz9DD +HelH2CXYCjbGXdpCyjN2PwfGSoCsAV8NDwbe0CAg6+dZCQrbqt2PJE2uRBoLgp3p +AsVdPiFL1igOimgQRShGvMEVLkA7cmB3fALZy1WTGGj4h76HtEz8nywN7PmoWQJv +AZFM168XPQ35S9+1CROtWUoM7dlhAgMBAAGjZjBkMA4GA1UdDwEB/wQEAwIBBjAS +BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBSLaEU8nqrYzNEcmi0oZKd1AAFK +gTAfBgNVHSMEGDAWgBSLaEU8nqrYzNEcmi0oZKd1AAFKgTANBgkqhkiG9w0BAQsF +AAOCAQEApPHGwdcMRWMk+RS1NVb3yCPdf2Tx8pPYAJpLY46OPenGnFt6+wJs6Nhq +bj9zmEEqyn1WLXtuel+X4E4BEofkTEAM+06UT7SGgEF7zMY+zQjfPqD52jLhS11I +hp3u/hDR5c8r6RmvuH1TiPK5twxmV1w6LRGQcGJtw1PdTVfgHM+1s7kQ+Ineo4kK +8m1JR44B3GHyw+o0jsf5NqnmQnW6aMACQXiX93fnelkPOsKez/oxiy/WK5dDMrzH +JgNonK+bZRpef15XK3EOhmHp8YrY0CEq4MFsxxmkMZT0OnvIMEi9SkPV1cFq2N7r +uTB9aMzzD/1u+3+IpHCrkb0QICj3YQ== +-----END CERTIFICATE----- diff --git a/integration/fixtures-expired/etcd-root-ca-key.pem b/integration/fixtures-expired/etcd-root-ca-key.pem deleted file mode 100644 index 449cab35d..000000000 --- a/integration/fixtures-expired/etcd-root-ca-key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/integration/fixtures-expired/etcd-root-ca.pem b/integration/fixtures-expired/etcd-root-ca.pem deleted file mode 100644 index 64cc269b7..000000000 --- a/integration/fixtures-expired/etcd-root-ca.pem +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -AlehNnzoyVafYDVvMKNHBfJuaxa5qTQrctY= ------END CERTIFICATE----- diff --git a/integration/fixtures-expired/gencert.json b/integration/fixtures-expired/gencert.json new file mode 100644 index 000000000..3d7eceac0 --- /dev/null +++ b/integration/fixtures-expired/gencert.json @@ -0,0 +1,13 @@ +{ + "signing": { + "default": { + "usages": [ + "signing", + "key encipherment", + "server auth", + "client auth" + ], + "expiry": "1h" + } + } +} diff --git a/integration/fixtures-expired/gencerts.sh b/integration/fixtures-expired/gencerts.sh index 3722b75ce..7b919b3f2 100755 --- a/integration/fixtures-expired/gencerts.sh +++ b/integration/fixtures-expired/gencerts.sh @@ -1,91 +1,31 @@ -#!/usr/bin/env bash -set -e +#!/bin/bash if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures-expired'" - exit 255 + echo "must be run from 'fixtures'" + exit 255 fi -if which cfssl >/dev/null; then - echo "cfssl is installed; generating certs" -else - echo "cfssl is not installed; exiting" - exit 255 +if ! which cfssl; then + echo "cfssl is not installed" + exit 255 fi -cat > ./etcd-root-ca-csr.json < ./etcd-gencert.json < ./server-ca-csr.json </dev/null; then - openssl x509 -in ./etcd-root-ca.pem -text -noout - openssl x509 -in ./server.pem -text -noout + openssl x509 -in ca.crt -noout -text fi + +# generate DNS: localhost, IP: 127.0.0.1, CN: example.com certificates +cfssl gencert \ + --ca ./ca.crt \ + --ca-key ./ca-key.pem \ + --config ./gencert.json \ + ./server-ca-csr.json | cfssljson --bare ./server +mv server.pem server.crt +mv server-key.pem server.key.insecure +if which openssl >/dev/null; then + openssl x509 -in ./server.crt -text -noout +fi + +rm -f *.csr *.pem *.stderr *.txt diff --git a/integration/fixtures-expired/server-ca-csr.json b/integration/fixtures-expired/server-ca-csr.json new file mode 100644 index 000000000..272cf841d --- /dev/null +++ b/integration/fixtures-expired/server-ca-csr.json @@ -0,0 +1,20 @@ +{ + "key": { + "algo": "rsa", + "size": 2048 + }, + "names": [ + { + "O": "etcd", + "OU": "etcd Security", + "L": "San Francisco", + "ST": "California", + "C": "USA" + } + ], + "CN": "example.com", + "hosts": [ + "127.0.0.1", + "localhost" + ] +} diff --git a/integration/fixtures-expired/server-key.pem b/integration/fixtures-expired/server-key.pem deleted file mode 100644 index a1a9f1eb7..000000000 --- a/integration/fixtures-expired/server-key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/integration/fixtures-expired/server.crt b/integration/fixtures-expired/server.crt new file mode 100644 index 000000000..887528c86 --- /dev/null +++ b/integration/fixtures-expired/server.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEEjCCAvqgAwIBAgIUbmmpzabDgRPOJj4EzbN+TfqIVhkwDQYJKoZIhvcNAQEL +BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl +Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODA0MDgxNzUzMDBaFw0xODA0MDgxODUz +MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT +ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCxxPIOJV9gc6CjyffN5ylSf7tWrJen8DiyETW5kmDRxnWE +RWRIFjcw6EIhyyXE4g5KEhYRqf6uVWY4a97X8xPTT0MwctifDYg2mFEzR4cswcVq +AmVG9PluWA5fE7SH0VnX2XJyslyeA/+1JlfowlcRkpCAkKPl/xGwYhBada6cA4zQ +YdA7DrNTUdVJt3EGf1wCL4BplcCjK2U53B0neUt5o1IlTwaF2yRpKiCrZ7sH6jI5 +HugSFRorq65LwFFQPz+RBmNSAEnMF9z6nToQO/S6PYfvcS6od/7UjipaeY9biRq5 +dgpnd3vr+vnR05z6hSNA/FZz5241SYsvJNFU/irfAgMBAAGjgZwwgZkwDgYDVR0P +AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB +Af8EAjAAMB0GA1UdDgQWBBSzO25mJGCt/clSMtYNaX2vhZcVijAfBgNVHSMEGDAW +gBSLaEU8nqrYzNEcmi0oZKd1AAFKgTAaBgNVHREEEzARgglsb2NhbGhvc3SHBH8A +AAEwDQYJKoZIhvcNAQELBQADggEBAGpOAvnIQ+YHCSYMKl4v9DpZWOoJ3PrG3bFB +FomGSIXJitWC4ONljF7o/OsDgOwfBo8L2e/HUSqCoxs4nDf/nzePYtenlL1vFQ4l +tajKUTgXKjE55uHhzVWRmcmMNM7yC2dJaoYO+mVwtjLCwvnyNvqG+rUPtk5SXP9t +rjVWNsowBSHTVSBoSLNxEI4DRrUvxm20y/E++VXwhliTHGpq+htGz7g7XSNHu7Xo +xEkBxRaavZbSEdOR3NPyDPfFAdglnxTk1DQ7DJjznEahegO+pTbID/OY3hrMDVKt +YnIt7WzS6KLnUzBOPS1jiyWVUK4QMC5yDAwYU4RH1Pr3XUCNWzk= +-----END CERTIFICATE----- diff --git a/integration/fixtures-expired/server.key.insecure b/integration/fixtures-expired/server.key.insecure new file mode 100644 index 000000000..15fc1d545 --- /dev/null +++ b/integration/fixtures-expired/server.key.insecure @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAscTyDiVfYHOgo8n3zecpUn+7VqyXp/A4shE1uZJg0cZ1hEVk +SBY3MOhCIcslxOIOShIWEan+rlVmOGve1/MT009DMHLYnw2INphRM0eHLMHFagJl +RvT5blgOXxO0h9FZ19lycrJcngP/tSZX6MJXEZKQgJCj5f8RsGIQWnWunAOM0GHQ +Ow6zU1HVSbdxBn9cAi+AaZXAoytlOdwdJ3lLeaNSJU8GhdskaSogq2e7B+oyOR7o +EhUaK6uuS8BRUD8/kQZjUgBJzBfc+p06EDv0uj2H73EuqHf+1I4qWnmPW4kauXYK +Z3d76/r50dOc+oUjQPxWc+duNUmLLyTRVP4q3wIDAQABAoIBADykuAJ1Y10O9O0L +GDsosaMQKgN+a1oCDAVK863zro3BixNtbLFeysMnaHAI0kCg8Uj5dIfgGx6zyWRU +ADhhFxFOB9i+RQG1ZxNg0MqSix2MmOD6Ijybk3++EGEE4uA2XdTRvEY+bHQHXzMX ++oNP0M4Q1rTVIuRyKEGoonWJkeBsj1m4U5q553EWDQv9esXzuwpnZ3/1thxQhZIJ +TBSQ/RhD8/9v95+wU3tVVMoqXhAbqjx0122ZF4khZJb6YM7YaHDdstX+own3yejI +srvjNH3E3IiY0HZyhg7ohRfRDSoDLZz0F3v3Dd7wGNWkNYU3vtd1A6Y+xM6U9EwO +u5taTEkCgYEA63MkVXR0Yd3tlffm1WQxtcVix2vbnNKY88L6GW4/+RYUMAThqQF4 +L7YwNNqGjLqhp5U5cAydaMunRsOf/wYFYAaUcRWPISCzbgZh5cgr1XPafb2iMNzD +xjE/MhG3jjhKP2nA/QUrUd8woEOEq6qUijIiDyTh84rdpZ1K8uIvuuMCgYEAwUj/ +0I0gbNZB84/whfnfEkt5ZebYs1vKxRHm5xB58PEZTdoTTlZvoTGzn/NJZrOtZOLo +abbvB2xlZNBPl36ZMh5561LPnTTP94qGVfsdr83atMG6AHje7/2cw9BddRXSUjlN +SEjzhwRf6HklsiVo0QmWSLD0BDeZGtxHgBhNZNUCgYEAiTo5wgi20Fed4tty0Yqt +Imlh8iMeA6AG/4PzaqEEbjP9HiOqNmuh1gUUwalf5GPeViM2L+VaVTrlSuw3s1aa +CWasW+CZ5E//5C+aHWf2jFkSzliZUGtLO5d2YsNKvXx3YdBMZ+v8XKJ939qaV8d6 +/bTMfxEbFGwqVR2BEmDcOssCgYBPUTOZU7CwuSQLXVAoyqdeDJbe2GKpB8woHvaQ +b9R6qZXmus0dYp8gmRLLWr0OZkGLmwohB68DbtoVCt7+njcjuBn0FeGY86k8Ph5u +fkRqdqF/d9hqhS+HcJ26RXF0sOXEVDuApF87UvJApiZv+qYO0k5XujYI3P/5Y9f7 +mv13mQKBgQCyBOuHxbZWn2Y15Z6w6K7DOdFuxGjM8ATqdJ8NmGPDABlfrSZiTwkf +gLY59kZREdl13DzGCVxbk1EGq+KFNTRSovuf7DG7kY0wQcOlQOzLS7fnftJOBw4E +jaTx6novxP3dqWlYmuu1BP/foiVvKHnVYobNihe6rKiaLoH3fWotsg== +-----END RSA PRIVATE KEY----- diff --git a/integration/fixtures-expired/server.pem b/integration/fixtures-expired/server.pem deleted file mode 100644 index 0e4a0ab8b..000000000 --- a/integration/fixtures-expired/server.pem +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIGHDCCBASgAwIBAgIUcGlr9BUSOAwUt3SDhav9yWokZDowDQYJKoZIhvcNAQEN -BQAweTEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MRUwEwYDVQQDEwxldGNkLXJvb3QtY2EwHhcNMTcwMTI2MTkxNTAwWhcN -MTcwMTI2MjAxNTAwWjB4MQwwCgYDVQQGEwNVU0ExEzARBgNVBAgTCkNhbGlmb3Ju -aWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xDTALBgNVBAoTBGV0Y2QxFjAUBgNV -BAsTDWV0Y2QgU2VjdXJpdHkxFDASBgNVBAMTC2V4YW1wbGUuY29tMIICIjANBgkq -hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArjJG7BkDXGJ7IJeUbt9ilXZl/SqKVYnQ -QcbAVqKKsZOUTnWljYgslXIVDJAYUCZ2WNzXrHq6XOY4qbfNjDIdq28hlq+EydMO -U9T/1WrFASbiJdrCmFH1XUX9SImDw9qDit2S4bxW5gs+Q6cSRSGyHf+6/DD24NY2 -VP3qpjwaEByZGZ7K769zRBhoI2sWslilztQKuiVdeTRNqMtCD/Qa4JIiwyzmYOwK -Ed+kitrsPwUQg/11RNbUHZEy51GCzeZ467DcjnXiGHsAF6ZMznDvPY8GU71JYkBN -1Tq8IQVe9yemqk6SUXYoJJnebX3WMvCZ+XLKYWObANQpXxHsu6t68Hkcg5bDTTbg -79JAS8co7wf1S3NA3QudhrTf3anvdbtaZFukusQbVnH7qSp5LFTle+Vl7Megy0/j -uCBL9/xMSpWqUwUl7evfrm/JkVmCoGm2+56uCyrVK9uRRraqp7J19RuNmhunOiUR -N610DjsisI1eqAHSnaDtMluwBc+HEaJWYzJN1JLvGA3ahOyOcv94FZ1msabq20tx -vp5oHLd7j9TaVGobqSbDGLZGHrm5If/x2+1Dc9O55Om/82Q8r1Qxt+GqVX+TFed7 -AvBHFTYbBiW5gT8MSqMb91t+MYmC9ChFbWepC35I6zoHX1B1CgV20lr5PH1wYO+k -0IdO6ufZYBcCAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI -KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFE7MTPuM -DNH+edtzjnjB+8Tuwx62MB8GA1UdIwQYMBaAFGds9SaBKZQLcA8jbgxDnH9eHTzH -MBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQ0FAAOCAgEA -S1Kx/+L5UNAjvXoDWAvFJMIpQcsFhV6vj/sbwxgwXTKjQHOOehEwaaEW735EDmhC -4CLgyM94i7eFEGwAVwWpnh6XAfqCMGd32T5aRPktiGqnQ+aAVdC/fgmWWKqA7ix5 -Bsjg9WbuBZvI1tAIscq7ajeHFBb/mndgP2kRJf8Rd7NH3VsmLHlK6KKwe/ThKvwZ -IRTfN7ABWzKq/MmGUOWuBiQaLM7DT05m3ISpN3YCHJL4HRjLz6WZ9vP3GLDcrC8H -a7TPizjB3/+y++htnDBhVAAVl4GgolRZzjkzERxDZlvyY7T8sfq9a+9GGHgRXB8v -9wWOYph2r8K1aPaVPw88cri9l993g+vWgKhEse+JoiHgcyCp2VjnM6cpMhCPktBp -YBZ/jBma5EQoLIdBFmDcH/tVs6l6o/9J3q2x+fPZYZkvyuUbxb+TdRZllCqx1myy -YxCGTLdjWEHQbdcVc8totLPgJik2LjFoPAvYgrqO0o3vTz1oagLbwie4D2uK9Ats -pu4KxGCsDtzyf/w9sBZti/ovIgttB7IxeFWZYIWVRCkJkre9rm8qmaCmMY2FvBDY -nBSTldaLpHAryjleyu/WYdqW8Qc+EqIPCzCvJkrKfhZEN7AT7vFwmvnOjJetFdEL -UNJ3wyITBZtiMRAInMkRi3zFeHTVqaockL/FoplkY4Q= ------END CERTIFICATE----- diff --git a/integration/fixtures/gencerts.sh b/integration/fixtures/gencerts.sh index 0f55cd7ba..a4e55dc13 100755 --- a/integration/fixtures/gencerts.sh +++ b/integration/fixtures/gencerts.sh @@ -1,42 +1,44 @@ #!/bin/bash if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 + echo "must be run from 'fixtures'" + exit 255 fi if ! which cfssl; then - echo "cfssl is not installed" - exit 255 + echo "cfssl is not installed" + exit 255 fi cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text +if which openssl >/dev/null; then + openssl x509 -in ca.crt -noout -text +fi # generate DNS: localhost, IP: 127.0.0.1, CN: example.com certificates cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server + --ca ./ca.crt \ + --ca-key ./ca-key.pem \ + --config ./gencert.json \ + ./server-ca-csr.json | cfssljson --bare ./server mv server.pem server.crt mv server-key.pem server.key.insecure # generate DNS: localhost, IP: 127.0.0.1, CN: example2.com certificates cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr2.json | cfssljson --bare ./server2 + --ca ./ca.crt \ + --ca-key ./ca-key.pem \ + --config ./gencert.json \ + ./server-ca-csr2.json | cfssljson --bare ./server2 mv server2.pem server2.crt mv server2-key.pem server2.key.insecure # generate revoked certificates and crl cfssl gencert --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json 2>revoked.stderr | cfssljson --bare ./server-revoked + --ca-key ./ca-key.pem \ + --config ./gencert.json \ + ./server-ca-csr.json 2>revoked.stderr | cfssljson --bare ./server-revoked mv server-revoked.pem server-revoked.crt mv server-revoked-key.pem server-revoked.key.insecure grep serial revoked.stderr | awk ' { print $9 } ' >revoke.txt @@ -44,10 +46,10 @@ cfssl gencrl revoke.txt ca.crt ca-key.pem | base64 --decode >revoke.crl # generate wildcard certificates DNS: *.etcd.local cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr-wildcard.json | cfssljson --bare ./server-wildcard + --ca ./ca.crt \ + --ca-key ./ca-key.pem \ + --config ./gencert.json \ + ./server-ca-csr-wildcard.json | cfssljson --bare ./server-wildcard mv server-wildcard.pem server-wildcard.crt mv server-wildcard-key.pem server-wildcard.key.insecure