Merge pull request #7076 from fanminshi/fix_e2e_test

e2e: unset ETCDCTL_API env var before running e2e tests

e2e/main_test.go

@@ -18,6 +18,7 @@ var certDir string
 
 func TestMain(m *testing.M) {
 	os.Setenv("ETCD_UNSUPPORTED_ARCH", runtime.GOARCH)
+	os.Unsetenv("ETCDCTL_API")
 
 	flag.StringVar(&binDir, "bin-dir", "../bin", "The directory for store etcd and etcdctl binaries.")
 	flag.StringVar(&certDir, "cert-dir", "../integration/fixtures", "The directory for store certificate files.")