X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-env-presetup.sh;h=323b325b4f4fc149921256e3ee4f503073ffd7b8;hb=baab3f70e234538d043b0cf76eb5c9773164da35;hp=7a9b09d2c43b49a2a9b065139d5a40efba87eacd;hpb=46b716130c196dabb4b90fd021cfbcda28b468f4;p=releng.git diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh index 7a9b09d2c..323b325b4 100755 --- a/jjb/functest/functest-env-presetup.sh +++ b/jjb/functest/functest-env-presetup.sh @@ -27,5 +27,29 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then echo "No available installer VM exists and no credentials provided...exiting" exit 1 fi + +elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then + echo "Gathering IP information for Daisy installer VM" + if sudo virsh list | grep daisy; then + echo "Installer VM detected" + + bridge_name=$(sudo virsh domiflist daisy | grep vnet | awk '{print $3}') + echo "Bridge is $bridge_name" + + installer_mac=$(sudo virsh domiflist daisy | grep vnet | \ + grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") + export INSTALLER_IP=$(/usr/sbin/arp -e -i $bridge_name | grep ${installer_mac} | head -n 1 | awk {'print $1'}) + + echo "Installer ip is ${INSTALLER_IP}" + else + echo "No available installer VM exists...exiting" + exit 1 + fi + +elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then + if [[ ! "${BRANCH}" =~ "danube" ]]; then + echo "Map mcp ssh_key" + export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa" + fi fi