diff --git a/regression-test/suites/account_p0/test_alter_user.groovy b/regression-test/suites/account_p0/test_alter_user.groovy
index 7a2c4649a0667e..fc4b8a12bf2890 100644
--- a/regression-test/suites/account_p0/test_alter_user.groovy
+++ b/regression-test/suites/account_p0/test_alter_user.groovy
@@ -170,7 +170,7 @@ suite("test_alter_user", "account,nonConcurrent") {
     }
     sleep(6000)
     sql """set password for 'test_auth_user4' = password('123')"""
-    result2 = connect('test_auth_user4', '123', context.config.jdbcUrl) {
+    def result2 = connect('test_auth_user4', '123', context.config.jdbcUrl) {
         sql 'select 1'
     }
     sleep(6000)
diff --git a/regression-test/suites/compaction/compaction_width_array_column.groovy b/regression-test/suites/compaction/compaction_width_array_column.groovy
index d433e81f555f26..570877cfc4cca9 100644
--- a/regression-test/suites/compaction/compaction_width_array_column.groovy
+++ b/regression-test/suites/compaction/compaction_width_array_column.groovy
@@ -56,13 +56,13 @@ suite('compaction_width_array_column', "p2") {
     }
 
     def table_load_task = { table_name ->
-        uniqueID = Math.abs(UUID.randomUUID().hashCode()).toString()
-        loadLabel = table_name + "_" + uniqueID
+        def uniqueID = Math.abs(UUID.randomUUID().hashCode()).toString()
+        def loadLabel = table_name + "_" + uniqueID
         //loadLabel = table_name + '_load_5'
-        loadSql = new File("""${context.file.parent}/ddl/${table_name}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+        def loadSql = new File("""${context.file.parent}/ddl/${table_name}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
         loadSql = loadSql.replaceAll("\\\$\\{loadLabel\\}", loadLabel)
         loadSql = loadSql.replaceAll("\\\$\\{table\\_name\\}", table_name)
-        nowloadSql = loadSql + s3WithProperties
+        def nowloadSql = loadSql + s3WithProperties
         try_sql nowloadSql
 
         while (true) {
diff --git a/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy b/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy
index fdaa83a4b3120d..c798256aa0d9eb 100644
--- a/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy
+++ b/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy
@@ -96,10 +96,10 @@ suite("test_base_compaction_with_dup_key_max_file_size_limit", "p2") {
 
             String command = sb.toString()
             logger.info(command)
-            process = command.execute()
-            code = process.waitFor()
-            err = IOGroovyMethods.getText(new BufferedReader(new InputStreamReader(process.getErrorStream())));
-            out = process.getText()
+            def process = command.execute()
+            def code = process.waitFor()
+            def err = IOGroovyMethods.getText(new BufferedReader(new InputStreamReader(process.getErrorStream())));
+            def out = process.getText()
             logger.info("Run compaction: code=" + code + ", out=" + out + ", disableAutoCompaction " + disableAutoCompaction + ", err=" + err)
             if (!disableAutoCompaction) {
                 return "Success, " + out
diff --git a/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy b/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
index 839bfaa10dd154..d0ae5355b06389 100644
--- a/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
+++ b/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
@@ -86,9 +86,9 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") {
 
             String command = sb.toString()
             logger.info(command)
-            process = command.execute()
-            code = process.waitFor()
-            out = process.getText()
+            def process = command.execute()
+            def code = process.waitFor()
+            def out = process.getText()
             logger.info("Get compaction status: code=" + code + ", out=" + out)
             assertEquals(code, 0)
             def compactionStatus = parseJson(out.trim())
diff --git a/regression-test/suites/compaction/test_single_replica_compaction.groovy b/regression-test/suites/compaction/test_single_replica_compaction.groovy
index 05286a6fa197c6..2a6d6a7caa95e5 100644
--- a/regression-test/suites/compaction/test_single_replica_compaction.groovy
+++ b/regression-test/suites/compaction/test_single_replica_compaction.groovy
@@ -93,9 +93,9 @@ suite("test_single_compaction_p2", "p2") {
 
             String command = sb.toString()
             logger.info(command)
-            process = command.execute()
-            code = process.waitFor()
-            out = process.getText()
+            def process = command.execute()
+            def code = process.waitFor()
+            def out = process.getText()
             logger.info("Get compaction status: code=" + code + ", out=" + out)
             assertEquals(code, 0)
             def compactionStatus = parseJson(out.trim())
diff --git a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy
index 9e61dd4eb0de9b..631522beb18887 100644
--- a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy
+++ b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy
@@ -79,9 +79,9 @@ suite("test_partial_update_publish_conflict_with_error", "nonConcurrent") {
         log.info("http_stream execute 2pc: ${command}")
 
         def process = command.execute()
-        code = process.waitFor()
-        out = process.text
-        json2pc = parseJson(out)
+        def code = process.waitFor()
+        def out = process.text
+        def json2pc = parseJson(out)
         log.info("http_stream 2pc result: ${out}".toString())
         assertEquals(code, 0)
         assertEquals("success", json2pc.status.toLowerCase())
diff --git a/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy b/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy
index d3a1e07f52cc5a..4a1937023894f9 100644
--- a/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy
+++ b/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy
@@ -60,7 +60,7 @@ suite("test_calc_crc", "nonConcurrent") {
     sql """ INSERT INTO ${tableName} VALUES (3, "andy", 100); """
     sql """ INSERT INTO ${tableName} VALUES (3, "bason", 99); """
 
-    tablets = sql_return_maparray """ show tablets from ${tableName}; """
+    def tablets = sql_return_maparray """ show tablets from ${tableName}; """
     String tablet_id = tablets[0].TabletId
     String backend_id = tablets[0].BackendId
     String ip = backendId_to_backendIP.get(backend_id)
diff --git a/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy b/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy
index 8598d791e01106..b15309891da067 100644
--- a/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy
+++ b/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy
@@ -48,7 +48,7 @@ suite("test_delete_from_timeout","nonConcurrent") {
 
         GetDebugPoint().enableDebugPointForAllBEs("PushHandler::_do_streaming_ingestion.try_lock_fail")
 
-        t1 = Thread.start {
+        def t1 = Thread.start {
             sleep(15000)
             GetDebugPoint().disableDebugPointForAllBEs("PushHandler::_do_streaming_ingestion.try_lock_fail")
         }
diff --git a/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy b/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy
index 0a5484dd115687..721198f6e4754b 100644
--- a/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy
+++ b/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy
@@ -64,7 +64,7 @@ suite("test_full_compaction_run_status","nonConcurrent") {
             String tablet_id = tablet.TabletId
             backend_id = tablet.BackendId
 
-            times = 1
+            def times = 1
             do{
                 (code, out, err) = be_run_full_compaction(backendId_to_backendIP.get(backend_id), backendId_to_backendHttpPort.get(backend_id), tablet_id)
                 logger.info("Run compaction: code=" + code + ", out=" + out + ", err=" + err)
diff --git a/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy b/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
index c060888690c077..23865019561e8e 100644
--- a/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
+++ b/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
@@ -116,7 +116,7 @@ suite("test_full_compaction_with_ordered_data","nonConcurrent") {
         int rowsetCount = 0
         for (def tablet in tablets) {
             String tablet_id = tablet.TabletId
-            (code, out, err) = curl("GET", tablet.CompactionStatus)
+            def (code, out, err) = curl("GET", tablet.CompactionStatus)
             logger.info("Show tablets status: code=" + code + ", out=" + out + ", err=" + err)
             assertEquals(code, 0)
             def tabletJson = parseJson(out.trim())
diff --git a/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy b/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy
index b37ac4797dfded..9c06c107320607 100644
--- a/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy
+++ b/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy
@@ -91,7 +91,7 @@ suite("test_segcompaction_correctness", "nonConcurrent,p2") {
 
             result = sql """ show load where label="$uuid" order by createtime desc limit 1; """
             qt_select_default """ SELECT * FROM ${tableName} WHERE col_0=47 order by col_1, col_2; """
-            tablets = sql """ show tablets from ${tableName}; """
+            def tablets = sql """ show tablets from ${tableName}; """
         } finally {
             try_sql("DROP TABLE IF EXISTS ${tableName}")
         }
diff --git a/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy b/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy
index 6556c792a67e1a..d7ede7028ce393 100644
--- a/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy
+++ b/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy
@@ -96,7 +96,7 @@ suite("test_too_many_segments", "nonConcurrent,p2") { // the epic -238 case
 
             result = sql """ show load where label="$uuid" order by createtime desc limit 1; """
             qt_select_default """ SELECT * FROM ${tableName} WHERE col_0=47 order by col_1, col_2; """
-            tablets = sql """ show tablets from ${tableName}; """
+            def tablets = sql """ show tablets from ${tableName}; """
         } finally {
             try_sql("DROP TABLE IF EXISTS ${tableName}")
             GetDebugPoint().disableDebugPointForAllBEs("BetaRowsetWriter._check_segment_number_limit_too_many_segments")
diff --git a/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy b/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
index e1e1e051ec1beb..d5ffd0700037d1 100644
--- a/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
+++ b/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
@@ -76,7 +76,7 @@ suite("test_variant_bloom_filter", "nonConcurrent") {
     for (def tablet in tablets) {
         int beforeSegmentCount = 0
         String tablet_id = tablet.TabletId
-        (code, out, err) = curl("GET", tablet.CompactionStatus)
+        def (code, out, err) = curl("GET", tablet.CompactionStatus)
         logger.info("Show tablets status: code=" + code + ", out=" + out + ", err=" + err)
         assertEquals(code, 0)
         def tabletJson = parseJson(out.trim())
diff --git a/regression-test/suites/inverted_index_p1/need_read_data/test_dup_table_inverted_index.groovy b/regression-test/suites/inverted_index_p1/need_read_data/test_dup_table_inverted_index.groovy
index 83b6069941941f..962ac7f7d3f2c2 100644
--- a/regression-test/suites/inverted_index_p1/need_read_data/test_dup_table_inverted_index.groovy
+++ b/regression-test/suites/inverted_index_p1/need_read_data/test_dup_table_inverted_index.groovy
@@ -42,7 +42,7 @@ suite("test_dup_table_inverted_index", "p1") {
     def execute_sql = { key, value, sqlList ->
         sql """ set ${key} = ${value} """
         List<Object> resultList = new ArrayList<>()
-        for (sqlStr in sqlList) {
+        for (def sqlStr in sqlList) {
             def sqlResult = sql """ ${sqlStr} """
             resultList.add(sqlResult)
         }
diff --git a/regression-test/suites/inverted_index_p1/test_show_data.groovy b/regression-test/suites/inverted_index_p1/test_show_data.groovy
index 210c9477f57a7a..a687e71d60c0e8 100644
--- a/regression-test/suites/inverted_index_p1/test_show_data.groovy
+++ b/regression-test/suites/inverted_index_p1/test_show_data.groovy
@@ -549,7 +549,7 @@ suite("test_show_data_with_compaction", "p1") {
     def backendId_to_backendHttpPort = [:]
     getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
 
-    backend_id = backendId_to_backendIP.keySet()[0]
+    def backend_id = backendId_to_backendIP.keySet()[0]
     def (code, out, err) = show_be_config(backendId_to_backendIP.get(backend_id), backendId_to_backendHttpPort.get(backend_id))
 
     logger.info("Show config: code=" + code + ", out=" + out + ", err=" + err)
diff --git a/regression-test/suites/opensky_p2/load.groovy b/regression-test/suites/opensky_p2/load.groovy
index 9874a8bfb4a229..d5f675dbeb9418 100644
--- a/regression-test/suites/opensky_p2/load.groovy
+++ b/regression-test/suites/opensky_p2/load.groovy
@@ -24,7 +24,7 @@ suite("load"){
 
     sql """ DROP TABLE IF EXISTS $tableName """
 
-    scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
+    def scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
 
     sql new File("""${scriptDir}/ddl/${tableName}.sql""").text
 
diff --git a/regression-test/suites/schema_change_p2/test_schema_change.groovy b/regression-test/suites/schema_change_p2/test_schema_change.groovy
index e64e1d0bfa15dd..d18b3876924f2b 100644
--- a/regression-test/suites/schema_change_p2/test_schema_change.groovy
+++ b/regression-test/suites/schema_change_p2/test_schema_change.groovy
@@ -83,7 +83,7 @@ suite("test_schema_change") {
 
     waitBrokerLoadJob(loadLabel)
     sql "sync"
-    rowCount = sql "select count(*) from ${tableName}"
+    def rowCount = sql "select count(*) from ${tableName}"
     logger.info("rowCount:{}", rowCount)
     assertEquals(rowCount[0][0], 15000000)
 
diff --git a/regression-test/suites/ssb_sf0.1_p1/load.groovy b/regression-test/suites/ssb_sf0.1_p1/load.groovy
index 3b3955dc3ac7e6..240bd8a1396ed0 100644
--- a/regression-test/suites/ssb_sf0.1_p1/load.groovy
+++ b/regression-test/suites/ssb_sf0.1_p1/load.groovy
@@ -89,7 +89,7 @@ suite("load") {
         sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
         sql "set insert_timeout=3600"
         def r = sql "select @@insert_timeout"
-        year_cons = [
+        def year_cons = [
             'lo_orderdate<19930101',
             'lo_orderdate>=19930101 and lo_orderdate<19940101',
             'lo_orderdate>=19940101 and lo_orderdate<19950101',
diff --git a/regression-test/suites/ssb_sf100_p2/load.groovy b/regression-test/suites/ssb_sf100_p2/load.groovy
index e121a6fa17d6ad..b277d13c2f9078 100644
--- a/regression-test/suites/ssb_sf100_p2/load.groovy
+++ b/regression-test/suites/ssb_sf100_p2/load.groovy
@@ -81,7 +81,7 @@ suite('load') {
         sql "sync"
         def r = sql "select @@insert_timeout"
         assertEquals(3600, r[0][0])
-        year_cons = [
+        def year_cons = [
             'lo_orderdate<19930101',
             'lo_orderdate>=19930101 and lo_orderdate<19940101',
             'lo_orderdate>=19940101 and lo_orderdate<19950101',
diff --git a/regression-test/suites/ssb_sf1_p2/load.groovy b/regression-test/suites/ssb_sf1_p2/load.groovy
index 383844e120c729..694f22c5b652c3 100644
--- a/regression-test/suites/ssb_sf1_p2/load.groovy
+++ b/regression-test/suites/ssb_sf1_p2/load.groovy
@@ -92,7 +92,7 @@ suite("load") {
         sql "set insert_timeout=3600"
         def r = sql "select @@insert_timeout"
         assertEquals(3600, r[0][0])
-        year_cons = [
+        def year_cons = [
             'lo_orderdate<19930101',
             'lo_orderdate>=19930101 and lo_orderdate<19940101',
             'lo_orderdate>=19940101 and lo_orderdate<19950101',
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy
index a24de2297df6c4..6e495a15b574f0 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy
@@ -38,6 +38,6 @@ suite("ssb_sf1_q1_1_nereids") {
         AND lo_quantity < 25;
         """
 
-        resultFile(file = "../sql/q1.1.out", tag = "q1.1")
+        resultFile("../sql/q1.1.out", "q1.1")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy
index ca73f3a4e4ca4f..fa4e1ce3017209 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy
@@ -39,6 +39,6 @@ suite("ssb_sf1_q1_2_nereids") {
         AND lo_discount BETWEEN 4 AND 6
         AND lo_quantity BETWEEN 26 AND 35;"""
 
-        resultFile(file = "../sql/q1.2.out", tag = "q1.2")
+        resultFile("../sql/q1.2.out", "q1.2")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy
index b0af2bed32988b..aa11b87851f984 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy
@@ -40,6 +40,6 @@ suite("ssb_sf1_q1_3_nereids") {
         AND lo_quantity BETWEEN  26 AND 35;
         """
 
-        resultFile(file = "../sql/q1.3.out", tag = "q1.3")
+        resultFile("../sql/q1.3.out", "q1.3")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy
index dd76b45cb8110b..b58a18fa2ad543 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy
@@ -41,6 +41,6 @@ suite("ssb_sf1_q2_1_nereids") {
         ORDER BY d_year, p_brand;
         """
 
-        resultFile(file = "../sql/q2.1.out", tag = "q2.1")
+        resultFile("../sql/q2.1.out", "q2.1")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy
index 712744acb67b69..d74b567899af60 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy
@@ -42,6 +42,6 @@ suite("ssb_sf1_q2_2_nereids") {
         ORDER BY d_year, p_brand;
         """
 
-        resultFile(file = "../sql/q2.2.out", tag = "q2.2")
+        resultFile("../sql/q2.2.out", "q2.2")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy
index e72a28730f83b7..75ab8fb9c9217c 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy
@@ -40,6 +40,6 @@ suite("ssb_sf1_q2_3_nereids") {
         ORDER BY d_year, p_brand;
         """
 
-        resultFile(file = "../sql/q2.3.out", tag = "q2.3")
+        resultFile("../sql/q2.3.out", "q2.3")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy
index a9ec4fa77e0bf8..7e796db9209af8 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy
@@ -41,6 +41,6 @@ suite("ssb_sf1_q3_1_nereids") {
         GROUP BY c_nation, s_nation, d_year
         ORDER BY d_year ASC,  REVENUE DESC;"""
 
-        resultFile(file = "../sql/q3.1.out", tag = "q3.1")
+        resultFile("../sql/q3.1.out", "q3.1")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy
index 34687e3bbbff89..4211608dbe83a5 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy
@@ -42,6 +42,6 @@ suite("ssb_sf1_q3_2_nereids") {
         ORDER BY d_year ASC,  REVENUE DESC;
         """
 
-        resultFile(file = "../sql/q3.2.out", tag = "q3.2")
+        resultFile("../sql/q3.2.out", "q3.2")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy
index b7edd51750fa23..89f726676d2bfd 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy
@@ -43,6 +43,6 @@ suite("ssb_sf1_q3_3_nereids") {
         GROUP BY c_city, s_city, d_year
         ORDER BY d_year ASC,  REVENUE DESC;"""
 
-        resultFile(file = "../sql/q3.3.out", tag = "q3.3")
+        resultFile("../sql/q3.3.out", "q3.3")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy
index dd685db92edbb1..371c472255f734 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy
@@ -43,6 +43,6 @@ suite("ssb_sf1_q3_4_nereids") {
         GROUP BY c_city, s_city, d_year
         ORDER BY d_year ASC,  REVENUE DESC;"""
 
-        resultFile(file = "../sql/q3.4.out", tag = "q3.4")
+        resultFile("../sql/q3.4.out", "q3.4")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy
index e88cba1a35d838..2e32b89e905131 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy
@@ -45,6 +45,6 @@ suite("ssb_sf1_q4_1_nereids") {
         ORDER BY d_year, c_nation;
         """
 
-        resultFile(file = "../sql/q4.1.out", tag = "q4.1")
+        resultFile("../sql/q4.1.out", "q4.1")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy
index d4cc3c96c03b7d..20a50b51957647 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy
@@ -44,6 +44,6 @@ suite("ssb_sf1_q4_2_nereids") {
         GROUP BY d_year, s_nation, p_category
         ORDER BY d_year, s_nation, p_category;"""
 
-        resultFile(file = "../sql/q4.2.out", tag = "q4.2")
+        resultFile("../sql/q4.2.out", "q4.2")
     }
 }
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy b/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy
index e01a5090a27ea3..b0af8df5cceb1f 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy
@@ -42,6 +42,6 @@ suite("ssb_sf1_q4_3_nereids") {
         GROUP BY d_year, s_city, p_brand
         ORDER BY d_year, s_city, p_brand;"""
 
-        resultFile(file = "../sql/q4.3.out", tag = "q4.3")
+        resultFile("../sql/q4.3.out", "q4.3")
     }
 }
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/query46.groovy b/regression-test/suites/tpcds_sf1_unique_p1/query46.groovy
index f5a6a40d5a8c06..bf10aa365448aa 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/query46.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/query46.groovy
@@ -26,7 +26,7 @@ suite("tpcds_sf1_unique_p1_q46") {
     logger.info("${stats}")
     stats = sql "show column stats  customer_address"
     logger.info("${stats}")
-    ds46 = """
+    def ds46 = """
         SELECT
         c_last_name
         , c_first_name
diff --git a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy
index f75d7710bf71fd..0f0b9d3080138e 100644
--- a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy
+++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy
@@ -69,7 +69,7 @@ suite("load_four_step") {
                 }
                 sleep(5000)
             }
-            rowCount = sql "select count(*) from ${tableName}"
+            def rowCount = sql "select count(*) from ${tableName}"
             assertEquals(rows[1], rowCount[0][0])
         }
 
diff --git a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/one/load_one_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/one/load_one_step.groovy
index 1035fe2865af2a..9cd7322fad960c 100644
--- a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/one/load_one_step.groovy
+++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/one/load_one_step.groovy
@@ -63,7 +63,7 @@ suite("load_one_step") {
             }
             sleep(5000)
         }
-        rowCount = sql "select count(*) from ${tableName}"
+        def rowCount = sql "select count(*) from ${tableName}"
         assertEquals(rows[1], rowCount[0][0])
     }
 }
diff --git a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy
index a3553068e7650d..5fdea14054c34f 100644
--- a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy
+++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy
@@ -66,7 +66,7 @@ suite("load_three_step") {
                 }
                 sleep(5000)
             }
-            rowCount = sql "select count(*) from ${tableName}"
+            def rowCount = sql "select count(*) from ${tableName}"
             assertEquals(rows[1], rowCount[0][0])
         }
 
diff --git a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/two/load_two_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/two/load_two_step.groovy
index 1077d2977fffcf..b07c5434474ccd 100644
--- a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/two/load_two_step.groovy
+++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/two/load_two_step.groovy
@@ -63,7 +63,7 @@ suite("load_two_step") {
             }
             sleep(5000)
         }
-        rowCount = sql "select count(*) from ${tableName}"
+        def rowCount = sql "select count(*) from ${tableName}"
         assertEquals(rows[1], rowCount[0][0])
 
         // step 2: delete all data
diff --git a/regression-test/suites/variant_log_data_p2/load.groovy b/regression-test/suites/variant_log_data_p2/load.groovy
index cbb45c46e21362..5c0370fd447ff6 100644
--- a/regression-test/suites/variant_log_data_p2/load.groovy
+++ b/regression-test/suites/variant_log_data_p2/load.groovy
@@ -68,7 +68,7 @@ suite("regression_test_variant_logdata", "nonConcurrent,p2"){
         """
     }
     // 12. streamload remote file
-    table_name = "logdata"
+    def table_name = "logdata"
     create_table.call(table_name, "DUPLICATE", "4")
     // sql "set enable_two_phase_read_opt = false;"
     // no sparse columns