diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-04-18 14:09:39 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-04-18 14:09:39 -0400 |
| commit | 047708d62a425567a1bc7e86eaca2a8e88ebd703 (patch) | |
| tree | 7d595cde0634919409669b439569c30cf065e720 /jjb/functest | |
| parent | ed2b8442d759280d44c828d8ce3ce27c22bd8afa (diff) | |
Apex, Functest: Fixes VM renaming scheme for apex
In master, the installer VM has been renamed to undercloud.
Change-Id: Ic695dd39e481e51e38c8b601cadd497bf2a8bc1d
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index c9bf07d8b..d691140f4 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -249,8 +249,16 @@ # labconfig is used only for joid labconfig="" if [[ ${INSTALLER_TYPE} == 'apex' ]]; then - instack_mac=$(sudo virsh domiflist instack | grep default | \ - grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") + if virsh list | grep instack; then + instack_mac=$(sudo virsh domiflist instack | grep default | \ + grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") + elif virsh list | grep undercloud; then + instack_mac=$(sudo virsh domiflist undercloud | grep default | \ + grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") + else + echo "No available installer VM exists...exiting" + exit 1 + fi INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'}) sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa" sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable |