Merge pull request #8748 from gyuho/mmm

semaphore: add test scripts

.semaphore.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+TEST_SUFFIX=$(date +%s | base64 | head -c 15)
+
+TEST_OPTS="RELEASE_TEST=y INTEGRATION=y PASSES='build unit release integration_e2e functional'"
+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.9.1 \
+	/bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log"
+
+! grep FAIL -A10 -B50 test-${TEST_SUFFIX}.log

Makefile

@@ -1,200 +0,0 @@
-# run from repository root
-
-# clean up failed tests, logs, dependencies
-clean:
-	rm -f ./codecov
-	rm -rf ./covdir
-	rm -f ./*.log
-	rm -f ./bin/Dockerfile-release
-	rm -rf ./bin/*.etcd
-	rm -rf ./gopath
-	rm -rf ./release
-	rm -f ./integration/127.0.0.1:* ./integration/localhost:*
-	rm -f ./clientv3/integration/127.0.0.1:* ./clientv3/integration/localhost:*
-	rm -f ./clientv3/ordering/127.0.0.1:* ./clientv3/ordering/localhost:*
-
-TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
-
-.PHONY: build
-build:
-	GO_BUILD_FLAGS="-v" ./build
-	./bin/etcd --version
-	ETCDCTL_API=3 ./bin/etcdctl version
-
-# sync with Dockerfile-test, e2e/docker-dns/Dockerfile, e2e/docker-dns-srv/Dockerfile
-_GO_VERSION = go1.9.1
-ifdef GO_VERSION
-	_GO_VERSION = $(GO_VERSION)
-endif
-
-# Example:
-#   make build-docker-test
-#   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd.json)" https://gcr.io
-#   make push-docker-test
-
-build-docker-test:
-	docker build --tag gcr.io/etcd-development/etcd-test:$(_GO_VERSION) --file ./Dockerfile-test .
-
-push-docker-test:
-	gcloud docker -- push gcr.io/etcd-development/etcd-test:$(_GO_VERSION)
-
-pull-docker-test:
-	docker pull gcr.io/etcd-development/etcd-test:$(_GO_VERSION)
-
-# compile etcd and etcdctl with Linux
-compile-with-docker-test:
-	docker run \
-	  --rm \
-	  --volume=`pwd`/:/etcd \
-	  gcr.io/etcd-development/etcd-test:$(_GO_VERSION) \
-	  /bin/bash -c "cd /etcd && GO_BUILD_FLAGS=-v ./build && ./bin/etcd --version"
-
-# Local machine:
-#   TEST_OPTS="PASSES='fmt'" make test
-#   TEST_OPTS="PASSES='fmt bom dep compile build unit'" make test
-#   TEST_OPTS="RELEASE_TEST=y INTEGRATION=y PASSES='build unit release integration_e2e functional'" make test
-#   TEST_OPTS="PASSES='build grpcproxy'" make test
-#
-# Example (test with docker):
-#   make pull-docker-test
-#   TEST_OPTS="VERBOSE=1 PASSES='unit'" make docker-test
-#   TEST_OPTS="VERBOSE=2 PASSES='unit'" make docker-test
-#
-# Travis CI (test with docker):
-#   TEST_OPTS="PASSES='fmt bom dep compile build unit'" make docker-test
-#
-# Semaphore CI (test with docker):
-#   TEST_OPTS="RELEASE_TEST=y INTEGRATION=y PASSES='build unit release integration_e2e functional'" make docker-test
-#   TEST_OPTS="GOARCH=386 PASSES='build unit integration_e2e'" make docker-test
-#
-# grpc-proxy tests (test with docker):
-#   TEST_OPTS="PASSES='build grpcproxy'" make docker-test
-
-_TEST_OPTS = "PASSES='unit'"
-ifdef TEST_OPTS
-	_TEST_OPTS = $(TEST_OPTS)
-endif
-
-.PHONY: test
-test:
-	$(info TEST_OPTS: $(_TEST_OPTS))
-	$(info log-file: test-$(TEST_SUFFIX).log)
-	$(_TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log
-	! grep FAIL -A10 -B50 test-$(TEST_SUFFIX).log
-
-docker-test:
-	$(info TEST_OPTS: $(_TEST_OPTS))
-	$(info log-file: test-$(TEST_SUFFIX).log)
-	docker run \
-	  --rm \
-	  --volume=`pwd`:/go/src/github.com/coreos/etcd \
-	  gcr.io/etcd-development/etcd-test:$(_GO_VERSION) \
-	  /bin/bash -c "$(_TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log"
-	! grep FAIL -A10 -B50 test-$(TEST_SUFFIX).log
-
-docker-test-coverage:
-	$(info log-file: docker-test-coverage-$(TEST_SUFFIX).log)
-	docker run \
-	  --rm \
-	  --volume=`pwd`:/go/src/github.com/coreos/etcd \
-	  gcr.io/etcd-development/etcd-test:$(_GO_VERSION) \
-	  /bin/bash -c "COVERDIR=covdir PASSES='build build_cov cov' ./test 2>&1 | tee docker-test-coverage-$(TEST_SUFFIX).log && /codecov -t 6040de41-c073-4d6f-bbf8-d89256ef31e1"
-	! grep FAIL -A10 -B50 docker-test-coverage-$(TEST_SUFFIX).log
-
-# build release container image with Linux
-_ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
-ifdef ETCD_VERSION
-	_ETCD_VERSION = $(ETCD_VERSION)
-endif
-
-build-docker-release-master: compile-with-docker-test
-	cp ./Dockerfile-release ./bin/Dockerfile-release
-	docker build \
-	  --tag gcr.io/etcd-development/etcd:$(_ETCD_VERSION) \
-	  --file ./bin/Dockerfile-release \
-	  ./bin
-	rm -f ./bin/Dockerfile-release
-
-	docker run \
-	  --rm \
-	  gcr.io/etcd-development/etcd:$(_ETCD_VERSION) \
-	  /bin/sh -c "/usr/local/bin/etcd --version && ETCDCTL_API=3 /usr/local/bin/etcdctl version"
-
-push-docker-release-master:
-	gcloud docker -- push gcr.io/etcd-development/etcd:$(_ETCD_VERSION)
-
-# Example:
-#   make build-docker-dns-test
-#   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd.json)" https://gcr.io
-#   make push-docker-dns-test
-#   make pull-docker-dns-test
-#   make docker-dns-test-run
-
-# build base container image for DNS testing
-build-docker-dns-test:
-	docker build \
-	  --tag gcr.io/etcd-development/etcd-dns-test:$(_GO_VERSION) \
-	  --file ./e2e/docker-dns/Dockerfile \
-	  ./e2e/docker-dns
-
-	docker run \
-	  --rm \
-	  --dns 127.0.0.1 \
-	  gcr.io/etcd-development/etcd-dns-test:$(_GO_VERSION) \
-	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig etcd.local"
-
-push-docker-dns-test:
-	gcloud docker -- push gcr.io/etcd-development/etcd-dns-test:$(_GO_VERSION)
-
-pull-docker-dns-test:
-	docker pull gcr.io/etcd-development/etcd-dns-test:$(_GO_VERSION)
-
-# run DNS tests inside container
-docker-dns-test-run:
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  --volume=`pwd`/bin:/etcd \
-	  --volume=`pwd`/integration/fixtures:/certs \
-	  gcr.io/etcd-development/etcd-dns-test:$(_GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /run.sh && rm -rf m*.etcd"
-
-# Example:
-#   make build-docker-dns-srv-test
-#   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd.json)" https://gcr.io
-#   make push-docker-dns-srv-test
-#   make pull-docker-dns-srv-test
-#   make docker-dns-srv-test-run
-
-# build base container image for DNS/SRV testing
-build-docker-dns-srv-test:
-	docker build \
-	  --tag gcr.io/etcd-development/etcd-dns-srv-test:$(_GO_VERSION) \
-	  --file ./e2e/docker-dns-srv/Dockerfile \
-	  ./e2e/docker-dns-srv
-
-	docker run \
-	  --rm \
-	  --dns 127.0.0.1 \
-	  gcr.io/etcd-development/etcd-dns-srv-test:$(_GO_VERSION) \
-	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig +noall +answer SRV _etcd-client-ssl._tcp.etcd.local && dig +noall +answer SRV _etcd-server-ssl._tcp.etcd.local && dig +noall +answer m1.etcd.local m2.etcd.local m3.etcd.local"
-
-push-docker-dns-srv-test:
-	gcloud docker -- push gcr.io/etcd-development/etcd-dns-srv-test:$(_GO_VERSION)
-
-pull-docker-dns-srv-test:
-	docker pull gcr.io/etcd-development/etcd-dns-srv-test:$(_GO_VERSION)
-
-# run DNS/SRV tests inside container
-docker-dns-srv-test-run:
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  --volume=`pwd`/bin:/etcd \
-	  --volume=`pwd`/integration/fixtures:/certs \
-	  gcr.io/etcd-development/etcd-dns-srv-test:$(_GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /run.sh && rm -rf m*.etcd"
-
-# TODO: add DNS integration tests