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

Make .ssh/id_rsa.pub default source of public keys for VMs

Browse Source 
'build' and 'run_test' copies public ssh keys to all created VMs
Legacy code takes keys from different locations, e.g. ~/build-scripts/team_keys which
causes errors due to lack of such files.
Now public keys goes from file defined on  or if not defined
from .ssh/id_rsa.pub of current host machine
This commit is contained in:
Timofey Turenko
2019-05-21 13:21:23 +03:00
parent ca682a5b1c
commit 6e6ab07642
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD/mdbci/build.sh
View File

@ -29,6 +29,7 @@ export platform=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platfo
export platform_version=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platform_version' --silent` export platform_version=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platform_version' --silent`
export dist_sfx="$platform"."$platform_version" export dist_sfx="$platform"."$platform_version"
export cmake_flags="${cmake_flags} -DPACKAGE=Y -DDISTRIB_SUFFIX=${dist_sfx}" export cmake_flags="${cmake_flags} -DPACKAGE=Y -DDISTRIB_SUFFIX=${dist_sfx}"
export team_keys=${team_keys:-${HOME}/.ssh/id_rsa.pub}
# prerare VM # prerare VM
export provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null` export provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null`
@ -73,8 +74,7 @@ $(<${script_dir}/templates/build.json.template)
exit 1 exit 1
fi fi
echo "copying public keys to VM" echo "copying public keys to VM"
cp ~/build-scripts/team_keys . ${mdbci_dir}/mdbci public_keys --key ${team_keys} --silent $name
${mdbci_dir}/mdbci public_keys --key team_keys --silent $name
fi fi
echo "Get VM info" echo "Get VM info"

2
maxscale-system-test/mdbci/set_run_test_variables.sh
View File

@ -9,7 +9,7 @@ export PATH=$PATH:$HOME/mdbci/
export JOB_NAME=${JOB_NAME:-"local_test"} export JOB_NAME=${JOB_NAME:-"local_test"}
export BUILD_NUMBER=${BUILD_NUMBER:-`date '+%Y%m%d%H%M'`} export BUILD_NUMBER=${BUILD_NUMBER:-`date '+%Y%m%d%H%M'`}
export BUILD_TAG=${BUILD_TAG:-jenkins-${JOB_NAME}-${BUILD_NUMBER}} export BUILD_TAG=${BUILD_TAG:-jenkins-${JOB_NAME}-${BUILD_NUMBER}}
export team_keys=${team_keys:-${HOME}/team_keys} export team_keys=${team_keys:-${HOME}/.ssh/id_rsa.pub}
export do_not_destroy_vm=${do_not_destroy_vm:-"yes"} export do_not_destroy_vm=${do_not_destroy_vm:-"yes"}
#export test_set=${test_set:-"-LE UNSTABLE"} #export test_set=${test_set:-"-LE UNSTABLE"}
export test_set=${test_set:-"-I 1,5"} export test_set=${test_set:-"-I 1,5"}