Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11266 from YoyinZyc/upgrade-downgrade-test

Browse Source 
e2e: only expect cluster's major version is > 3 in release upgrade test
This commit is contained in:
Jingyi Hu 2019-11-25 14:03:57 -08:00 committed by GitHub
commit 44fc9e3d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/e2e/etcd_release_upgrade_test.go
View File

@ -17,7 +17,6 @@ package e2e
import ( import (
"fmt" "fmt"
"os" "os"
"strings"
"sync" "sync"
"testing" "testing"
"time" "time"
@ -55,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":"` + version.Cluster(version.Version)}); err != nil { if err = cURLGet(epc, cURLReq{endpoint: "/version", expected: `"etcdcluster":"3.`}); 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
@ -63,7 +62,7 @@ func TestReleaseUpgrade(t *testing.T) {
break break
} }
if err != nil { if err != nil {
t.Skipf("cannot pull version (%v)", err) t.Fatalf("cannot pull version (%v)", err)
} }
os.Setenv("ETCDCTL_API", "3") os.Setenv("ETCDCTL_API", "3")
@ -105,12 +104,18 @@ func TestReleaseUpgrade(t *testing.T) {
// TODO: update after release candidate // TODO: update after release candidate
// expect upgraded cluster version // expect upgraded cluster version
ver := version.Version // new cluster version needs more time to upgrade
if strings.HasSuffix(ver, "-pre") { ver := version.Cluster(version.Version)
ver = strings.Replace(ver, "-pre", "", 1) for i := 0; i < 7; i++ {
if err = cURLGet(epc, cURLReq{endpoint: "/version", expected: `"etcdcluster":"` + ver}); err != nil {
t.Logf("#%d: %v is not ready yet (%v)", i, ver, err)
time.Sleep(time.Second)
continue
} }
if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, ver), metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil { break
cx.t.Fatalf("failed get with curl (%v)", err) }
if err != nil {
t.Fatalf("cluster version is not upgraded (%v)", err)
} }
} }

4
tests/semaphore.test.bash
View File

@ -8,10 +8,10 @@ fi
<<COMMENT <<COMMENT
# amd64-e2e # amd64-e2e
tests/semaphore.test.bash tests/semaphore.test.bash
sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.4.0" make docker-test sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.4.3" make docker-test
# 386-e2e # 386-e2e
sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='build e2e'" make docker-test sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='build e2e'" make docker-test
COMMENT COMMENT
sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.4.0" make docker-test sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.4.3" make docker-test