This is an automated email from the ASF dual-hosted git repository.

mrhhsg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 393ff5d9bba [regression-test](framework) fix trino connector download 
bug in multi be (#34806)
393ff5d9bba is described below

commit 393ff5d9bbaf8ee59945e599291f2c98088d5a72
Author: shuke <37901441+shuke...@users.noreply.github.com>
AuthorDate: Wed May 15 09:00:57 2024 +0800

    [regression-test](framework) fix trino connector download bug in multi be 
(#34806)
---
 .../org/apache/doris/regression/suite/Suite.groovy     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
 
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
index 3b962dba7c6..616961107cb 100644
--- 
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
+++ 
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -799,14 +799,6 @@ class Suite implements GroovyInterceptable {
         def path_connector_tmp = "${dir_connector_tmp}/connectors"
         def path_connector = "${dir_download}/connectors"
 
-        def cmds = [] as List
-        cmds.add("mkdir -p ${dir_download}")
-        cmds.add("rm -rf ${path_tar}")
-        cmds.add("rm -rf ${dir_connector_tmp}")
-        cmds.add("mkdir -p ${dir_connector_tmp}")
-        cmds.add("/usr/bin/curl --max-time 600 ${url} --output ${path_tar}")
-        cmds.add("tar -zxvf ${path_tar} -C ${dir_connector_tmp}")
-
         def executeCommand = { String cmd, Boolean mustSuc ->
             try {
                 staticLogger.info("execute ${cmd}")
@@ -822,13 +814,17 @@ class Suite implements GroovyInterceptable {
             }
         }
 
-        for (def cmd in cmds) {
-            executeCommand(cmd, true)
-        }
+        executeCommand("mkdir -p ${dir_download}", false)
+        executeCommand("rm -rf ${path_tar}", false)
+        executeCommand("rm -rf ${dir_connector_tmp}", false)
+        executeCommand("mkdir -p ${dir_connector_tmp}", false)
+        executeCommand("/usr/bin/curl --max-time 600 ${url} --output 
${path_tar}", true)
+        executeCommand("tar -zxvf ${path_tar} -C ${dir_connector_tmp}", true)
 
         host_ips = host_ips.unique()
         for (def ip in host_ips) {
             staticLogger.info("scp to ${ip}")
+            executeCommand("ssh -o StrictHostKeyChecking=no root@${ip} \"mkdir 
-p ${dir_download}\"", false)
             executeCommand("ssh -o StrictHostKeyChecking=no root@${ip} \"rm 
-rf ${path_connector}\"", false)
             scpFiles("root", ip, path_connector_tmp, path_connector, false) // 
if failed, assertTrue(false) is executed.
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to