From a991348d0259f4434edbb5ed322dd84045d9b013 Mon Sep 17 00:00:00 2001 From: stephen Date: Fri, 2 Aug 2024 11:18:43 +0800 Subject: [PATCH 1/3] [fix](case) adjust ak sk for multi cloud test case --- regression-test/conf/regression-conf.groovy | 2 ++ .../external/conf/regression-conf.groovy | 6 ++++++ .../paimon/paimon_base_filesystem.groovy | 18 ++++++++---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/regression-test/conf/regression-conf.groovy b/regression-test/conf/regression-conf.groovy index d4591bf1782c76..29b90f037239b9 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 31e2c2629ce756..f6ea31dffaa336 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 0e00cd8fb7a8bc..0062e6c3a59ce5 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""" @@ -40,8 +38,8 @@ suite("paimon_base_filesystem", "p0,external,doris,external_docker,external_dock create catalog if not exists ${catalog_cos} properties ( "type" = "paimon", "warehouse" = "cosn://paimon-1308700295/paimoncos", - "cos.access_key" = "${s3ak}", - "cos.secret_key" = "${s3sk}", + "cos.access_key" = "${txYunAk}", + "cos.secret_key" = "${txYunSk}", "cos.endpoint" = "cos.ap-beijing.myqcloud.com" ); """ @@ -49,8 +47,8 @@ suite("paimon_base_filesystem", "p0,external,doris,external_docker,external_dock create catalog if not exists ${catalog_oss} properties ( "type" = "paimon", "warehouse" = "oss://paimon-zd/paimonoss", - "oss.access_key"="${ak}", - "oss.secret_key"="${sk}", + "oss.access_key"="${aliYunAk}", + "oss.secret_key"="${aliYunSk}", "oss.endpoint"="oss-cn-beijing.aliyuncs.com" ); """ From 37a6a6254b5db4f9e45533949fdf3c31d464404e Mon Sep 17 00:00:00 2001 From: stephen Date: Tue, 6 Aug 2024 17:20:23 +0800 Subject: [PATCH 2/3] 2 --- .../external_table_p0/paimon/paimon_base_filesystem.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0062e6c3a59ce5..aa9bc8692b0a0f 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 @@ -37,7 +37,7 @@ 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", + "warehouse" = "cos://doris-build-1308700295/regression/paimoncos", "cos.access_key" = "${txYunAk}", "cos.secret_key" = "${txYunSk}", "cos.endpoint" = "cos.ap-beijing.myqcloud.com" @@ -46,7 +46,7 @@ suite("paimon_base_filesystem", "p0,external,doris,external_docker,external_dock sql """ create catalog if not exists ${catalog_oss} properties ( "type" = "paimon", - "warehouse" = "oss://paimon-zd/paimonoss", + "warehouse" = "oss://doris-regression-bj/regression/paimonoss", "oss.access_key"="${aliYunAk}", "oss.secret_key"="${aliYunSk}", "oss.endpoint"="oss-cn-beijing.aliyuncs.com" From a640544197d74af596b2a928676361f36adc7ab4 Mon Sep 17 00:00:00 2001 From: stephen Date: Tue, 6 Aug 2024 17:55:52 +0800 Subject: [PATCH 3/3] 2 --- .../external_table_p0/paimon/paimon_base_filesystem.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 aa9bc8692b0a0f..e4adec6b7ab7cb 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 @@ -37,7 +37,7 @@ suite("paimon_base_filesystem", "p0,external,doris,external_docker,external_dock sql """ create catalog if not exists ${catalog_cos} properties ( "type" = "paimon", - "warehouse" = "cos://doris-build-1308700295/regression/paimoncos", + "warehouse" = "cosn://doris-build-1308700295/regression/paimoncos", "cos.access_key" = "${txYunAk}", "cos.secret_key" = "${txYunSk}", "cos.endpoint" = "cos.ap-beijing.myqcloud.com"