From d5dd212cab9cfcd8353c34375c2955138eb9e08e Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Sat, 13 Jan 2018 15:43:59 +0000 Subject: [PATCH] Setup minikube on travis, don't install docker-compose --- .travis.yml | 1 + hack/ci.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d465d6420..c4f130cf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ jobs: # Install nsenter - docker run -v /usr/local/bin:/hostbin munnerz/ubuntu-nsenter cp /nsenter /hostbin/nsenter script: + - ./hack/test/setup-minikube.sh - ./hack/ci.sh - stage: test dist: trusty diff --git a/hack/ci.sh b/hack/ci.sh index 6d6da603c..ae9ab2538 100755 --- a/hack/ci.sh +++ b/hack/ci.sh @@ -3,9 +3,6 @@ ## This file is a stop gap whilst we migrate the Makefile to better ## supprt prow for our testing -curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose -chmod +x /usr/local/bin/docker-compose - # Build images while we wait for services to start make build APP_VERSION=build