add comment
This commit is contained in:
parent
22a112e137
commit
5ef953fb4a
@ -144,6 +144,12 @@ public:
|
||||
*/
|
||||
bool binlog_slave_gtid {false};
|
||||
|
||||
/**
|
||||
* @brief maxscale_product 'maxscale' - use production version of Maxscale,
|
||||
* 'maxscale_ci' - CI
|
||||
*/
|
||||
char * maxscale_product;
|
||||
|
||||
/**
|
||||
* @brief timeout seconds until test termination
|
||||
*/
|
||||
|
@ -664,6 +664,7 @@ void TestConnections::read_env()
|
||||
"revert_snapshot_command", "mdbci snapshot revert --path-to-nodes %s --snapshot-name ",
|
||||
m_mdbci_config_name.c_str());
|
||||
no_vm_revert = readenv_bool("no_vm_revert", true);
|
||||
maxscale_product = readenv("maxscale_product", "maxscale_ci");
|
||||
}
|
||||
|
||||
void TestConnections::print_env()
|
||||
@ -808,6 +809,9 @@ void TestConnections::process_template(int m, const string& cnf_template_path, c
|
||||
sprintf(str, "sed -i \"s|###access_homedir###|%s|g\" maxscale.cnf", maxscales->access_homedir[m]);
|
||||
system(str);
|
||||
|
||||
sprintf(str, "sed -i \"s|###maxscale_product###|%s|g\" maxscale.cnf", maxscale_product);
|
||||
system(str);
|
||||
|
||||
if (repl && repl->v51)
|
||||
{
|
||||
system("sed -i \"s/###repl51###/mysql51_replication=true/g\" maxscale.cnf");
|
||||
|
@ -53,6 +53,7 @@ export mdbci_config_name=`echo ${mdbci_config_name} | sed "s/?//g"`
|
||||
|
||||
export provider=`mdbci show provider $box --silent 2> /dev/null`
|
||||
export backend_box=${backend_box:-"centos_7_"$provider}
|
||||
export backend_box=${maxscale_product:-"maxscale_ci"}
|
||||
|
||||
mdbci destroy --force ${mdbci_config_name}
|
||||
|
||||
|
@ -75,6 +75,7 @@ test_env_list=(
|
||||
"test_branch"
|
||||
"use_valgrind"
|
||||
"use_callgrind"
|
||||
"maxscale_product"
|
||||
)
|
||||
|
||||
for s in ${test_env_list[@]} ; do
|
||||
|
@ -354,7 +354,7 @@
|
||||
"MAXSCALE"
|
||||
],
|
||||
"product" : {
|
||||
"name" : "maxscale_ci",
|
||||
"name" : "###maxscale_product###",
|
||||
"version" : "${target}"
|
||||
}
|
||||
|
||||
@ -370,7 +370,7 @@
|
||||
"SECOND_MAXSCALE"
|
||||
],
|
||||
"product" : {
|
||||
"name" : "maxscale_ci",
|
||||
"name" : "###maxscale_product###",
|
||||
"version" : "${target}"
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user