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.

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

[regression](framework) add config caseNamePrefix (#32266) #32462

Merged
merged 1 commit into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand All @@ -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),
Expand Down Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -418,6 +426,7 @@ class ConfigOptions {
.addOption(stopWhenFailOpt)
.addOption(timesOpt)
.addOption(withOutLoadDataOpt)
.addOption(caseNamePrefixOpt)
.addOption(dryRunOpt)

CommandLine cmd = new DefaultParser().parse(options, args, true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
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