From 58348bfde44f5c922ad49551c2d7e02751cf4f30 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 4 Apr 2017 10:38:26 -0400 Subject: [PATCH] Switch to 1.7.5 golang for both local-cluster-up and e2e tests Change-Id: I892e642ab0d3b49561e716791fe3c587424b350a --- contrib/post_test_hook.sh | 6 +----- devstack/plugin.sh | 7 +++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contrib/post_test_hook.sh b/contrib/post_test_hook.sh index beed3ca..b955da2 100755 --- a/contrib/post_test_hook.sh +++ b/contrib/post_test_hook.sh @@ -81,11 +81,7 @@ sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=cmd/kubectl sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=vendor/github.com/onsi/ginkgo/ginkgo # e2e test does not work with 1.8, so fall back to 1.7 -sudo curl -sL -o ./gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme -sudo chmod +x ./gimme -sudo ./gimme 1.7 -env | grep HOME -source $HOME/.gimme/envs/go1.7.env +source $DEST/.gimme/envs/go1.7.5.env sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=test/e2e/e2e.test sudo -E PATH=$GOPATH/bin:$PATH go run hack/e2e.go -- -v --test --test_args="--ginkgo.trace=true --ginkgo.failFast=true --ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort" diff --git a/devstack/plugin.sh b/devstack/plugin.sh index c65a943..1d1189e 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -59,6 +59,13 @@ function install_docker { function install_k8s_cloud_provider { echo_summary "Installing Devstack Plugin for k8s-cloud-provider" + # upstream kubernetes has not moved to 1.8 yet, so use 1.7.5 + sudo curl -sL -o ./gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme + sudo chmod +x ./gimme + sudo ./gimme 1.7.5 + env | grep HOME + source $HOME/.gimme/envs/go1.7.5.env + # golang env details go env go version