Simplify integration tests run

.gitignore

@@ -1,3 +1,6 @@
+# Ignore artifacts that `make download-consul` can generate/download
+/consul
+/consul.zip
 # Ignore vendor explicitly since we're moving to go modules
 vendor
 /consul-template

.travis.yml

@@ -6,21 +6,19 @@ language: go
 go:
   - 1.12.4
 
-env:
-  - GOMAXPROCS=4
-
 branches:
   only:
     - master
 
 env:
+  - GOMAXPROCS=4
   - CONSUL_VERSION=1.4.2
+  - CONSUL_BIN_PATH=~/bin/consul
+  # Enforce gomodules since Travis' workers download in the GOPATH where gomod is disabled by default.
+  - GO111MODULE=on
 
-before_install:
-  - curl -sLo consul.zip https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip
-  - unzip consul.zip
-  - mkdir -p ~/bin
-  - mv consul ~/bin
+before_script:
+  - make download-consul
   - export PATH="~/bin:$PATH"
 
 script: make test

Makefile

@@ -16,6 +16,10 @@ NAME := $(notdir $(PROJECT))
 GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
 VERSION := $(shell awk -F\" '/Version/ { print $$2; exit }' "${CURRENT_DIR}/version/version.go")
 
+# Consul version to download for use in integration tests.
+CONSUL_VERSION ?= 1.4.2
+CONSUL_BIN_PATH ?= /usr/local/bin/consul
+
 # Current system information
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
@@ -140,6 +144,13 @@ define make-docker-target
 endef
 $(foreach target,$(DOCKER_TARGETS),$(eval $(call make-docker-target,$(target))))
 
+download-consul:
+	@curl -sLo \
+		consul.zip \
+		https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip
+	@unzip consul.zip
+	@mv consul ${CONSUL_BIN_PATH}
+
 # test runs the test suite.
 test:
 	@echo "==> Testing ${NAME}"

README.md

@@ -2192,7 +2192,14 @@ $ make dev
 This will compile the `consul-template` binary into `bin/consul-template` as
 well as your `$GOPATH` and run the test suite.
 
-If you want to run the tests, first [install consul locally](https://www.consul.io/docs/install/index.html), then:
+If you want to run the tests, first install Consul locally by running:
+
+```shell
+# Consul will be installed in your $PATH (/usr/local/bin/consul)
+$ sudo make download-consul
+```
+
+Now run the tests:
 
 ```shell
 $ make test