Remove 'mysql-' prefix from mysql version so dbdeployer can make a port num
This commit is contained in:
parent
8df36d4bfd
commit
3976b7acf2
@ -46,12 +46,13 @@ test_mysql_version() {
|
|||||||
mkdir -p sandboxes
|
mkdir -p sandboxes
|
||||||
rm -rf sandboxes/*
|
rm -rf sandboxes/*
|
||||||
|
|
||||||
if echo "$mysql_version" | egrep "5[.]5[.]" ; then
|
local mysql_version_num=${version#*-}
|
||||||
|
if echo "$mysql_version_num" | egrep "5[.]5[.]" ; then
|
||||||
gtid=""
|
gtid=""
|
||||||
else
|
else
|
||||||
gtid="--gtid"
|
gtid="--gtid"
|
||||||
fi
|
fi
|
||||||
gh-ost-ci-env/bin/linux/dbdeployer deploy replication "$mysql_version" --nodes 2 --sandbox-binary ${PWD}/sandbox/binary --sandbox-home ${PWD}/sandboxes ${gtid} --my-cnf-options log_slave_updates --my-cnf-options log_bin --my-cnf-options binlog_format=ROW --sandbox-directory rsandbox
|
gh-ost-ci-env/bin/linux/dbdeployer deploy replication "$mysql_version_num" --nodes 2 --sandbox-binary ${PWD}/sandbox/binary --sandbox-home ${PWD}/sandboxes ${gtid} --my-cnf-options log_slave_updates --my-cnf-options log_bin --my-cnf-options binlog_format=ROW --sandbox-directory rsandbox
|
||||||
|
|
||||||
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
|
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
|
||||||
echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master
|
echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master
|
||||||
|
Loading…
Reference in New Issue
Block a user