Run REST API and MaxCtrl unit tests

Install Docker when building on CentOS 7. This allows the REST API and
MaxCtrl unit tests to be run.
This commit is contained in:
Markus Mäkelä
2018-08-11 22:42:22 +03:00
parent f90b8cdafb
commit 1572e088bf
5 changed files with 50 additions and 14 deletions

View File

@ -84,7 +84,17 @@ do
docker exec -i $node mysql -umaxuser -pmaxpwd -e "select 1" >& /dev/null && break
sleep 1
done
echo "Done!"
docker exec -i $node mysql -umaxuser -pmaxpwd -e "select 1" >& /dev/null
if [ $? -ne 0 ]
then
echo "failed to start $node, error is:"
docker exec -i $node mysql -umaxuser -pmaxpwd -e "select 1"
exit 1
else
echo "Done!"
fi
done
# Go to the test directory

View File

@ -35,21 +35,20 @@ then
fi
# Start MaxScale
$maxscaledir/bin/maxscale $user_opt -f $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale1.output
# Wait for the first MaxScale to start
for ((i=0;i<150;i++))
do
$maxscaledir/bin/maxctrl list servers >& /dev/null && break
sleep 0.1
done
$maxscaledir/bin/maxscale $user_opt -f $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale1.output || exit 1
# Start a second maxscale
$maxscaledir/bin/maxscale $user_opt -f $maxscaledir/maxscale_secondary.cnf &>> $maxscaledir/maxscale2.output
$maxscaledir/bin/maxscale $user_opt -f $maxscaledir/maxscale_secondary.cnf &>> $maxscaledir/maxscale2.output || exit 1
# Wait for the MaxScales to start
# Wait for the second MaxScale to start
for ((i=0;i<150;i++))
do
$maxscaledir/bin/maxctrl --hosts 127.0.0.1:8990 list servers >& /dev/null && break
$maxscaledir/bin/maxctrl list servers >& /dev/null && \
$maxscaledir/bin/maxctrl --hosts 127.0.0.1:8990 list servers >& /dev/null && \
exit 0
sleep 0.1
done
# MaxScales failed to start, exit with an error
exit 1

View File

@ -25,11 +25,14 @@ then
fi
# Start MaxScale
$maxscaledir/bin/maxscale $user_opt -f $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale.output
$maxscaledir/bin/maxscale $user_opt -f $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale.output || exit 1
# Wait for MaxScale to start
for ((i=0;i<150;i++))
do
$maxscaledir/bin/maxctrl list servers >& /dev/null && break
$maxscaledir/bin/maxctrl list servers >& /dev/null && exit 0
sleep 0.1
done
# MaxScale failed to start, exit with an error
exit 1