This is an automated email from the ASF dual-hosted git repository.
zhangstar333 pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 1ff92caa42a [regression](framework) add config caseNamePrefix (#32266)
(#32462)
1ff92caa42a is described below
commit 1ff92caa42a4c5dd31064a6877f94d685120a417
Author: Dongyang Li <[email protected]>
AuthorDate: Tue Mar 19 17:04:02 2024 +0800
[regression](framework) add config caseNamePrefix (#32266) (#32462)
---
.../main/groovy/org/apache/doris/regression/Config.groovy | 12 +++++++++++-
.../groovy/org/apache/doris/regression/ConfigOptions.groovy | 9 +++++++++
.../groovy/org/apache/doris/regression/RegressionTest.groovy | 4 ++++
.../org/apache/doris/regression/util/TeamcityUtils.groovy | 11 +++++++----
4 files changed, 31 insertions(+), 5 deletions(-)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
index 8fcba76f0f7..4fc3705a09e 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
@@ -97,15 +97,17 @@ class Config {
public Integer actionParallel
public Integer times
public boolean withOutLoadData
+ public String caseNamePrefix
Config() {}
- Config(String defaultDb, String jdbcUrl, String jdbcUser, String
jdbcPassword,
+ Config(String caseNamePrefix, String defaultDb, String jdbcUrl, String
jdbcUser, String jdbcPassword,
String feSourceThriftAddress, String feTargetThriftAddress, String
feSyncerUser, String feSyncerPassword,
String syncerPassword, String feHttpAddress, String feHttpUser,
String feHttpPassword, String metaServiceHttpAddress,
String suitePath, String dataPath, String realDataPath, String
cacheDataPath, Boolean enableCacheData,
String testGroups, String excludeGroups, String testSuites, String
excludeSuites,
String testDirectories, String excludeDirectories, String
pluginPath, String sslCertificatePath) {
+ this.caseNamePrefix = caseNamePrefix
this.defaultDb = defaultDb
this.jdbcUrl = jdbcUrl
this.jdbcUser = jdbcUser
@@ -263,11 +265,13 @@ class Config {
config.randomOrder = cmd.hasOption(randomOrderOpt)
config.stopWhenFail = cmd.hasOption(stopWhenFailOpt)
config.withOutLoadData = cmd.hasOption(withOutLoadDataOpt)
+ config.caseNamePrefix = cmd.getOptionValue(caseNamePrefixOpt,
config.caseNamePrefix)
config.dryRun = cmd.hasOption(dryRunOpt)
log.info("randomOrder is ${config.randomOrder}".toString())
log.info("stopWhenFail is ${config.stopWhenFail}".toString())
log.info("withOutLoadData is ${config.withOutLoadData}".toString())
+ log.info("caseNamePrefix is ${config.caseNamePrefix}".toString())
log.info("dryRun is ${config.dryRun}".toString())
Properties props = cmd.getOptionProperties("conf")
@@ -281,6 +285,7 @@ class Config {
static Config fromConfigObject(ConfigObject obj) {
def config = new Config(
+ configToString(obj.caseNamePrefix),
configToString(obj.defaultDb),
configToString(obj.jdbcUrl),
configToString(obj.jdbcUser),
@@ -327,6 +332,11 @@ class Config {
}
static void fillDefaultConfig(Config config) {
+ if (config.caseNamePrefix == null) {
+ config.caseNamePrefix = ""
+ log.info("set caseNamePrefix to '' because not
specify.".toString())
+ }
+
if (config.defaultDb == null) {
config.defaultDb = "regression_test"
log.info("Set defaultDb to '${config.defaultDb}' because not
specify.".toString())
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
index 7ad0720bd18..0a0757a99fc 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
@@ -65,6 +65,7 @@ class ConfigOptions {
static Option stopWhenFailOpt
static Option timesOpt
static Option withOutLoadDataOpt
+ static Option caseNamePrefixOpt
static Option dryRunOpt
static CommandLine initCommands(String[] args) {
@@ -376,6 +377,13 @@ class ConfigOptions {
.longOpt("withOutLoadData")
.desc("do not run load.groovy to reload data to Doris.")
.build()
+ caseNamePrefixOpt = Option.builder("cnp")
+ .required(false)
+ .hasArg(true)
+ .type(String.class)
+ .longOpt("caseNamePrefix")
+ .desc("add prefix to each case name")
+ .build()
dryRunOpt = Option.builder("dryRun")
.required(false)
.hasArg(false)
@@ -418,6 +426,7 @@ class ConfigOptions {
.addOption(stopWhenFailOpt)
.addOption(timesOpt)
.addOption(withOutLoadDataOpt)
+ .addOption(caseNamePrefixOpt)
.addOption(dryRunOpt)
CommandLine cmd = new DefaultParser().parse(options, args, true)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
index 36850b8ab10..78b9ab1bfc4 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
@@ -78,6 +78,10 @@ class RegressionTest {
TeamcityUtils.postfix = i.toString()
}
+ if (config.caseNamePrefix) {
+ TeamcityUtils.prefix = config.caseNamePrefix.toString()
+ }
+
Recorder recorder = runScripts(config)
success = (success && printResult(config, recorder))
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/TeamcityUtils.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/TeamcityUtils.groovy
index 61e6ff2eed3..fae3cdad846 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/TeamcityUtils.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/util/TeamcityUtils.groovy
@@ -25,13 +25,16 @@ import org.apache.tools.ant.util.DateUtils
@CompileStatic
class TeamcityUtils {
static String postfix = ""
+ static String prefix = ""
static String getSuiteName(String name) {
- if (postfix == "") {
- return name
- } else {
- return name+"-"+postfix
+ if (prefix != "") {
+ name = prefix + "-" + name
}
+ if (postfix != "") {
+ name = name + "-" + postfix
+ }
+ return name
}
static String formatNow() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
