Skip to content

Commit

Permalink
Merge pull request #8652 from gyuho/proxy-tests-Makefile
Browse files Browse the repository at this point in the history
Makefile: add 'test-proxy', 'test-coverage'
  • Loading branch information
gyuho committed Oct 5, 2017
2 parents 8b75689 + b0dc639 commit 867e3da
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,19 @@ build:
test-all:
RELEASE_TEST=y INTEGRATION=y PASSES='build unit release integration_e2e functional' ./test 2>&1 | tee test.log

test-proxy:
PASSES='build grpcproxy' ./test 2>&1 | tee test-proxy.log

test-coverage:
COVERDIR=covdir PASSES='build build_cov cov' ./test 2>&1 | tee test-coverage.log
$(shell curl -s https://codecov.io/bash >codecov)
chmod 700 ./codecov
./codecov -h
./codecov -t 6040de41-c073-4d6f-bbf8-d89256ef31e1

# clean up failed tests, logs, dependencies
clean:
rm -f ./codecov
rm -f ./*.log
rm -f ./bin/Dockerfile-release
rm -rf ./bin/*.etcd
Expand Down Expand Up @@ -63,6 +74,13 @@ docker-test-386:
gcr.io/etcd-development/etcd-test:$(_GO_VERSION) \
/bin/bash -c "GOARCH=386 PASSES='build unit integration_e2e' ./test 2>&1 | tee docker-test.log"

docker-test-proxy:
docker run \
--rm \
--volume=`pwd`:/go/src/github.com/coreos/etcd \
gcr.io/etcd-development/etcd-test:$(_GO_VERSION) \
/bin/bash -c "PASSES='build grpcproxy' ./test ./test 2>&1 | tee docker-test.log"

# build release container image with Linux
_ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
ifdef ETCD_VERSION
Expand Down
2 changes: 1 addition & 1 deletion e2e/docker-dns-srv/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.9-stretch
FROM golang:1.9.1-stretch
LABEL Description="Image for etcd DNS SRV testing"

RUN apt update -y \
Expand Down

0 comments on commit 867e3da

Please sign in to comment.