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

Do not hardcode MDBCI box for Clustrix

Browse Source
This commit is contained in:
Timofey Turenko
2020-10-19 14:30:41 +03:00
parent 2da2952168
commit 49b2471cbb
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2264,7 +2264,8 @@ int TestConnections::call_mdbci(const char* options)
int TestConnections::process_mdbci_template() int TestConnections::process_mdbci_template()
{ {
string box = envvar_get_set("box", "centos_7_libvirt"); string box = envvar_get_set("box", "centos_7_libvirt");
envvar_get_set("backend_box", "%s", box.c_str()); string backend_box = envvar_get_set("backend_box", "%s", box.c_str());
envvar_get_set("clustrix_box", "%s", backend_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");

2
system-test/mdbci/run_test_vm.sh
View File

@ -60,6 +60,8 @@ test_env_list=(
"name" "name"
"target" "target"
"box" "box"
"backend_box"
"clustrix_box"
"product" "product"
"version" "version"
"do_not_destroy_vm" "do_not_destroy_vm"

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

@ -359,7 +359,7 @@
"clustrix_000" : "clustrix_000" :
{ {
"hostname" : "clustrix000", "hostname" : "clustrix000",
"box" : "centos_7_gcp", "box" : "${clustrix_box}",
"memory_size" : "16192", "memory_size" : "16192",
"labels" : [ "labels" : [
"CLUSTRIX_BACKEND" "CLUSTRIX_BACKEND"
@ -369,7 +369,7 @@
"clustrix_001" : "clustrix_001" :
{ {
"hostname" : "clustrix001", "hostname" : "clustrix001",
"box" : "centos_7_gcp", "box" : "${clustrix_box}",
"memory_size" : "16192", "memory_size" : "16192",
"labels" : [ "labels" : [
"CLUSTRIX_BACKEND" "CLUSTRIX_BACKEND"
@ -379,7 +379,7 @@
"clustrix_002" : "clustrix_002" :
{ {
"hostname" : "clustrix002", "hostname" : "clustrix002",
"box" : "centos_7_gcp", "box" : "${clustrix_box}",
"memory_size" : "16192", "memory_size" : "16192",
"labels" : [ "labels" : [
"CLUSTRIX_BACKEND" "CLUSTRIX_BACKEND"
@ -390,7 +390,7 @@
{ {
"hostname" : "clustrix003", "hostname" : "clustrix003",
"memory_size" : "16192", "memory_size" : "16192",
"box" : "centos_7_gcp", "box" : "${clustrix_box}",
"labels" : [ "labels" : [
"CLUSTRIX_BACKEND" "CLUSTRIX_BACKEND"
] ]