This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 6678fa36430 branch-3.0: [fix](case) do not use global var in script
#53231 (#53240)
6678fa36430 is described below
commit 6678fa36430d78b06d7b74622f57259f8add344f
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 15 12:17:13 2025 +0800
branch-3.0: [fix](case) do not use global var in script #53231 (#53240)
Cherry-picked from #53231
Co-authored-by: Yongqiang YANG <[email protected]>
---
regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy | 2 +-
regression-test/suites/cloud_p0/node_mgr/test_ms_api.groovy | 2 +-
.../suites/cloud_p0/node_mgr/test_rename_compute_group.groovy | 2 +-
.../compaction10/test_schema_change_with_compaction10.groovy | 2 +-
.../compaction11/test_schema_change_with_compaction11.groovy | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy
b/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy
index ce45bcfe093..ceb8969b721 100644
--- a/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy
+++ b/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy
@@ -137,7 +137,7 @@ suite('test_auto_start_in_cloud', 'multi_cluster, docker') {
cluster.stopBackends(1,2,3)
// select
- future1 = thread {
+ def future1 = thread {
def begin = System.currentTimeMillis();
// root cant resume, due to deamon thread use root
def connInfo = context.threadLocalConn.get()
diff --git a/regression-test/suites/cloud_p0/node_mgr/test_ms_api.groovy
b/regression-test/suites/cloud_p0/node_mgr/test_ms_api.groovy
index 62dfe5d39e2..b094b5354af 100644
--- a/regression-test/suites/cloud_p0/node_mgr/test_ms_api.groovy
+++ b/regression-test/suites/cloud_p0/node_mgr/test_ms_api.groovy
@@ -399,7 +399,7 @@ suite('test_ms_api', 'p0, docker') {
def internal_bucket_user = [[user_id:"1-userid",
ak:"test-ak1-updated", sk:"test-sk1-updated"]]
def update_ak_sk_api_body = [instance_id:"${instance_id}",
internal_bucket_user:internal_bucket_user]
jsonOutput = new JsonOutput()
- upDateAKSKBody = jsonOutput.toJson(update_ak_sk_api_body)
+ def upDateAKSKBody = jsonOutput.toJson(update_ak_sk_api_body)
update_ak_sk_api.call(msHttpPort, upDateAKSKBody) {
diff --git
a/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
b/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
index 92077c679e5..fd97b15eb51 100644
--- a/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
+++ b/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
@@ -47,7 +47,7 @@ suite('test_rename_compute_group', 'docker, p0') {
}
}
def findToDropUniqueId = { clusterId, hostIP, metaServices ->
- ret = get_instance(metaServices)
+ def ret = get_instance(metaServices)
def toDropCluster = ret.clusters.find {
it.cluster_id.contains(clusterId)
}
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
index ca8b2f70ab9..3c023b26c28 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
@@ -124,7 +124,7 @@ suite('test_schema_change_with_compaction10', 'docker') {
}
int max_try_time = 3000
while (max_try_time--){
- result = getJobState("date")
+ def result = getJobState("date")
if (result == "FINISHED" || result == "CANCELLED") {
sleep(3000)
break
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
index 768481a3264..2845fe2f5c0 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
@@ -144,7 +144,7 @@ suite('test_schema_change_with_compaction11', 'docker') {
}
int max_try_time = 3000
while (max_try_time--){
- result = getJobState("date")
+ def result = getJobState("date")
if (result == "FINISHED" || result == "CANCELLED") {
sleep(3000)
break
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
