Merge pull request #515 from zong-zhe/fix-test-case

fix: fix test case, replace deprecated konfig with v0.10.0
kcl-lang · Nov 4, 2024 · 3ad0838 · 3ad0838
2 parents d85a0b3 + 359548a
commit 3ad0838
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 11 deletions.
diff --git a/scripts/pull_pkg.sh b/scripts/pull_pkg.sh
@@ -27,6 +27,10 @@ if [ ! -d "./ghcr.io/kcl-lang/k8s/1.27" ]; then
   $current_dir/bin/kpm pull k8s:1.27
 fi
 
+if [ ! -d "./ghcr.io/kcl-lang/k8s/1.31.2" ]; then
+  $current_dir/bin/kpm pull k8s:1.31.2
+fi
+
 if [ ! -d "./ghcr.io/kcl-lang/helloworld/0.1.1" ]; then
   $current_dir/bin/kpm pull helloworld:0.1.1
 fi

diff --git a/scripts/push_pkg.sh b/scripts/push_pkg.sh
@@ -24,12 +24,18 @@ $current_dir/bin/kpm push
 
 cd "$current_dir"
 
-# Push the package k8s/1.17 to the registry
+# Push the package k8s/1.27 to the registry
 cd ./scripts/pkg_in_reg/ghcr.io/kcl-lang/k8s/1.27
 $current_dir/bin/kpm push
 
 cd "$current_dir"
 
+# Push the package k8s/1.31.2 to the registry
+cd ./scripts/pkg_in_reg/ghcr.io/kcl-lang/k8s/1.31.2
+$current_dir/bin/kpm push
+
+cd "$current_dir"
+
 # Push the package helloworld/1.17 to the registry
 cd ./scripts/pkg_in_reg/ghcr.io/kcl-lang/helloworld/0.1.1
 $current_dir/bin/kpm push

diff --git a/test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_oci_url/test_suite.stdout b/test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_oci_url/test_suite.stdout
@@ -1,4 +1,4 @@
 start to pull 'oci://localhost:5001/test/k8s'
-the lastest version '1.27' will be pulled
-pulling '/test/k8s:1.27' from 'localhost:5001/test/k8s'
+the lastest version '1.31.2' will be pulled
+pulling '/test/k8s:1.31.2' from 'localhost:5001/test/k8s'
 pulled 'oci://localhost:5001/test/k8s' in '<workspace>/localhost:5001/test/k8s' successfully
diff --git a/test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_pkg_name/test_suite.stdout b/test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_pkg_name/test_suite.stdout
@@ -1,4 +1,4 @@
 start to pull 'k8s'
-the lastest version '1.27' will be pulled
-pulling 'test/k8s:1.27' from 'localhost:5001/test/k8s'
+the lastest version '1.31.2' will be pulled
+pulling 'test/k8s:1.31.2' from 'localhost:5001/test/k8s'
 pulled 'k8s' in '<workspace>/localhost:5001/test/k8s' successfully
diff --git a/test/e2e/test_suites/kpm/workflows/add_multi_times/2.first_add_konfig_dep/test_suite.input b/test/e2e/test_suites/kpm/workflows/add_multi_times/2.first_add_konfig_dep/test_suite.input
@@ -1 +1 @@
-kpm add -git https://github.com/awesome-kusion/konfig.git -tag v0.0.1
+kpm add -git https://github.com/kcl-lang/konfig -tag v0.10.0
diff --git a/test/e2e/test_suites/kpm/workflows/add_multi_times/2.first_add_konfig_dep/test_suite.stdout b/test/e2e/test_suites/kpm/workflows/add_multi_times/2.first_add_konfig_dep/test_suite.stdout
@@ -1 +1 @@
-add dependency 'konfig:v0.0.1' successfully
+add dependency 'konfig:v0.10.0' successfully
diff --git a/test/e2e/test_suites/kpm/workflows/add_multi_times/3.second_add_konfig_dep/test_suite.input b/test/e2e/test_suites/kpm/workflows/add_multi_times/3.second_add_konfig_dep/test_suite.input
@@ -1 +1 @@
-kpm add -git https://github.com/awesome-kusion/konfig.git -tag v0.0.1
+kpm add -git https://github.com/kcl-lang/konfig -tag v0.10.0
diff --git a/test/e2e/test_suites/kpm/workflows/add_multi_times/3.second_add_konfig_dep/test_suite.stdout b/test/e2e/test_suites/kpm/workflows/add_multi_times/3.second_add_konfig_dep/test_suite.stdout
@@ -1 +1 @@
-add dependency 'konfig:v0.0.1' successfully
+add dependency 'konfig:v0.10.0' successfully
diff --git a/test/e2e/test_suites/kpm/workflows/add_multi_times/4.third_add_konfig_dep/test_suite.input b/test/e2e/test_suites/kpm/workflows/add_multi_times/4.third_add_konfig_dep/test_suite.input
@@ -1 +1 @@
-kpm add -git https://github.com/awesome-kusion/konfig.git -tag v0.0.1
+kpm add -git https://github.com/kcl-lang/konfig -tag v0.10.0
diff --git a/test/e2e/test_suites/kpm/workflows/add_multi_times/4.third_add_konfig_dep/test_suite.stdout b/test/e2e/test_suites/kpm/workflows/add_multi_times/4.third_add_konfig_dep/test_suite.stdout
@@ -1 +1 @@
-add dependency 'konfig:v0.0.1' successfully
+add dependency 'konfig:v0.10.0' successfully
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		kpm add -git https://github.com/awesome-kusion/konfig.git -tag v0.0.1
		kpm add -git https://github.com/kcl-lang/konfig -tag v0.10.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		add dependency 'konfig:v0.0.1' successfully
		add dependency 'konfig:v0.10.0' successfully