From 5ef953fb4a8b45619b969cf8fff857fee287f886 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Mon, 21 Dec 2020 11:50:45 +0200 Subject: [PATCH 1/6] add comment --- system-test/maxtest/include/maxtest/testconnections.h | 6 ++++++ system-test/maxtest/src/testconnections.cc | 4 ++++ system-test/mdbci/run_test.sh | 1 + system-test/mdbci/run_test_vm.sh | 1 + system-test/mdbci/templates/default.json.template | 4 ++-- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/system-test/maxtest/include/maxtest/testconnections.h b/system-test/maxtest/include/maxtest/testconnections.h index 5b71a073c..ad27681d8 100644 --- a/system-test/maxtest/include/maxtest/testconnections.h +++ b/system-test/maxtest/include/maxtest/testconnections.h @@ -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 */ diff --git a/system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc index 6a2d7fe5a..d3a90c15d 100644 --- a/system-test/maxtest/src/testconnections.cc +++ b/system-test/maxtest/src/testconnections.cc @@ -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"); diff --git a/system-test/mdbci/run_test.sh b/system-test/mdbci/run_test.sh index d750d82df..b19d97332 100755 --- a/system-test/mdbci/run_test.sh +++ b/system-test/mdbci/run_test.sh @@ -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} diff --git a/system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh index 657ca8b09..e1bcabdba 100755 --- a/system-test/mdbci/run_test_vm.sh +++ b/system-test/mdbci/run_test_vm.sh @@ -75,6 +75,7 @@ test_env_list=( "test_branch" "use_valgrind" "use_callgrind" + "maxscale_product" ) for s in ${test_env_list[@]} ; do diff --git a/system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template index d0af854e6..87ce7bc0d 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_ci", + "name" : "###maxscale_product###", "version" : "${target}" } @@ -370,7 +370,7 @@ "SECOND_MAXSCALE" ], "product" : { - "name" : "maxscale_ci", + "name" : "###maxscale_product###", "version" : "${target}" } From 601eadac8b770d89c694b2e5e8c801a63ee41fb5 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Mon, 21 Dec 2020 13:41:09 +0200 Subject: [PATCH 2/6] 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}" } From be7b04f9634f4a89332378bc6439e37cad219349 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 23 Dec 2020 00:02:32 +0200 Subject: [PATCH 3/6] Find MDBCI executable file --- system-test/mdbci/mdbci_wrapper | 2 +- system-test/mdbci/run_test.sh | 1 + system-test/mdbci/run_test_vm.sh | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/system-test/mdbci/mdbci_wrapper b/system-test/mdbci/mdbci_wrapper index 05006df2d..00a455f19 100644 --- a/system-test/mdbci/mdbci_wrapper +++ b/system-test/mdbci/mdbci_wrapper @@ -4,5 +4,5 @@ export host=$user@$ip 2>&1 >/dev/null sshopt="-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=120 " rsync -avz --progress -e "ssh $sshopt" ${MDBCI_VM_PATH}/ $host:${MDBCI_VM_PATH}/ 2>&1 >/dev/null -ssh $sshopt $host "MDBCI_VM_PATH=$MDBCI_VM_PATH /home/$user/mdbci/mdbci $*" 2>/dev/null +ssh $sshopt $host "MDBCI_VM_PATH=${MDBCI_VM_PATH} ${MDBCI_EXECUTABLE} $*" 2>/dev/null rsync -avz --progress -e "ssh $sshopt" $host:${MDBCI_VM_PATH}/ ${MDBCI_VM_PATH}/ 2>&1 >/dev/null diff --git a/system-test/mdbci/run_test.sh b/system-test/mdbci/run_test.sh index b19d97332..485424ced 100755 --- a/system-test/mdbci/run_test.sh +++ b/system-test/mdbci/run_test.sh @@ -62,6 +62,7 @@ mdbci destroy --force ${mdbci_config_name} ulimit -c unlimited cd ${script_dir}/../../ +rm -rf build mkdir build && cd build cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug cd system-test diff --git a/system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh index e1bcabdba..5ade57af0 100755 --- a/system-test/mdbci/run_test_vm.sh +++ b/system-test/mdbci/run_test_vm.sh @@ -1,5 +1,7 @@ #!/bin/bash +# $HOME/.config/mdbci/max-tst.key file should contain private key to access host + # read the name of build scripts directory export script_dir="$(dirname $(readlink -f $0))" @@ -10,6 +12,7 @@ export mdbci_config_name=${name:-$box-${curr_date}} export mdbci_config_name=`echo ${mdbci_config_name} | sed "s/?//g"` export MDBCI_VM_PATH=$HOME/${mdbci_config_name}_vms export PATH=$PATH:$HOME/mdbci +export MDBCI_EXECUTABLE=`which mdbci` . ${script_dir}/set_run_test_variables.sh @@ -57,6 +60,7 @@ test_env_list=( "JOB_NAME" "BUILD_NUMBER" "BUILD_TIMESTAMP" + "MDBCI_EXECUTABLE" "name" "target" "box" From 22698ed6fb87ec012e1824d48e76bab31f89a7d5 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 23 Dec 2020 02:33:19 +0200 Subject: [PATCH 4/6] fix maxscale_product env variable --- system-test/mdbci/run_test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system-test/mdbci/run_test.sh b/system-test/mdbci/run_test.sh index 485424ced..f641a410c 100755 --- a/system-test/mdbci/run_test.sh +++ b/system-test/mdbci/run_test.sh @@ -37,6 +37,9 @@ # the value of $test_set after 'NAME#' is used as bash command # line # example: '#NAME long_test_time=3600 ./long_test' +# +# $maxscale_product - use CI or production version of Maxscale +# 'maxscale_ci' or 'maxscale' export vm_memory=${vm_memory:-"2048"} export dir=`pwd` @@ -53,7 +56,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"} +export maxscale_product=${maxscale_product:-"maxscale_ci"} mdbci destroy --force ${mdbci_config_name} From 7c68c396a2c8c2378ace33bdb539b9103e02c43a Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 23 Dec 2020 04:06:35 +0200 Subject: [PATCH 5/6] system-test works with production version of Maxscale Every change to MariaDB Enterprise should be tested with Maxscale. Maxscale should be stable - installed from production repository. New enviromental variable 'maxscale_product' is introduced. It can be 'maxscale' or 'maxscale_ci' (default is 'maxscale_ci') --- system-test/maxtest/include/maxtest/testconnections.h | 6 ++++++ system-test/maxtest/src/testconnections.cc | 2 ++ system-test/mdbci/mdbci_wrapper | 2 +- system-test/mdbci/run_test.sh | 5 +++++ system-test/mdbci/run_test_vm.sh | 5 +++++ system-test/mdbci/templates/default.json.template | 4 ++-- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/system-test/maxtest/include/maxtest/testconnections.h b/system-test/maxtest/include/maxtest/testconnections.h index 5b71a073c..ad27681d8 100644 --- a/system-test/maxtest/include/maxtest/testconnections.h +++ b/system-test/maxtest/include/maxtest/testconnections.h @@ -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 */ diff --git a/system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc index 6a2d7fe5a..f6d3f0e9b 100644 --- a/system-test/maxtest/src/testconnections.cc +++ b/system-test/maxtest/src/testconnections.cc @@ -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() @@ -2231,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/mdbci_wrapper b/system-test/mdbci/mdbci_wrapper index 05006df2d..00a455f19 100644 --- a/system-test/mdbci/mdbci_wrapper +++ b/system-test/mdbci/mdbci_wrapper @@ -4,5 +4,5 @@ export host=$user@$ip 2>&1 >/dev/null sshopt="-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=120 " rsync -avz --progress -e "ssh $sshopt" ${MDBCI_VM_PATH}/ $host:${MDBCI_VM_PATH}/ 2>&1 >/dev/null -ssh $sshopt $host "MDBCI_VM_PATH=$MDBCI_VM_PATH /home/$user/mdbci/mdbci $*" 2>/dev/null +ssh $sshopt $host "MDBCI_VM_PATH=${MDBCI_VM_PATH} ${MDBCI_EXECUTABLE} $*" 2>/dev/null rsync -avz --progress -e "ssh $sshopt" $host:${MDBCI_VM_PATH}/ ${MDBCI_VM_PATH}/ 2>&1 >/dev/null diff --git a/system-test/mdbci/run_test.sh b/system-test/mdbci/run_test.sh index d750d82df..f641a410c 100755 --- a/system-test/mdbci/run_test.sh +++ b/system-test/mdbci/run_test.sh @@ -37,6 +37,9 @@ # the value of $test_set after 'NAME#' is used as bash command # line # example: '#NAME long_test_time=3600 ./long_test' +# +# $maxscale_product - use CI or production version of Maxscale +# 'maxscale_ci' or 'maxscale' export vm_memory=${vm_memory:-"2048"} export dir=`pwd` @@ -53,6 +56,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 maxscale_product=${maxscale_product:-"maxscale_ci"} mdbci destroy --force ${mdbci_config_name} @@ -61,6 +65,7 @@ mdbci destroy --force ${mdbci_config_name} ulimit -c unlimited cd ${script_dir}/../../ +rm -rf build mkdir build && cd build cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug cd system-test diff --git a/system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh index 657ca8b09..5ade57af0 100755 --- a/system-test/mdbci/run_test_vm.sh +++ b/system-test/mdbci/run_test_vm.sh @@ -1,5 +1,7 @@ #!/bin/bash +# $HOME/.config/mdbci/max-tst.key file should contain private key to access host + # read the name of build scripts directory export script_dir="$(dirname $(readlink -f $0))" @@ -10,6 +12,7 @@ export mdbci_config_name=${name:-$box-${curr_date}} export mdbci_config_name=`echo ${mdbci_config_name} | sed "s/?//g"` export MDBCI_VM_PATH=$HOME/${mdbci_config_name}_vms export PATH=$PATH:$HOME/mdbci +export MDBCI_EXECUTABLE=`which mdbci` . ${script_dir}/set_run_test_variables.sh @@ -57,6 +60,7 @@ test_env_list=( "JOB_NAME" "BUILD_NUMBER" "BUILD_TIMESTAMP" + "MDBCI_EXECUTABLE" "name" "target" "box" @@ -75,6 +79,7 @@ test_env_list=( "test_branch" "use_valgrind" "use_callgrind" + "maxscale_product" ) for s in ${test_env_list[@]} ; do diff --git a/system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template index d0af854e6..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_ci", + "name" : "${maxscale_product}", "version" : "${target}" } @@ -370,7 +370,7 @@ "SECOND_MAXSCALE" ], "product" : { - "name" : "maxscale_ci", + "name" : "${maxscale_product}", "version" : "${target}" } From 6ed1173cd64bb14febd561d9c460fc1df0b4040a Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Fri, 25 Dec 2020 13:31:10 +0200 Subject: [PATCH 6/6] add force_version parameters to the MDBCI template --- system-test/maxtest/src/testconnections.cc | 4 +- system-test/mdbci/run_test_vm.sh | 2 + system-test/mdbci/set_run_test_variables.sh | 2 + .../mdbci/templates/default.json.template | 66 ++++++++++++------- 4 files changed, 51 insertions(+), 23 deletions(-) diff --git a/system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc index f6d3f0e9b..b59d1d2b0 100644 --- a/system-test/maxtest/src/testconnections.cc +++ b/system-test/maxtest/src/testconnections.cc @@ -2233,8 +2233,10 @@ int TestConnections::process_mdbci_template() envvar_get_set("target", "develop"); envvar_get_set("vm_memory", "2048"); envvar_get_set("maxscale_product", "maxscale_ci"); + envvar_get_set("force_maxscale_version", "true"); + envvar_get_set("force_backend_version", "true"); - string version = envvar_get_set("version", "10.3"); + string version = envvar_get_set("version", "10.5"); envvar_get_set("galera_version", "%s", version.c_str()); string product = envvar_get_set("product", "mariadb"); diff --git a/system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh index 5ade57af0..c44d5c0ff 100755 --- a/system-test/mdbci/run_test_vm.sh +++ b/system-test/mdbci/run_test_vm.sh @@ -80,6 +80,8 @@ test_env_list=( "use_valgrind" "use_callgrind" "maxscale_product" + "force_maxscale_version" + "force_backend_version" ) for s in ${test_env_list[@]} ; do diff --git a/system-test/mdbci/set_run_test_variables.sh b/system-test/mdbci/set_run_test_variables.sh index 8a1a323c3..550cfcb6e 100644 --- a/system-test/mdbci/set_run_test_variables.sh +++ b/system-test/mdbci/set_run_test_variables.sh @@ -13,3 +13,5 @@ export team_keys=${team_keys:-${HOME}/team_keys} export do_not_destroy_vm=${do_not_destroy_vm:-"yes"} #export test_set=${test_set:-"-LE UNSTABLE"} export test_set=${test_set:-"-I 1,5"} +export force_maxscale_version=${test_set:-"true"} +export force_backend_version=${test_set:-"false"} diff --git a/system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template index 3025caded..f6c8745c2 100644 --- a/system-test/mdbci/templates/default.json.template +++ b/system-test/mdbci/templates/default.json.template @@ -12,7 +12,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server1.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -30,7 +31,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server2.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -47,7 +49,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server3.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -64,7 +67,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server4.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -81,7 +85,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server5.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -98,7 +103,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server6.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -115,7 +121,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server7.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -132,7 +139,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server8.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -150,7 +158,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server9.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -167,7 +176,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server10.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -184,7 +194,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server11.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -201,7 +212,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server12.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -218,7 +230,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server13.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -235,7 +248,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server14.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -252,7 +266,8 @@ "name": "${product}", "version": "${version}", "cnf_template" : "server15.cnf", - "cnf_template_path": "${cnf_path}" + "cnf_template_path": "${cnf_path}", + "force_version": ${force_backend_verion} } }, @@ -268,7 +283,8 @@ "products" : [ { "name": "${product}", - "version": "${version}" + "version": "${version}", + "force_version": ${force_backend_verion} }, { "name": "galera_config", @@ -290,7 +306,8 @@ "products" : [ { "name": "${product}", - "version": "${version}" + "version": "${version}", + "force_version": ${force_backend_verion} }, { "name": "galera_config", @@ -312,7 +329,8 @@ "products" : [ { "name": "${product}", - "version": "${version}" + "version": "${version}", + "force_version": ${force_backend_verion} }, { "name": "galera_config", @@ -334,7 +352,8 @@ "products" : [ { "name": "${product}", - "version": "${version}" + "version": "${version}", + "force_version": ${force_backend_verion} }, { "name": "galera_config", @@ -354,8 +373,10 @@ "MAXSCALE" ], "product" : { - "name" : "${maxscale_product}", - "version" : "${target}" + "name" : "${maxscale_product}", + "version" : "${target}", + "force_version": ${force_maxscale_verion} + } }, @@ -371,7 +392,8 @@ ], "product" : { "name" : "${maxscale_product}", - "version" : "${target}" + "version" : "${target}", + "force_version": ${force_maxscale_verion} } }