Skip to content

Commit 0012733

Browse files
committed
fix e2e case
Signed-off-by: dongjiang <dongjiang1989@126.com>
1 parent 24c29af commit 0012733

2 files changed

Lines changed: 4 additions & 19 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
go.uber.org/automaxprocs v1.6.0
1616
go.uber.org/zap v1.27.0
1717
golang.org/x/sync v0.14.0
18-
gopkg.in/yaml.v3 v3.0.1
1918
k8s.io/api v0.33.0
2019
k8s.io/apiextensions-apiserver v0.29.3
2120
k8s.io/apimachinery v0.33.0
@@ -99,6 +98,7 @@ require (
9998
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
10099
gopkg.in/inf.v0 v0.9.1 // indirect
101100
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
101+
gopkg.in/yaml.v3 v3.0.1 // indirect
102102
k8s.io/klog/v2 v2.130.1 // indirect
103103
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
104104
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

test/e2e/main_test.go

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,13 @@ import (
2626

2727
"github.com/blang/semver/v4"
2828
"github.com/kubeservice-stack/echo/test/framework"
29-
"gopkg.in/yaml.v3"
3029
)
3130

3231
var (
3332
testframework *framework.Framework
3433
testImage *string
3534
)
3635

37-
type Version struct {
38-
Variables map[string]string `yaml:"variables"`
39-
}
40-
4136
func TestMain(m *testing.M) {
4237
kubeconfig := flag.String(
4338
"kubeconfig",
@@ -58,23 +53,13 @@ func TestMain(m *testing.M) {
5853

5954
logger := log.New(os.Stdout, "", log.Lshortfile)
6055

61-
fp, err := os.Open("../../VERSION.yml")
62-
if err != nil {
63-
logger.Printf("failed to open version file: %v\n", err)
64-
os.Exit(1)
65-
}
66-
defer fp.Close()
67-
68-
dec := yaml.NewDecoder(fp)
69-
// 配置对象
70-
var verison Version
71-
err = dec.Decode(&verison)
56+
currentVersion, err := os.ReadFile("../../VERSION")
7257
if err != nil {
73-
logger.Printf("failed to read version fp: %v\n", err)
58+
logger.Printf("failed to read version file: %v\n", err)
7459
os.Exit(1)
7560
}
7661

77-
currentSemVer, err := semver.ParseTolerant(verison.Variables["TAG_REALSE_VERSION"])
62+
currentSemVer, err := semver.ParseTolerant(string(currentVersion))
7863
if err != nil {
7964
logger.Printf("failed to parse current version: %v\n", err)
8065
os.Exit(1)

0 commit comments

Comments
 (0)