From 034f2c4d13b8fb6cdae339ddf66c0e3b9fde3f0a Mon Sep 17 00:00:00 2001 From: "Alex Ellis (VMware)" Date: Thu, 29 Mar 2018 09:58:50 +0100 Subject: [PATCH] Update travis to use Go 1.9 Signed-off-by: Alex Ellis (VMware) --- .travis.yml | 7 +++++++ contrib/ci.sh | 20 +++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45510cc6..96fc9ade 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,12 @@ sudo: required +language: go +go: + - "1.9" + services: - docker + addons: apt: packages: @@ -13,12 +18,14 @@ script: - sh build.sh # Invoke ci script too - sh contrib/ci.sh + after_success: - if [ ! -s "$TRAVIS_TAG" ] ; then docker tag $DOCKER_NS/gateway:latest-dev $DOCKER_NS/gateway:$TRAVIS_TAG; docker login -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD; docker push $DOCKER_NS/gateway:$TRAVIS_TAG; fi + deploy: provider: releases api_key: diff --git a/contrib/ci.sh b/contrib/ci.sh index 4a036f7d..891a1219 100644 --- a/contrib/ci.sh +++ b/contrib/ci.sh @@ -3,6 +3,20 @@ docker swarm init --advertise-addr=127.0.0.1 ./deploy_stack.sh +docker service update func_gateway --image=functions/gateway:latest-dev + +# Script makes sure OpenFaaS API gateway is ready before running tests + +for i in {1..30}; +do + echo "Checking if 127.0.0.1:8000 is up.. ${i}/30" + curl -fs 127.0.0.1:8080/ + + if [ $? -eq 0 ]; then + break + fi + sleep 0.5 +done cd .. @@ -11,14 +25,14 @@ echo $GOPATH mkdir -p $GOPATH/src/github.com/openfaas/ cp -r faas $GOPATH/src/github.com/openfaas/ -git clone https://github.com/openfaas/certify-incubator +git clone https://github.com/openfaas/certifier -cp -r certify-incubator $GOPATH/src/github.com/openfaas/ +cp -r certifier $GOPATH/src/github.com/openfaas/ cd $GOPATH/src/github.com/openfaas/faas/gateway/tests/integration && \ go test -v -cd $GOPATH/src/github.com/openfaas/certify-incubator && \ +cd $GOPATH/src/github.com/openfaas/certifier && \ make test exit 0