This is an automated email from the ASF dual-hosted git repository.
hellostephen 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 398a96c28e1 [fix](case) adjust ak sk for multi cloud test case
(#38749) (#39071)
398a96c28e1 is described below
commit 398a96c28e189298f24550d53f4a33e96977d458
Author: Dongyang Li <[email protected]>
AuthorDate: Thu Aug 8 16:36:42 2024 +0800
[fix](case) adjust ak sk for multi cloud test case (#38749) (#39071)
pick from master #38749
Co-authored-by: stephen <[email protected]>
---
regression-test/conf/regression-conf.groovy | 2 ++
.../pipeline/external/conf/regression-conf.groovy | 6 ++++++
.../paimon/paimon_base_filesystem.groovy | 22 ++++++++++------------
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/regression-test/conf/regression-conf.groovy
b/regression-test/conf/regression-conf.groovy
index 08d03632c37..639d8e658bb 100644
--- a/regression-test/conf/regression-conf.groovy
+++ b/regression-test/conf/regression-conf.groovy
@@ -201,6 +201,8 @@ dlfUid="***********"
aliYunSk="***********"
hwYunAk="***********"
hwYunSk="***********"
+txYunAk="***********"
+txYunSk="***********"
//arrow flight sql test config
extArrowFlightSqlHost = "127.0.0.1"
diff --git a/regression-test/pipeline/external/conf/regression-conf.groovy
b/regression-test/pipeline/external/conf/regression-conf.groovy
index 93965b84219..d57a6483270 100644
--- a/regression-test/pipeline/external/conf/regression-conf.groovy
+++ b/regression-test/pipeline/external/conf/regression-conf.groovy
@@ -140,6 +140,12 @@ cacheDataPath = "/data/regression/"
s3Source="aliyun"
+// for multi cloud test case, eg. paimon_base_filesystem
+aliYunAk="***********"
+aliYunSk="***********"
+txYunAk="***********"
+txYunSk="***********"
+
max_failure_num=50
externalEnvIp="127.0.0.1"
diff --git
a/regression-test/suites/external_table_p0/paimon/paimon_base_filesystem.groovy
b/regression-test/suites/external_table_p0/paimon/paimon_base_filesystem.groovy
index 0e00cd8fb7a..e4adec6b7ab 100644
---
a/regression-test/suites/external_table_p0/paimon/paimon_base_filesystem.groovy
+++
b/regression-test/suites/external_table_p0/paimon/paimon_base_filesystem.groovy
@@ -24,12 +24,10 @@ suite("paimon_base_filesystem",
"p0,external,doris,external_docker,external_dock
try {
String catalog_cos = "paimon_base_filesystem_paimon_cos"
String catalog_oss = "paimon_base_filesystem_paimon_oss"
- String ak = context.config.otherConfigs.get("aliYunAk")
- String sk = context.config.otherConfigs.get("aliYunSk")
-
- String s3ak = getS3AK()
- String s3sk = getS3SK()
- def s3Endpoint = getS3Endpoint()
+ String aliYunAk = context.config.otherConfigs.get("aliYunAk")
+ String aliYunSk = context.config.otherConfigs.get("aliYunSk")
+ String txYunAk = context.config.otherConfigs.get("txYunAk")
+ String txYunSk = context.config.otherConfigs.get("txYunSk")
def cos = """select
c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c18 from
${catalog_cos}.zd.all_table order by c18"""
def oss = """select * from ${catalog_oss}.paimonossdb1.test_tableoss
order by a"""
@@ -39,18 +37,18 @@ suite("paimon_base_filesystem",
"p0,external,doris,external_docker,external_dock
sql """
create catalog if not exists ${catalog_cos} properties (
"type" = "paimon",
- "warehouse" = "cosn://paimon-1308700295/paimoncos",
- "cos.access_key" = "${s3ak}",
- "cos.secret_key" = "${s3sk}",
+ "warehouse" =
"cosn://doris-build-1308700295/regression/paimoncos",
+ "cos.access_key" = "${txYunAk}",
+ "cos.secret_key" = "${txYunSk}",
"cos.endpoint" = "cos.ap-beijing.myqcloud.com"
);
"""
sql """
create catalog if not exists ${catalog_oss} properties (
"type" = "paimon",
- "warehouse" = "oss://paimon-zd/paimonoss",
- "oss.access_key"="${ak}",
- "oss.secret_key"="${sk}",
+ "warehouse" = "oss://doris-regression-bj/regression/paimonoss",
+ "oss.access_key"="${aliYunAk}",
+ "oss.secret_key"="${aliYunSk}",
"oss.endpoint"="oss-cn-beijing.aliyuncs.com"
);
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
