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

MXS-2152: Always start maxscale_000 in run_test.sh

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-06 16:43:55 +03:00
parent 4717b4c975
commit b78e0f9a08
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
maxscale-system-test/mdbci/run_test.sh
View File

@ -56,12 +56,6 @@ export mdbci_config_name=`echo ${mdbci_config_name} | sed "s/?//g"`
export provider=`mdbci show provider $box --silent 2> /dev/null` export provider=`mdbci show provider $box --silent 2> /dev/null`
export backend_box=${backend_box:-"centos_7_"$provider} export backend_box=${backend_box:-"centos_7_"$provider}
export sshuser=`mdbci ssh --command 'whoami' --silent $mdbci_config_name/maxscale_000 2> /dev/null | tr -d '\r'`
export IP=`mdbci show network $mdbci_config_name/maxscale_000 --silent 2> /dev/null`
export sshkey=`mdbci show keyfile $mdbci_config_name/maxscale_000 --silent 2> /dev/null | sed 's/"//g'`
export scpopt="-i $sshkey -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=120 "
export sshopt="$scpopt $sshuser@$IP"
mdbci destroy ${mdbci_config_name} mdbci destroy ${mdbci_config_name}
. ${script_dir}/configure_log_dir.sh . ${script_dir}/configure_log_dir.sh
@ -70,16 +64,6 @@ ulimit -c unlimited
cd ${script_dir}/../../ cd ${script_dir}/../../
if [[ "$name" =~ '-gcov' ]]
then
echo "Building MaxScale from source on maxscale_000"
rsync -avz --delete -e "ssh $scpopt" ${script_dir}/../../ $sshuser@$IP:/tmp/MaxScale/
ssh $sshopt "/tmp/MaxScale/BUILD/install_build_deps.sh"
ssh $sshopt "mkdir /tmp/build && cd /tmp/build && cmake ../MaxScale -DCMAKE_INSTALL_PREFIX=/usr -DGCOV=Y && make && sudo make install"
ssh $sshopt "sudo chmod -R a+rwx /tmp/build"
ssh $sshopt "sudo systemctl daemon-reload"
fi
mkdir build && cd build mkdir build && cd build
cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug
cd maxscale-system-test cd maxscale-system-test
@ -94,6 +78,28 @@ if [ $? == 0 ] ; then
fi fi
fi fi
# Build MaxScale locally on the VM
if [[ "$name" =~ '-gcov' ]]
then
echo "Building MaxScale from source on maxscale_000"
# Start the MaxScale machine by running the sanity check test
ctest -V -R sanity_check || exit 1
# Configure SSH options
export sshuser=`mdbci ssh --command 'whoami' --silent $mdbci_config_name/maxscale_000 2> /dev/null | tr -d '\r'`
export IP=`mdbci show network $mdbci_config_name/maxscale_000 --silent 2> /dev/null`
export sshkey=`mdbci show keyfile $mdbci_config_name/maxscale_000 --silent 2> /dev/null | sed 's/"//g'`
export scpopt="-i $sshkey -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=120 "
export sshopt="$scpopt $sshuser@$IP"
rsync -az --delete -e "ssh $scpopt" ${script_dir}/../../ $sshuser@$IP:/tmp/MaxScale/
ssh $sshopt "/tmp/MaxScale/BUILD/install_build_deps.sh"
ssh $sshopt "mkdir /tmp/build && cd /tmp/build && cmake ../MaxScale -DCMAKE_INSTALL_PREFIX=/usr -DGCOV=Y && make && sudo make install"
ssh $sshopt "sudo chmod -R a+rwx /tmp/build"
ssh $sshopt "sudo systemctl daemon-reload"
fi
if [ ! -z "${named_test}" ] ; then if [ ! -z "${named_test}" ] ; then
eval ${named_test} eval ${named_test}
else else
@ -103,7 +109,7 @@ fi
if [[ "$name" =~ '-gcov' ]] if [[ "$name" =~ '-gcov' ]]
then then
ssh $sshopt 'cd /tmp/build && lcov --gcov-tool=$(command -v gcov) -c -d . -o lcov.info && genhtml -o /tmp/gcov-report/ lcov.info' ssh $sshopt 'cd /tmp/build && lcov --gcov-tool=$(command -v gcov) -c -d . -o lcov.info && genhtml -o /tmp/gcov-report/ lcov.info'
rsync -avz --delete -e "ssh $scpopt" $sshuser@$IP:/tmp/gcov-report/ ./${logs_publish_dir} rsync -az --delete -e "ssh $scpopt" $sshuser@$IP:/tmp/gcov-report/ ./${logs_publish_dir}
fi fi
cp core.* ${logs_publish_dir} cp core.* ${logs_publish_dir}