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

add force_version parameters to the MDBCI template

Browse Source
This commit is contained in:
Timofey Turenko 2020-12-25 13:42:16 +02:00
commit c03e557a31
4 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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");

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

@ -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

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

@ -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"}

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

@ -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,9 @@
"MAXSCALE"
],
"product" : {
"name" : "${maxscale_product}",
"version" : "${target}"
"name" : "${maxscale_product}",
"version" : "${target}",
"force_version": ${force_maxscale_verion}
}
},
@ -371,7 +391,8 @@
],
"product" : {
"name" : "${maxscale_product}",
"version" : "${target}"
"version" : "${target}",
"force_version": ${force_maxscale_verion}
}
}