Merge pull request #3377 from mboersma/unify-test-fixtures

ref(tests): move test containers under tests/fixtures

Author: mboersma

tests/Makefile

@@ -10,6 +10,8 @@ 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
 
 test: test-smoke
 
@@ -38,6 +40,12 @@ setup-gotools:
 mock-store:
 	docker build -t $(MOCK_STORE_IMAGE) fixtures/mock-store/
 
+test-etcd:
+	docker build -t $(TEST_ETCD_IMAGE) fixtures/test-etcd/
+
+test-postgresql:
+	docker build -t $(TEST_POSTGRESQL_IMAGE) fixtures/test-postgresql/
+
 test-style:
 # display output, then check
 	$(GOFMT) $(GO_PACKAGES) $(GO_FILES)

tests/etcdutils/Dockerfile tests/fixtures/test-etcd/Dockerfiletests/etcdutils/Dockerfile renamed to tests/fixtures/test-etcd/Dockerfile

@@ -0,0 +1,3 @@
+FROM postgres:9.3
+
+COPY rootfs/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

tests/fixtures/test-postgresql/Dockerfile

@@ -0,0 +1 @@
+echo "Initialization complete."