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

Merge branch '2.2' into 2.3.9

Browse Source
This commit is contained in:
Markus Mäkelä
2019-07-02 10:06:33 +03:00
parent 493ce86d87 fa13ec8c38
commit 5a6e2f43cf
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BUILD/mdbci/upgrade_test.sh
View File

@ -51,8 +51,7 @@ export sshopt="$scpopt $sshuser@$IP"
old_version=`ssh $sshopt "maxscale --version" ` old_version=`ssh $sshopt "maxscale --version" `
${mdbci_dir}/mdbci setup_repo --product maxscale_ci --product-version ${target} $name/maxscale ${mdbci_dir}/mdbci install_product --product maxscale_ci --product-version ${target} $name/maxscale
${mdbci_dir}/mdbci install_product --product maxscale_ci $name/maxscale
res=$? res=$?

6
maxscale-system-test/testconnections.cpp
View File

@ -2306,12 +2306,6 @@ int TestConnections::reinstall_maxscales()
maxscales->ssh_node(i, "yum remove maxscale -y", true); maxscales->ssh_node(i, "yum remove maxscale -y", true);
maxscales->ssh_node(i, "yum clean all", true); maxscales->ssh_node(i, "yum clean all", true);
sprintf(sys, "mdbci setup_repo --product maxscale_ci --product-version %s %s/%s_%03d",
target, mdbci_config_name, maxscales->prefix, i);
if (system(sys))
{
return 1;
}
sprintf(sys, "mdbci install_product --product maxscale_ci --product-version %s %s/%s_%03d", sprintf(sys, "mdbci install_product --product maxscale_ci --product-version %s %s/%s_%03d",
target, mdbci_config_name, maxscales->prefix, i); target, mdbci_config_name, maxscales->prefix, i);
if (system(sys)) if (system(sys))