浏览代码

Merge pull request #7984 from gyuho/3.2

*: bump up test Go runtime, etcd versions before 3.2 release
Gyu-Ho Lee 8 年之前
父节点
当前提交
4a8d32eaa6
共有 4 个文件被更改,包括 5 次插入4 次删除
  1. 1 1
      .travis.yml
  2. 1 1
      ROADMAP.md
  3. 2 1
      e2e/etcd_release_upgrade_test.go
  4. 1 1
      test

+ 1 - 1
.travis.yml

@@ -4,7 +4,7 @@ go_import_path: github.com/coreos/etcd
 sudo: false
 sudo: false
 
 
 go:
 go:
-  - 1.8.1
+  - 1.8.3
   - tip
   - tip
 
 
 notifications:
 notifications:

+ 1 - 1
ROADMAP.md

@@ -6,7 +6,7 @@ This document defines a high level roadmap for etcd development.
 
 
 The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project. The [milestones defined in GitHub](https://github.com/coreos/etcd/milestones) represent the most up-to-date and issue-for-issue plans.
 The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project. The [milestones defined in GitHub](https://github.com/coreos/etcd/milestones) represent the most up-to-date and issue-for-issue plans.
 
 
-etcd 3.1 is our current stable branch. The roadmap below outlines new features that will be added to etcd, and while subject to change, define what future stable will look like.
+etcd 3.2 is our current stable branch. The roadmap below outlines new features that will be added to etcd, and while subject to change, define what future stable will look like.
 
 
 ### etcd 3.2 (2017-May)
 ### etcd 3.2 (2017-May)
 - Stable scalable proxy
 - Stable scalable proxy

+ 2 - 1
e2e/etcd_release_upgrade_test.go

@@ -23,6 +23,7 @@ import (
 
 
 	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/coreos/etcd/pkg/testutil"
 	"github.com/coreos/etcd/pkg/testutil"
+	"github.com/coreos/etcd/version"
 )
 )
 
 
 // TestReleaseUpgrade ensures that changes to master branch does not affect
 // TestReleaseUpgrade ensures that changes to master branch does not affect
@@ -53,7 +54,7 @@ func TestReleaseUpgrade(t *testing.T) {
 	// so there's a window at boot time where it doesn't have V3rpcCapability enabled
 	// so there's a window at boot time where it doesn't have V3rpcCapability enabled
 	// poll /version until etcdcluster is >2.3.x before making v3 requests
 	// poll /version until etcdcluster is >2.3.x before making v3 requests
 	for i := 0; i < 7; i++ {
 	for i := 0; i < 7; i++ {
-		if err = cURLGet(epc, cURLReq{endpoint: "/version", expected: `"etcdcluster":"3.1`}); err != nil {
+		if err = cURLGet(epc, cURLReq{endpoint: "/version", expected: `"etcdcluster":"` + version.Cluster(version.Version)}); err != nil {
 			t.Logf("#%d: v3 is not ready yet (%v)", i, err)
 			t.Logf("#%d: v3 is not ready yet (%v)", i, err)
 			time.Sleep(time.Second)
 			time.Sleep(time.Second)
 			continue
 			continue

+ 1 - 1
test

@@ -170,7 +170,7 @@ function grpcproxy_pass {
 function release_pass {
 function release_pass {
 	rm -f ./bin/etcd-last-release
 	rm -f ./bin/etcd-last-release
 	# to grab latest patch release; bump this up for every minor release
 	# to grab latest patch release; bump this up for every minor release
-	UPGRADE_VER=$(git tag -l --sort=-version:refname "v3.1.*" | head -1)
+	UPGRADE_VER=$(git tag -l --sort=-version:refname "v3.2.*" | head -1)
 	if [ -n "$MANUAL_VER" ]; then
 	if [ -n "$MANUAL_VER" ]; then
 		# in case, we need to test against different version
 		# in case, we need to test against different version
 		UPGRADE_VER=$MANUAL_VER
 		UPGRADE_VER=$MANUAL_VER