From 49b2471cbbbc6116b04331c7e21241d74b8ca12e Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Mon, 19 Oct 2020 14:30:41 +0300
Subject: [PATCH] Do not hardcode MDBCI box for Clustrix

---
 system-test/maxtest/src/testconnections.cc        | 3 ++-
 system-test/mdbci/run_test_vm.sh                  | 2 ++
 system-test/mdbci/templates/default.json.template | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc
index 100f07a28..f1f4a9e7b 100644
--- a/system-test/maxtest/src/testconnections.cc
+++ b/system-test/maxtest/src/testconnections.cc
@@ -2264,7 +2264,8 @@ int TestConnections::call_mdbci(const char* options)
 int TestConnections::process_mdbci_template()
 {
     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("vm_memory", "2048");
 
diff --git a/system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh
index b3c52fec9..56e1bf0c7 100755
--- a/system-test/mdbci/run_test_vm.sh
+++ b/system-test/mdbci/run_test_vm.sh
@@ -60,6 +60,8 @@ test_env_list=(
     "name"
     "target"
     "box"
+    "backend_box"
+    "clustrix_box"
     "product"
     "version"
     "do_not_destroy_vm"
diff --git a/system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template
index 10638b25f..d2d4b98a5 100644
--- a/system-test/mdbci/templates/default.json.template
+++ b/system-test/mdbci/templates/default.json.template
@@ -359,7 +359,7 @@
   "clustrix_000" :
   {
         "hostname" : "clustrix000",
-        "box" : "centos_7_gcp",
+        "box" : "${clustrix_box}",
         "memory_size" : "16192",
         "labels" : [
                 "CLUSTRIX_BACKEND"
@@ -369,7 +369,7 @@
   "clustrix_001" :
   {
         "hostname" : "clustrix001",
-        "box" : "centos_7_gcp",
+        "box" : "${clustrix_box}",
         "memory_size" : "16192",
         "labels" : [
                 "CLUSTRIX_BACKEND"
@@ -379,7 +379,7 @@
   "clustrix_002" :
   {
         "hostname" : "clustrix002",
-        "box" : "centos_7_gcp",
+        "box" : "${clustrix_box}",
         "memory_size" : "16192",
         "labels" : [
                 "CLUSTRIX_BACKEND"
@@ -390,7 +390,7 @@
   {
         "hostname" : "clustrix003",
         "memory_size" : "16192",
-        "box" : "centos_7_gcp",
+        "box" : "${clustrix_box}",
         "labels" : [
                 "CLUSTRIX_BACKEND"
         ]