tests/e2e: fix upgrade, metrics tests
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>release-3.5
parent
189071dcd4
commit
b842cf7770
|
@ -105,8 +105,8 @@ func TestReleaseUpgrade(t *testing.T) {
|
||||||
|
|
||||||
// expect upgraded cluster version
|
// expect upgraded cluster version
|
||||||
ver := version.Version
|
ver := version.Version
|
||||||
if strings.HasSuffix(ver, "+git") {
|
if strings.HasSuffix(ver, "-pre") {
|
||||||
ver = strings.Replace(ver, "+git", "", 1)
|
ver = strings.Replace(ver, "-pre", "", 1)
|
||||||
}
|
}
|
||||||
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 {
|
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 {
|
||||||
cx.t.Fatalf("failed get with curl (%v)", err)
|
cx.t.Fatalf("failed get with curl (%v)", err)
|
||||||
|
|
|
@ -41,8 +41,8 @@ func metricsTest(cx ctlCtx) {
|
||||||
cx.t.Fatal(err)
|
cx.t.Fatal(err)
|
||||||
}
|
}
|
||||||
ver := version.Version
|
ver := version.Version
|
||||||
if strings.HasSuffix(ver, "+git") {
|
if strings.HasSuffix(ver, "-pre") {
|
||||||
ver = strings.Replace(ver, "+git", "", 1)
|
ver = strings.Replace(ver, "-pre", "", 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
i := 0
|
i := 0
|
||||||
|
|
Loading…
Reference in New Issue