From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Fri, 17 Feb 2017 04:31:47 +0000 (+0000)
Subject: fix searching with jq select
X-Git-Tag: danube.1.0~30
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F28891%2F2;p=joid.git

fix searching with jq select

Change-Id: I98842799db56040c935336758db3de1e02825a41
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
---

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index d082f466..93f81020 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -327,7 +327,7 @@ addnodes(){
         power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
         architecture='amd64/generic' power_parameters_power_id='bootstrap'
 
-    bootstrapid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "bootstrap")[0].system_id')
+    bootstrapid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "bootstrap").system_id')
 
     maas $PROFILE tag update-nodes bootstrap add=$bootstrapid
 
@@ -360,17 +360,17 @@ addnodes(){
             tags='control' hostname='node1-control' power_type='virsh' mac_addresses=$node1controlmac \
             power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
             architecture='amd64/generic' power_parameters_power_id='node1-control'
-        controlnodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node1-control")[0].system_id')
+        controlnodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node1-control").system_id')
         maas $PROFILE machines create autodetect_nodegroup='yes' name='node2-compute' \
             tags='compute' hostname='node2-compute' power_type='virsh' mac_addresses=$node2computemac \
             power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
             architecture='amd64/generic' power_parameters_power_id='node2-compute'
-        compute2nodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node2-compute")[0].system_id')
+        compute2nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node2-compute").system_id')
         maas $PROFILE machines create autodetect_nodegroup='yes' name='node5-compute' \
             tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac \
             power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
             architecture='amd64/generic' power_parameters_power_id='node5-compute'
-        compute5nodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node5-compute")[0].system_id')
+        compute5nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node5-compute").system_id')
 
         maas $PROFILE tag update-nodes control add=$controlnodeid || true
         maas $PROFILE tag update-nodes compute add=$compute2nodeid || true
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 90463967..94ec5e8d 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -84,7 +84,7 @@ createresource() {
     for node in node3-control node4-control
     do
         node_id=$(maas $PROFILE machines read | \
-                  jq -r "select(.[].hostname == \"$node\")[0].system_id")
+                  jq -r ".[] | select(.hostname == \"$node\").system_id")
         if [[ -z "$node_id" ]]; then
             sudo virt-install --connect qemu:///system --name $node \
                 --ram 8192 --cpu host --vcpus 4 \
@@ -103,7 +103,7 @@ createresource() {
                 power_parameters_power_address="qemu+ssh://$USER@192.168.122.1/system" \
                 architecture='amd64/generic' power_parameters_power_id='node3-control'
             node_id=$(maas $PROFILE machines read | \
-                  jq -r "select(.[].hostname == \"$node\")[0].system_id")
+                  jq -r ".[] | select(.hostname == \"$node\").system_id")
         fi
         if [[ -z "$node_id" ]]; then
             echo "Error: failed to create node $node ."