Improve vm ip search code to be more generic

Change-Id: Ic695203315c422d84cf6fcb168e849edca4156c8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/include-raw-integration-get-slave-addresses.sh b/jjb/integration/include-raw-integration-get-slave-addresses.sh
index 6174f8ce19610df1dd85b88a6452891b5addbe65..4cbb12b5af953a2da22fc1d703a1403239c0a129 100644 (file)
--- a/jjb/integration/include-raw-integration-get-slave-addresses.sh
+++ b/jjb/integration/include-raw-integration-get-slave-addresses.sh
@@ -5,9 +5,10 @@ TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 
 source $WORKSPACE/.venv-openstack/bin/activate
-CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
-MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
-ADDR=($CONTROLLER_IPS $MININET_IPS)
+ADDR=(`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | \
+       jq -r '.outputs[] | \
+              select(.output_key | match("^vm_[0-9]+_ips$")) | \
+              .output_value | .[]'`)
 
 for i in "${ADDR[@]}"
 do

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index 5436930ee7fe5d1eea1d56de0a49f97653b7fd2e..30d625f88fed171a8be03aa5b8534b1b5aeb9131 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+source $WORKSPACE/.venv-openstack/bin/activate
+
 function copy-ssh-keys-to-slave() {
     RETRIES=60
     for j in $(seq 1 $RETRIES); do
@@ -16,11 +18,10 @@ function copy-ssh-keys-to-slave() {
     done
 }
 
-source $WORKSPACE/.venv-openstack/bin/activate
-CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
-MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
-ADDR=($CONTROLLER_IPS $MININET_IPS)
-
+ADDR=(`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | \
+       jq -r '.outputs[] | \
+              select(.output_key | match("^vm_[0-9]+_ips\$")) | \
+              .output_value | .[]'`)
 pids=""
 for i in "${ADDR[@]}"; do
     ( copy-ssh-keys-to-slave ) &