From 601eadac8b770d89c694b2e5e8c801a63ee41fb5 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Mon, 21 Dec 2020 13:41:09 +0200 Subject: [PATCH] Fix default.json template --- system-test/maxtest/src/testconnections.cc | 4 +--- system-test/mdbci/templates/default.json.template | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc index d3a90c15d..f6d3f0e9b 100644 --- a/system-test/maxtest/src/testconnections.cc +++ b/system-test/maxtest/src/testconnections.cc @@ -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]); 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"); @@ -2235,6 +2232,7 @@ int TestConnections::process_mdbci_template() envvar_get_set("backend_box", "%s", box.c_str()); envvar_get_set("target", "develop"); envvar_get_set("vm_memory", "2048"); + envvar_get_set("maxscale_product", "maxscale_ci"); string version = envvar_get_set("version", "10.3"); envvar_get_set("galera_version", "%s", version.c_str()); diff --git a/system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template index 87ce7bc0d..3025caded 100644 --- a/system-test/mdbci/templates/default.json.template +++ b/system-test/mdbci/templates/default.json.template @@ -354,7 +354,7 @@ "MAXSCALE" ], "product" : { - "name" : "###maxscale_product###", + "name" : "${maxscale_product}", "version" : "${target}" } @@ -370,7 +370,7 @@ "SECOND_MAXSCALE" ], "product" : { - "name" : "###maxscale_product###", + "name" : "${maxscale_product}", "version" : "${target}" }