Skip to content

Commit 3976b7a

Browse files
Remove 'mysql-' prefix from mysql version so dbdeployer can make a port num
1 parent 8df36d4 commit 3976b7a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

script/cibuild-gh-ost-replica-tests

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ test_mysql_version() {
4646
mkdir -p sandboxes
4747
rm -rf sandboxes/*
4848

49-
if echo "$mysql_version" | egrep "5[.]5[.]" ; then
49+
local mysql_version_num=${version#*-}
50+
if echo "$mysql_version_num" | egrep "5[.]5[.]" ; then
5051
gtid=""
5152
else
5253
gtid="--gtid"
5354
fi
54-
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
55+
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
5556

5657
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
5758
echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master

0 commit comments

Comments
 (0)