Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[regression](framework) add new config caseNamePrefix #32229

Merged
merged 1 commit into from
Mar 14, 2024
Merged

[regression](framework) add new config caseNamePrefix #32229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class Config {
public Integer actionParallel
public Integer times
public boolean withOutLoadData
public String caseNamePrefix
public boolean isSmokeTest
public String multiClusterBes
public String metaServiceToken
Expand All @@ -133,6 +134,7 @@ class Config {
Config() {}

Config(
String caseNamePrefix,
String defaultDb,
String jdbcUrl,
String jdbcUser,
Expand Down Expand Up @@ -184,6 +186,7 @@ class Config {
String clusterDir,
String kafkaBrokerList,
String cloudVersion) {
this.caseNamePrefix = caseNamePrefix
this.defaultDb = defaultDb
this.jdbcUrl = jdbcUrl
this.jdbcUser = jdbcUser
Expand Down Expand Up @@ -439,12 +442,14 @@ 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)
config.isSmokeTest = cmd.hasOption(isSmokeTestOpt)

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")
Expand All @@ -458,6 +463,7 @@ class Config {

static Config fromConfigObject(ConfigObject obj) {
def config = new Config(
configToString(obj.caseNamePrefix),
configToString(obj.defaultDb),
configToString(obj.jdbcUrl),
configToString(obj.jdbcUser),
Expand Down Expand Up @@ -576,6 +582,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())
Expand Down
9 changes: 9 additions & 0 deletions regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class ConfigOptions {
static Option stopWhenFailOpt
static Option timesOpt
static Option withOutLoadDataOpt
static Option caseNamePrefixOpt
static Option dryRunOpt
static Option isSmokeTestOpt
static Option multiClusterBesOpt
Expand Down Expand Up @@ -450,6 +451,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)
Expand Down Expand Up @@ -596,6 +604,7 @@ class ConfigOptions {
.addOption(stopWhenFailOpt)
.addOption(timesOpt)
.addOption(withOutLoadDataOpt)
.addOption(caseNamePrefixOpt)
.addOption(dryRunOpt)
.addOption(isSmokeTestOpt)
.addOption(multiClusterBesOpt)
Expand Down
4 changes: 4 additions & 0 deletions regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ class RegressionTest {
TeamcityUtils.postfix = i.toString()
}

if (config.caseNamePrefix) {
TeamcityUtils.prefix = config.caseNamePrefix.toString()
}

Recorder recorder = runScripts(config)
success = (success && printResult(config, recorder))

Expand Down
11 changes: 7 additions & 4 deletions ...sion-test/framework/src/main/groovy/org/apache/doris/regression/util/TeamcityUtils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading