etcd: Bump to version 3.2.6 and update all the grpc deps

Note: When go-grpc-prometheus was in the main $gopath (even at this
version) and everyone else was where they always were in vendor/ this
didn't build! It gave errors like:

	have SendHeader("github.com/purpleidea/mgmt/vendor/google.golang.org/grpc/metadata".MD) error
	want SendHeader("google.golang.org/grpc/metadata".MD) error

and I got frustrated. Putting it "next" to the other vendored deps seems
to have fixed this. Where are the golang docs that explain this
phenomenon?

This also requires golang 1.8+ as that is a requirement for etcd. It's
probably a reasonable thing for us too.

Note the older versions of etcd had some bugs with the concurrency
package and other things, so this is a necessary bump.
This commit is contained in:
James Shubin
2017-08-30 13:13:00 -04:00
parent 1003b49dd9
commit 0edba74091
10 changed files with 19 additions and 16 deletions

3
.gitmodules vendored
View File

@@ -16,3 +16,6 @@
[submodule "vendor/honnef.co/go/augeas"] [submodule "vendor/honnef.co/go/augeas"]
path = vendor/honnef.co/go/augeas path = vendor/honnef.co/go/augeas
url = https://github.com/dominikh/go-augeas/ url = https://github.com/dominikh/go-augeas/
[submodule "vendor/github.com/grpc-ecosystem/go-grpc-prometheus"]
path = vendor/github.com/grpc-ecosystem/go-grpc-prometheus
url = https://github.com/grpc-ecosystem/go-grpc-prometheus

View File

@@ -1,8 +1,7 @@
language: go language: go
go: go:
- 1.6.x
- 1.7.x
- 1.8.x - 1.8.x
- 1.9.x
- tip - tip
go_import_path: github.com/purpleidea/mgmt go_import_path: github.com/purpleidea/mgmt
sudo: true sudo: true
@@ -16,7 +15,7 @@ matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- go: tip - go: tip
- go: 1.6.x - go: 1.9.x
notifications: notifications:
irc: irc:
channels: channels:

View File

@@ -9,7 +9,7 @@ if ! timeout 1s sudo -A true; then
fi fi
# run till completion # run till completion
timeout --kill-after=15s 10s sudo -A ./mgmt run --yaml file-owner.yaml --converged-timeout=5 --no-watch --tmp-prefix & timeout --kill-after=30s 25s sudo -A ./mgmt run --yaml file-owner.yaml --converged-timeout=5 --no-watch --tmp-prefix &
pid=$! pid=$!
wait $pid # get exit status wait $pid # get exit status
e=$? e=$?

View File

@@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
# should take slightly more than 25s, but fail if we take 35s) # should take more than 25s plus overhead
$timeout --kill-after=35s 30s ./mgmt run --yaml graph-fanin-1.yaml --converged-timeout=5 --no-watch --tmp-prefix --no-pgp & $timeout --kill-after=50s 45s ./mgmt run --yaml graph-fanin-1.yaml --converged-timeout=5 --no-watch --tmp-prefix --no-pgp &
pid=$! pid=$!
wait $pid # get exit status wait $pid # get exit status
exit $? exit $?

View File

@@ -1,9 +1,9 @@
#!/bin/bash -e #!/bin/bash -e
# run empty graph # run empty graph
$timeout --kill-after=20s 15s ./mgmt run --tmp-prefix & $timeout --kill-after=45s 35s ./mgmt run --tmp-prefix --no-pgp &
pid=$! pid=$!
sleep 5s # let it converge sleep 10s # let it converge
$(sleep 3s && killall -SIGINT mgmt)& # send ^C to exit mgmt $(sleep 3s && killall -SIGINT mgmt)& # send ^C to exit mgmt
wait $pid # get exit status wait $pid # get exit status
exit $? exit $?

View File

@@ -10,11 +10,11 @@ set -o pipefail
ROOT=$(dirname "${BASH_SOURCE}")/.. ROOT=$(dirname "${BASH_SOURCE}")/..
GO_VERSION=($(go version)) #GO_VERSION=($(go version))
#
if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8|devel') ]]; then #if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8|go1.9|devel') ]]; then
fail_test "Unknown go version '${GO_VERSION[2]}', failing gofmt." # fail_test "Unknown go version '${GO_VERSION[2]}', failing gofmt."
fi #fi
cd "${ROOT}" cd "${ROOT}"