hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix default.json template

Browse Source
This commit is contained in:
Timofey Turenko
2020-12-21 13:41:09 +02:00
parent 5ef953fb4a
commit 601eadac8b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system-test/maxtest/src/testconnections.cc
View File

@ -809,9 +809,6 @@ 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]); sprintf(str, "sed -i \"s|###access_homedir###|%s|g\" maxscale.cnf", maxscales->access_homedir[m]);
system(str); system(str);
sprintf(str, "sed -i \"s|###maxscale_product###|%s|g\" maxscale.cnf", maxscale_product);
system(str);
if (repl && repl->v51) if (repl && repl->v51)
{ {
system("sed -i \"s/###repl51###/mysql51_replication=true/g\" maxscale.cnf"); system("sed -i \"s/###repl51###/mysql51_replication=true/g\" maxscale.cnf");
@ -2235,6 +2232,7 @@ int TestConnections::process_mdbci_template()
envvar_get_set("backend_box", "%s", box.c_str()); envvar_get_set("backend_box", "%s", box.c_str());
envvar_get_set("target", "develop"); envvar_get_set("target", "develop");
envvar_get_set("vm_memory", "2048"); envvar_get_set("vm_memory", "2048");
envvar_get_set("maxscale_product", "maxscale_ci");
string version = envvar_get_set("version", "10.3"); string version = envvar_get_set("version", "10.3");
envvar_get_set("galera_version", "%s", version.c_str()); envvar_get_set("galera_version", "%s", version.c_str());

4
system-test/mdbci/templates/default.json.template
View File

@ -354,7 +354,7 @@
"MAXSCALE" "MAXSCALE"
], ],
"product" : { "product" : {
"name" : "###maxscale_product###", "name" : "${maxscale_product}",
"version" : "${target}" "version" : "${target}"
} }
@ -370,7 +370,7 @@
"SECOND_MAXSCALE" "SECOND_MAXSCALE"
], ],
"product" : { "product" : {
"name" : "###maxscale_product###", "name" : "${maxscale_product}",
"version" : "${target}" "version" : "${target}"
} }