Merge pull request #3078 from thaJeztah/1.1_bump_golang

estesp · web-flow · commit 52bfc9f53008 · 2019-03-07T11:13:44.000-05:00
[release/1.1 backport] Bump to Go 1.11.x
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -12,7 +12,7 @@ environment:
   GOPATH: C:\gopath
   CGO_ENABLED: 1
   matrix:
-    - GO_VERSION: 1.10
+    - GO_VERSION: 1.11
 
 before_build:
   - choco install -y mingw
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ services:
 language: go
 
 go:
-  - "1.10.x"
+  - "1.11.x"
 
 go_import_path: github.com/containerd/containerd
 
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
@@ -401,6 +401,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {
 	labels := map[string]string{
 		"k1": "v1",
 		"k2": "v2",
+
 		"containerd.io/gc.root": rootTime,
 	}
 
@@ -437,6 +438,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {
 
 	info.Labels = map[string]string{
 		"k1": "v1",
+
 		"containerd.io/gc.root": rootTime,
 	}
 	preUpdate = time.Now()
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -7,19 +7,19 @@
 #
 
 # Install proto3
-FROM golang:1.10 AS proto3
+FROM golang:1.11 AS proto3
 RUN apt-get update && apt-get install -y autoconf automake g++ libtool unzip
 COPY script/setup/install-protobuf install-protobuf
 RUN ./install-protobuf
 
 # Install runc
-FROM golang:1.10 AS runc
+FROM golang:1.11 AS runc
 RUN apt-get update && apt-get install -y curl libseccomp-dev
 COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf
 COPY script/setup/install-runc install-runc
 RUN ./install-runc
 
-FROM golang:1.10
+FROM golang:1.11
 RUN apt-get update && apt-get install -y btrfs-tools gcc git libseccomp-dev make xfsprogs
 
 COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc
diff --git a/metadata/content_test.go b/metadata/content_test.go
@@ -130,7 +130,7 @@ func checkContentLeased(ctx context.Context, db *DB, dgst digest.Digest) error {
 	return db.View(func(tx *bolt.Tx) error {
 		bkt := getBucket(tx, bucketKeyVersion, []byte(ns), bucketKeyObjectLeases, []byte(lease), bucketKeyObjectContent)
 		if bkt == nil {
-			return errors.Wrapf(errdefs.ErrNotFound, "bucket not found", lease)
+			return errors.Wrapf(errdefs.ErrNotFound, "bucket not found %s", lease)
 		}
 		v := bkt.Get([]byte(dgst.String()))
 		if v == nil {
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -687,6 +687,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh
 		expected = map[string]string{
 			"l1": "updated",
 			"l3": "v3",
+
 			"containerd.io/gc.root": rootTime,
 		}
 		st.Labels = map[string]string{
@@ -701,6 +702,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh
 
 		expected = map[string]string{
 			"l4": "v4",
+
 			"containerd.io/gc.root": rootTime,
 		}
 		st.Labels = expected

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {`
`401`	`401`	`labels := map[string]string{`
`402`	`402`	`"k1": "v1",`
`403`	`403`	`"k2": "v2",`
	`404`	`+`
`404`	`405`	`"containerd.io/gc.root": rootTime,`
`405`	`406`	`}`
`406`	`407`
`@@ -437,6 +438,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {`
`437`	`438`
`438`	`439`	`info.Labels = map[string]string{`
`439`	`440`	`"k1": "v1",`
	`441`	`+`
`440`	`442`	`"containerd.io/gc.root": rootTime,`
`441`	`443`	`}`
`442`	`444`	`preUpdate = time.Now()`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func checkContentLeased(ctx context.Context, db *DB, dgst digest.Digest) error {`
`130`	`130`	`return db.View(func(tx *bolt.Tx) error {`
`131`	`131`	`bkt := getBucket(tx, bucketKeyVersion, []byte(ns), bucketKeyObjectLeases, []byte(lease), bucketKeyObjectContent)`
`132`	`132`	`if bkt == nil {`
`133`		`- return errors.Wrapf(errdefs.ErrNotFound, "bucket not found", lease)`
	`133`	`+ return errors.Wrapf(errdefs.ErrNotFound, "bucket not found %s", lease)`
`134`	`134`	`}`
`135`	`135`	`v := bkt.Get([]byte(dgst.String()))`
`136`	`136`	`if v == nil {`
Original file line number	Diff line number	Diff line change
`@@ -687,6 +687,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh`
`687`	`687`	`expected = map[string]string{`
`688`	`688`	`"l1": "updated",`
`689`	`689`	`"l3": "v3",`
	`690`	`+`
`690`	`691`	`"containerd.io/gc.root": rootTime,`
`691`	`692`	`}`
`692`	`693`	`st.Labels = map[string]string{`
`@@ -701,6 +702,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh`
`701`	`702`
`702`	`703`	`expected = map[string]string{`
`703`	`704`	`"l4": "v4",`
	`705`	`+`
`704`	`706`	`"containerd.io/gc.root": rootTime,`
`705`	`707`	`}`
`706`	`708`	`st.Labels = expected`