Delete docker-compose crossdock testing (#1368)

Author: bufdev

.dockerignore

@@ -12,7 +12,6 @@ TAGS
 
 encoding/thrift/thriftrw-plugin-yarpc/thriftrw-plugin-yarpc
 encoding/protobuf/protoc-gen-yarpc-go/protoc-gen-yarpc-go
-internal/crossdock/crossdock
 internal/examples/json-keyvalue/client/client
 internal/examples/json-keyvalue/server/server
 internal/examples/protobuf/protobuf

.gitignore

@@ -12,7 +12,6 @@
 
 /encoding/thrift/thriftrw-plugin-yarpc/thriftrw-plugin-yarpc
 /encoding/protobuf/protoc-gen-yarpc-go/protoc-gen-yarpc-go
-/internal/crossdock/crossdock
 /internal/examples/json-keyvalue/client/client
 /internal/examples/json-keyvalue/server/server
 /internal/examples/protobuf/protobuf

.travis.yml

@@ -6,7 +6,6 @@ env:
 matrix:
   include:
     - env: CI_TYPES='codecov'
-    - env: CI_TYPES='crossdock'
     - env: CI_TYPES='lint test examples' DOCKER_GO_VERSION=1.8
     - env: CI_TYPES='lint test examples' DOCKER_GO_VERSION=1.9
 script:

Dockerfile.crossdock

@@ -6,21 +6,13 @@ else
 include etc/make/deps.mk
 include etc/make/local.mk
 endif
-include etc/make/crossdock.mk
 
 CI_TYPES ?= lint test examples
-ifneq ($(filter crossdock,$(CI_TYPES)),)
-CI_CROSSDOCK := true
-CI_TYPES := $(filter-out crossdock,$(CI_TYPES))
-endif
 
 .DEFAULT_GOAL := ci
 
 .PHONY: ci
 ci: __print_ci $(CI_TYPES) ## run continuous integration tasks
-ifdef CI_CROSSDOCK
-	$(MAKE) crossdock-fresh || ($(MAKE) crossdock-logs && false)
-endif
 
 .PHONY: help
 help: __print_info ## show this help message
@@ -43,9 +35,5 @@ endif
 
 .PHONY: __print_ci
 __print_ci: __print_info
-ifdef CI_CROSSDOCK
-	$(info CI_TYPES=$(CI_TYPES) crossdock)
-else
 	$(info CI_TYPES=$(CI_TYPES))
-endif
 	@echo

Makefile

@@ -13,50 +13,6 @@ CACHE := $(CACHE_BASE)/$(UNAME_OS)/$(UNAME_ARCH)
 LIB := $(CACHE)/lib
 BIN = $(CACHE)/bin
 
-DOCKER_COMPOSE_VERSION := 1.16.1
-DOCKER_COMPOSE_OS := $(UNAME_OS)
-DOCKER_COMPOSE_ARCH := $(UNAME_ARCH)
-
-DOCKER_COMPOSE_LIB = $(LIB)/docker-compose-$(DOCKER_COMPOSE_VERSION)
-DOCKER_COMPOSE_BIN = $(DOCKER_COMPOSE_LIB)/docker-compose
-DOCKER_COMPOSE = $(BIN)/docker-compose
-
-$(DOCKER_COMPOSE_BIN):
-	@mkdir -p $(DOCKER_COMPOSE_LIB)
-	curl -L "https://github.com/docker/compose/releases/download/$(DOCKER_COMPOSE_VERSION)/docker-compose-$(DOCKER_COMPOSE_OS)-$(DOCKER_COMPOSE_ARCH)" > $(DOCKER_COMPOSE_BIN)
-
-$(DOCKER_COMPOSE): $(DOCKER_COMPOSE_BIN)
-	@mkdir -p $(BIN)
-	cp $(DOCKER_COMPOSE_BIN) $(DOCKER_COMPOSE)
-	@chmod +x $(DOCKER_COMPOSE)
-
-DOCKER_COMPOSE_RUN_FLAGS ?= -e V -e RUN -e EXAMPLES_JOBS -e PACKAGES -e WITHIN_DOCKER=1 -e TRAVIS_JOB_ID -e TRAVIS_PULL_REQUEST
-ifneq ($(TEST_TIME_SCALE),)
-DOCKER_COMPOSE_RUN_FLAGS += -e TEST_TIME_SCALE
-endif
-
 .PHONY: clean
 clean: ## remove installed binaries and artifacts
 	rm -rf $(CACHE_BASE)
-
-.PHONY: compose-codecov
-compose-codecov: SHELL := /bin/bash
-compose-codecov: $(DOCKER_COMPOSE) ## run code coverage and upload to coveralls inside docker-compose
-	$(DOCKER_COMPOSE) kill
-	$(DOCKER_COMPOSE) rm --force
-	$(DOCKER_COMPOSE) build gotest
-	$(DOCKER_COMPOSE) run $(shell bash <(curl -s https://codecov.io/env)) $(DOCKER_COMPOSE_RUN_FLAGS) gotest make codecov
-
-.PHONY: compose-cover
-compose-cover: $(DOCKER_COMPOSE) ## run all tests and output code coverage inside docker-compose
-	$(DOCKER_COMPOSE) kill
-	$(DOCKER_COMPOSE) rm --force
-	$(DOCKER_COMPOSE) build gotest
-	$(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_RUN_FLAGS) gotest make cover
-
-.PHONY: compose-test
-compose-test: $(DOCKER_COMPOSE) ## run all tests inside docker-compose
-	$(DOCKER_COMPOSE) kill
-	$(DOCKER_COMPOSE) rm --force
-	$(DOCKER_COMPOSE) build gotest
-	$(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_RUN_FLAGS) gotest make test

docker-compose.yml

@@ -6,7 +6,10 @@ ifdef DOCKER_HOST
 DOCKER_BUILD_FLAGS ?= --compress
 endif
 
-DOCKER_RUN_FLAGS ?= $(DOCKER_COMPOSE_RUN_FLAGS)
+DOCKER_RUN_FLAGS ?= -e V -e RUN -e EXAMPLES_JOBS -e PACKAGES -e WITHIN_DOCKER=1 -e TRAVIS_JOB_ID -e TRAVIS_PULL_REQUEST
+ifneq ($(TEST_TIME_SCALE),)
+DOCKER_RUN_FLAGS += -e TEST_TIME_SCALE
+endif
 ifneq ($(DOCKER_CPUS),)
 DOCKER_RUN_FLAGS += --cpus=$(DOCKER_CPUS)
 endif

etc/make/base.mk

@@ -18,19 +18,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package crossdock
 
 import (
-	"github.com/opentracing/opentracing-go"
-	jaeger "github.com/uber/jaeger-client-go"
-	"go.uber.org/yarpc/internal/crossdock/client"
-	"go.uber.org/yarpc/internal/crossdock/server"
+	// this is to make sure etc/bin/cover.sh picks this up with .Deps
+	_ "go.uber.org/yarpc/internal/crossdock/client"
+	// this is to make sure etc/bin/cover.sh picks this up with .Deps
+	_ "go.uber.org/yarpc/internal/crossdock/server"
 )
-
-func main() {
-	tracer, _ := jaeger.NewTracer("crossdock", jaeger.NewConstSampler(true), jaeger.NewNullReporter())
-	opentracing.InitGlobalTracer(tracer)
-
-	server.Start()
-	client.Start()
-}

etc/make/crossdock.mk

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package crossdock
 
 import (
 	"net/url"