tests/e2e: fix upgrade, metrics tests

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>

tests/e2e/etcd_release_upgrade_test.go

@@ -105,8 +105,8 @@ func TestReleaseUpgrade(t *testing.T) {
 
 	// expect upgraded cluster version
 	ver := version.Version
-	if strings.HasSuffix(ver, "+git") {
-		ver = strings.Replace(ver, "+git", "", 1)
+	if strings.HasSuffix(ver, "-pre") {
+		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 {
 		cx.t.Fatalf("failed get with curl (%v)", err)

tests/e2e/metrics_test.go

@@ -41,8 +41,8 @@ func metricsTest(cx ctlCtx) {
 		cx.t.Fatal(err)
 	}
 	ver := version.Version
-	if strings.HasSuffix(ver, "+git") {
-		ver = strings.Replace(ver, "+git", "", 1)
+	if strings.HasSuffix(ver, "-pre") {
+		ver = strings.Replace(ver, "-pre", "", 1)
 	}
 
 	i := 0