Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Functest testcase list
[releng.git]
/
jjb
/
functest
/
functest-env-presetup.sh
diff --git
a/jjb/functest/functest-env-presetup.sh
b/jjb/functest/functest-env-presetup.sh
index
cd15d71
..
323b325
100755
(executable)
--- a/
jjb/functest/functest-env-presetup.sh
+++ b/
jjb/functest/functest-env-presetup.sh
@@
-38,12
+38,18
@@
elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then
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]+")
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} | awk {'print $1'})
+ 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
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
fi