From c0bdedfed3db04b6dab167a034cb42986ef53bcb Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 12 May 2016 17:18:58 +0200 Subject: [PATCH] Add travis matrix for 1.9.1 and 1.10.1 Signed-off-by: Vincent Demeester --- .travis.yml | 6 +++++- Makefile | 2 +- build.Dockerfile | 5 +---- script/deploy.sh | 2 +- script/test-integration | 2 ++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c1a40920..69353d4c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,18 @@ env: - secure: btt4r13t09gQlHb6gYrvGC2yGCMMHfnp1Mz1RQedc4Mpf/FfT8aE6xmK2a2i9CCvskjrP0t/BFaS4yxIURjnFRn+ugQIEa0pLspB9UJArW/vgOSpIWM9/OQ/fg8z5XuMxN6Md4DL1/iLypMNSageA1x0TRdt89+D1N1dALpg5XRCXLFbC84TLi0gjlFuib9ibPKzEhLT+anCRJ6iZMzeupDSoaCVbAtJMoDvXw4+4AcRZ1+k4MybBLyCib5boaEOt4pTT88mz4Kk0YaMwPVJyg9Qv36VqyUcPS09Yd95LuyVQ4+tZt8Y1ccbIzULsK+sLM3hLCzxlmlpN3dQBlZJiiRtQde0mgGAKyC0P0A1XjuDTywcsa5edB+fTk1Dsewz9xZ9V0NmMz8t+UNZnaSsAPga9i86jULbXUUwMVSzVRc+Xgx02liB/8qI1xYC9FM6ilStt7rn7mF0k3KbiWhcptgeXjO6Lah9FjEKd5w4MXsdUSTi/86rQaLo+kj+XdaTrXCTulKHyRyQEUj+8V1w0oVz7pcGjePHd7y5oU9ByifVQy6sytuFBfRZvugM5bKHo+i0pcWvixrZS42DrzwxZJsspANOvqSe5ifVbvOkfUppQdCBIwptxV5N1b49XPKU3W/w34QJ8xGmKp3TFA7WwVCztriFHjPgiRpB3EG99Bg= - REPO: $TRAVIS_REPO_SLUG - VERSION: v1.0.0-beta.$TRAVIS_BUILD_NUMBER + matrix: + - DOCKER_VERSION=1.9.1 + - DOCKER_VERSION=1.10.1 sudo: required services: - docker install: - sudo service docker stop -- sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 -o /usr/bin/docker +- sudo curl https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} -o /usr/bin/docker - sudo chmod +x /usr/bin/docker - sudo service docker start +- docker version - pip install --user mkdocs - pip install --user pymdown-extensions before_script: diff --git a/Makefile b/Makefile index a820950ad..6dc75de35 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ validate: build ## validate gofmt, golint and go vet $(DOCKER_RUN_TRAEFIK) ./script/make.sh validate-gofmt validate-govet validate-golint build: dist - docker build -t "$(TRAEFIK_DEV_IMAGE)" -f build.Dockerfile . + docker build --build-arg=DOCKER_VERSION=${DOCKER_VERSION} -t "$(TRAEFIK_DEV_IMAGE)" -f build.Dockerfile . build-webui: docker build -t traefik-webui -f webui/Dockerfile webui diff --git a/build.Dockerfile b/build.Dockerfile index cda39d77b..989b8f2b6 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -6,10 +6,7 @@ RUN go get github.com/Masterminds/glide \ && go get github.com/kisielk/errcheck # Which docker version to test on -ENV DOCKER_VERSION 1.9.1 - -# enable GO15VENDOREXPERIMENT -ENV GO15VENDOREXPERIMENT 1 +ARG DOCKER_VERSION=1.10.1 # Download docker RUN set -ex; \ diff --git a/script/deploy.sh b/script/deploy.sh index e53ea2768..97f0f2abd 100755 --- a/script/deploy.sh +++ b/script/deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then +if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$DOCKER_VERSION" = "1.10.1" ]; then echo "Deploying..." else echo "Skipping deploy" diff --git a/script/test-integration b/script/test-integration index 7905bd869..7f30406be 100755 --- a/script/test-integration +++ b/script/test-integration @@ -11,4 +11,6 @@ if [ -n "$VERBOSE" ]; then fi cd integration +echo "Testing against…" +docker version CGO_ENABLED=0 go test $TESTFLAGS