Merge pull request #4145 from carmstrong/etcd-v2.1.1

carmstrong · carmstrong · commit cd9eff09aa7b · 2015-07-31T08:53:46.000-07:00
Bump to etcd 2.1.1; properly test it with Jenkins
diff --git a/builder/Makefile b/builder/Makefile
@@ -67,7 +67,7 @@ test-unit:
 	$(GOTEST) .
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@$(MAKE) -C ../tests/ test-etcd
 	godep go test -v ./tests/...
 
 test-style:
diff --git a/cache/Makefile b/cache/Makefile
@@ -67,5 +67,5 @@ test-style:
 	$(GOLINT) ./...
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@$(MAKE) -C ../tests/ test-etcd
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/contrib/coreos/user-data.example b/contrib/coreos/user-data.example
@@ -24,7 +24,7 @@ coreos:
       RestartSec=10s
       LimitNOFILE=40000
       EnvironmentFile=/etc/environment
-      Environment="ETCD_IMAGE=quay.io/coreos/etcd:v2.0.13"
+      Environment="ETCD_IMAGE=quay.io/coreos/etcd:v2.1.1"
       Environment="ETCD_ELECTION_TIMEOUT=2000"
       Environment="ETCD_HEARTBEAT_INTERVAL=400"
       Environment="ETCD_DATA_DIR=/var/lib/etcd2"
diff --git a/controller/Makefile b/controller/Makefile
@@ -82,6 +82,6 @@ test-unit: setup-venv test-style
 	venv/bin/coverage report -m
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	@docker history deis/test-postgresql >/dev/null 2>&1 || docker pull deis/test-postgresql:latest
+	@$(MAKE) -C ../tests/ test-etcd
+	@$(MAKE) -C ../tests/ test-postgresql
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/database/Makefile b/database/Makefile
@@ -54,6 +54,6 @@ test-style:
 	shellcheck $(SHELL_SCRIPTS)
 
 test-functional:
-	@docker history deis/mock-store >/dev/null 2>&1 || $(MAKE) -C ../tests/ mock-store
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@$(MAKE) -C ../tests/ mock-store
+	@$(MAKE) -C ../tests/ test-etcd
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/docs/contributing/testing.rst b/docs/contributing/testing.rst
@@ -60,10 +60,7 @@ continuous deployment, start one locally:
 
     The functional tests also use several mock or example containers:
     **deis/test-etcd**, **deis/test-postgresql**, and **deis/mock-store**.
-    These are referenced by the ``:latest`` tag, so in the rare case that one
-    of these test containers needs to change, ``docker rmi`` its image and
-    the tests will pull it from Docker Hub or rebuild it.
-
+    These are built locally during a test run.
 
 Run the Tests
 -------------
diff --git a/logger/Makefile b/logger/Makefile
@@ -58,7 +58,7 @@ deploy: build dev-release restart
 test: test-style test-unit test-functional
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@$(MAKE) -C ../tests/ test-etcd
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
 
 test-style:
diff --git a/registry/Makefile b/registry/Makefile
@@ -48,8 +48,8 @@ deploy: build dev-release restart
 test: test-style test-unit test-functional
 
 test-functional:
-	@docker history deis/mock-store >/dev/null 2>&1 || $(MAKE) -C ../tests/ mock-store
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@$(MAKE) -C ../tests/ mock-store
+	@$(MAKE) -C ../tests/ test-etcd
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
 
 test-style:
diff --git a/router/Makefile b/router/Makefile
@@ -63,7 +63,7 @@ deploy: build dev-release restart
 test: test-style test-unit test-functional
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@$(MAKE) -C ../tests/ test-etcd
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
 
 test-style:
diff --git a/store/Makefile b/store/Makefile
@@ -100,7 +100,7 @@ deploy: build dev-release restart
 test: test-style test-unit test-functional
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@$(MAKE) -C ../tests/ test-etcd
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
 
 test-style:
diff --git a/tests/Makefile b/tests/Makefile
@@ -7,9 +7,9 @@ GO_FILES = $(wildcard *.go)
 GO_PACKAGES = dockercli etcdutils mock utils
 GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
-MOCK_STORE_IMAGE = $(IMAGE_PREFIX)mock-store:latest
-TEST_ETCD_IMAGE = $(IMAGE_PREFIX)test-etcd:latest
-TEST_POSTGRESQL_IMAGE = $(IMAGE_PREFIX)test-postgresql:latest
+MOCK_STORE_IMAGE = $(IMAGE_PREFIX)mock-store:$(BUILD_TAG)
+TEST_ETCD_IMAGE = $(IMAGE_PREFIX)test-etcd:$(BUILD_TAG)
+TEST_POSTGRESQL_IMAGE = $(IMAGE_PREFIX)test-postgresql:$(BUILD_TAG)
 
 test: test-smoke
 
diff --git a/tests/bin/prime-docker-images.sh b/tests/bin/prime-docker-images.sh
@@ -12,5 +12,3 @@ docker rmi -f `docker images -q`
 
 # Pull Deis testing essentials
 docker pull alpine:3.1
-docker pull deis/test-etcd:latest
-docker pull deis/test-postgresql:latest
diff --git a/tests/dockercli/dockercli.go b/tests/dockercli/dockercli.go
@@ -266,10 +266,10 @@ func GetImageID(t *testing.T, repo string) string {
 func RunTestEtcd(t *testing.T, name string, port string) {
 	var err error
 	cli, stdout, stdoutPipe := NewClient()
-	etcdImage := "deis/test-etcd:latest"
+	etcdImage := utils.ImagePrefix() + "test-etcd:" + utils.BuildTag()
 	ipaddr := utils.HostAddress()
 	etcdAddr := ipaddr + ":" + port
-	fmt.Printf("--- Running deis/test-etcd at %s\n", etcdAddr)
+	fmt.Printf("--- Running %s at %s\n", etcdImage, etcdAddr)
 	done2 := make(chan bool, 1)
 	go func() {
 		done2 <- true
diff --git a/tests/fixtures/test-etcd/Dockerfile b/tests/fixtures/test-etcd/Dockerfile
@@ -3,11 +3,13 @@ FROM alpine:3.1
 # install common packages
 RUN apk add --update-cache curl tar && rm -rf /var/cache/apk/*
 
-ENV ETCD_VERSION v0.4.9
+# ETCD_VERSION is actually used by the etcd daemon, and causes an issue if we
+# format it for our use here. So, we call this something else.
+ENV INSTALL_ETCD_VERSION v2.1.1
 
 # install etcd and etcdctl
-RUN curl -sSL https://github.com/coreos/etcd/releases/download/$ETCD_VERSION/etcd-$ETCD_VERSION-linux-amd64.tar.gz \
+RUN curl -sSL https://github.com/coreos/etcd/releases/download/$INSTALL_ETCD_VERSION/etcd-$INSTALL_ETCD_VERSION-linux-amd64.tar.gz \
   | tar -vxz -C /usr/local/bin --strip=1
 
-EXPOSE 4001 7001
+EXPOSE 4001 7001 2379 2380
 CMD ["/usr/local/bin/etcd"]
diff --git a/tests/mock/mock.go b/tests/mock/mock.go
@@ -18,7 +18,7 @@ func RunMockDatabase(t *testing.T, tag string, etcdPort string, dbPort string) {
 	var err error
 	cli, stdout, stdoutPipe := dockercli.NewClient()
 	done := make(chan bool, 1)
-	dbImage := "deis/test-postgresql:latest"
+	dbImage := utils.ImagePrefix() + "test-postgresql:" + utils.BuildTag()
 	ipaddr := utils.HostAddress()
 	done <- true
 	go func() {
@@ -53,7 +53,7 @@ func RunMockDatabase(t *testing.T, tag string, etcdPort string, dbPort string) {
 // RunMockCeph runs a container used to mock a Ceph storage cluster
 func RunMockCeph(t *testing.T, name string, cli *client.DockerCli, etcdPort string) {
 
-	storeImage := utils.ImagePrefix() + "mock-store:latest"
+	storeImage := utils.ImagePrefix() + "mock-store:" + utils.BuildTag()
 	etcdutils.SetSingle(t, "/deis/store/hosts/"+utils.HostAddress(), utils.HostAddress(), etcdPort)
 	var err error
 	cli, stdout, stdoutPipe := dockercli.NewClient()
