diff --git a/contrib/post_test_hook.sh b/contrib/post_test_hook.sh index 3757bc2..4878a5c 100755 --- a/contrib/post_test_hook.sh +++ b/contrib/post_test_hook.sh @@ -138,9 +138,6 @@ pushd $GOPATH/src/k8s.io/kubernetes >/dev/null 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 -source $DEST/.gimme/envs/go1.7.5.env - # open up access for containers sudo iptables -t nat -A POSTROUTING -o ens3 -s 10.0.0.0/24 -j MASQUERADE sudo iptables -t nat -A POSTROUTING -o ens3 -s 172.17.0.0/24 -j MASQUERADE diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 2f741e2..e6f2a00 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -62,13 +62,6 @@ 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