Fix csit list variable expression

[releng/builder.git] / jjb / integration / include-raw-integration-get-slave-addresses.sh

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