tests/mysql/replication/setup-master/test tests/mysql/replication/setup-slave/test @@ -5,7 +5,7 @@ <memory>256</memory> - <size>800</size> + <size>2048</size> <swap>256</swap> @@ -13,7 +13,7 @@ <dist>hardy</dist> </install> - <post-install> - <script>install-mysql-5.1.sh</script> - </post-install> + <packages> + <package>wget</package> + </packages> </image> images/hardy-mysql-5.1.xml @@ -7,16 +7,17 @@ <name>master</name> <desc>Master MySQL server</desc> <baseimage>hardy-mysql-5.1</baseimage> - <memory>128</memory> + <memory>256</memory> <network> <interface type="static"> <name>eth1</name> <address>192.168.2.1</address> <netmask>255.255.255.0</netmask> + <gateway>192.168.2.254</gateway> </interface> </network> <post-install> - <script>configure-replication-master.sh</script> + <script>install-mysql-5.1.sh</script> </post-install> <files> <file>world.sql</file> @@ -27,20 +28,37 @@ <name>slave</name> <desc>Slave MySQL server</desc> <baseimage>hardy-mysql-5.1</baseimage> - <memory>128</memory> + <memory>256</memory> <network> <interface type="static"> <name>eth1</name> <address>192.168.2.2</address> <netmask>255.255.255.0</netmask> + <gateway>192.168.2.254</gateway> </interface> </network> <post-install> - <script>configure-replication-master.sh</script> + <script>install-mysql-5.1.sh</script> </post-install> <files> <file>world.sql</file> </files> </host> + + <host type="router"> + <name>internet-router</name> + <desc>Host that assumes router functions</desc> + <baseimage>hardy-mysql-5.1</baseimage> + + <network> + <interface type="static"> + <name>eth1</name> + <address>192.168.2.254</address> + <netmask>255.255.255.0</netmask> + <gateway>10.6.7.1</gateway> + </interface> + </network> + </host> + </scenario> scenarios/mysql/master-slave.xml @@ -1,10 +1,11 @@ -#!/bin/sh +#!/bin/bash TMPDIR=`mktemp -d /tmp/anste-mysql.XXXXXXXXX` MIRROR='mysql.rediris.es' -MYSQL_VERSION='mysql-5.1.30-linux-i686-glibc23' -pushd $TMPDIR -wget http://$MIRROR/Downloads/MySQL-5.1/$MYSQL_VERSION.tar.gz || exit 1 +MYSQL_VERSION='mysql-5.1.30-linux-x86_64-glibc23' +cd $TMPDIR +#wget http://$MIRROR/Downloads/MySQL-5.1/$MYSQL_VERSION.tar.gz || exit 1 +wget http://10.6.7.1/$MYSQL_VERSION.tar.gz || exit 1 tar xvf $MYSQL_VERSION.tar.gz mv $MYSQL_VERSION /usr/local ln -s /usr/local/$MYSQL_VERSION /usr/local/mysql @@ -15,5 +16,7 @@ chown -R root: /usr/local/mysql chown -R mysql: /usr/local/mysql/data cp /usr/local/mysql/support-files/mysql.server /etc/init.d/mysql update-rc.d mysql defaults -popd +invoke-rc.d mysql start +cd - echo 'export PATH=/usr/local/mysql/bin:$PATH' >> /etc/bash.bashrc +echo 'export PATH=/usr/local/mysql/bin:$PATH' >> /etc/profile scripts/install-mysql-5.1.sh @@ -1,5 +1,6 @@ #!/bin/sh +export PATH=/usr/local/mysql/bin:$PATH NAME=`mysql world -e "SELECT Name FROM Country WHERE Code = 'ESP'" --batch --skip-column-names` if [ $? -ne 0 ]; then tests/mysql/replication/check-world/test @@ -1,4 +1,5 @@ #!/bin/sh +export PATH=/usr/local/mysql/bin:$PATH mysqladmin -u root create world -mysql -u root < /var/local/anste/world.sql +mysql -u root world < /var/local/anste/world.sql tests/mysql/replication/load-world/test @@ -8,6 +8,20 @@ <scenario>mysql/master-slave.xml</scenario> <test> + <name>SetupMaster</name> + <desc>Set up master.</desc> + + <host>master</host> + <dir>setup-master</dir> + </test> + <test> + <name>SetupSlave</name> + <desc>Set up slave.</desc> + + <host>slave</host> + <dir>setup-slave</dir> + </test> + <test> <name>LoadWorldIntoMaster</name> <desc>Load the world database into the master.</desc> tests/mysql/replication/suite.xml 7671d718058088284530609f37bf4fdb44a86e55 Jorge Bernal jbernal@warp.es http://github.com/koke/anste-mysql/commit/a531089fd8780a03352e8d6bf4dfd4df42436ff5 a531089fd8780a03352e8d6bf4dfd4df42436ff5 2009-04-05T07:00:21-07:00 2009-04-05T07:00:21-07:00 First batch of running tests 2d55713034241a1224a3ceb29d073930f52ab05f Jorge Bernal jbernal@warp.es