Skip to content

Commit 57207e1

Browse files
wzshimingpacoxu
authored andcommitted
Test
1 parent 77f3e8e commit 57207e1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

patches/fix-etcd-put-key.1.23.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] Remove writable verification in etcd startup
88
1 file changed, 1 deletion(-)
99

1010
diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
11-
index 88f64fb0a09..1a3a0b1eefb 100755
11+
index 756e342499c..f6a9d1fa393 100755
1212
--- a/hack/lib/etcd.sh
1313
+++ b/hack/lib/etcd.sh
1414
@@ -88,7 +88,6 @@ kube::etcd::start() {
@@ -18,4 +18,4 @@ index 88f64fb0a09..1a3a0b1eefb 100755
1818
- curl -fs -X POST "${KUBE_INTEGRATION_ETCD_URL}/v3/kv/put" -d '{"key": "X3Rlc3Q=", "value": ""}'
1919
}
2020

21-
kube::etcd::stop() {
21+
kube::etcd::start_scraping() {

patches/fix-run-docker.1.23.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH 1/2] Run docker as root in tests
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/build/common.sh b/build/common.sh
11-
index 75dc82ed335..c54fe8269d1 100755
11+
index c59692408ae..da28826f108 100755
1212
--- a/build/common.sh
1313
+++ b/build/common.sh
14-
@@ -535,7 +535,7 @@ function kube::build::run_build_command_ex() {
14+
@@ -490,7 +490,7 @@ function kube::build::run_build_command_ex() {
1515

1616
local -a docker_run_opts=(
1717
"--name=${container_name}"
@@ -31,10 +31,10 @@ Subject: [PATCH 2/2] Run docker with device kmsg
3131
1 file changed, 1 insertion(+)
3232

3333
diff --git a/build/common.sh b/build/common.sh
34-
index c54fe8269d1..9cd95b5af51 100755
34+
index da28826f108..b1dc1a26a4e 100755
3535
--- a/build/common.sh
3636
+++ b/build/common.sh
37-
@@ -537,6 +537,7 @@ function kube::build::run_build_command_ex() {
37+
@@ -492,6 +492,7 @@ function kube::build::run_build_command_ex() {
3838
"--name=${container_name}"
3939
"--user=root"
4040
"--hostname=${HOSTNAME}"

patches/no-delete-images.1.23.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] No delete images
88
1 file changed, 2 insertions(+), 2 deletions(-)
99

1010
diff --git a/build/lib/release.sh b/build/lib/release.sh
11-
index 6d23dc20339..f5bf1dd0f57 100644
11+
index 6bc6624951e..cb8455b298a 100644
1212
--- a/build/lib/release.sh
1313
+++ b/build/lib/release.sh
14-
@@ -411,8 +411,8 @@ EOF
14+
@@ -408,8 +408,8 @@ function kube::release::create_docker_images_for_server() {
1515
rm -rf "${docker_build_path}"
1616
ln "${binary_file_path}.tar" "${images_dir}/"
1717

0 commit comments

Comments
 (0)