From 96c7046bff309dee73ff3cd97b989f1fcf97d6aa Mon Sep 17 00:00:00 2001
From: Denis Poisson <denis.poisson@ts.fujitsu.com>
Date: Tue, 24 Oct 2017 12:50:56 +0200
Subject: [PATCH] Fix some linter warnings, part 18 (#293)

---
 storm/build.yml         | 4 ++--
 storm/entrypoint.sh     | 6 +++---
 tempest-tests/build.yml | 2 +-
 tempest-tests/start.sh  | 7 +++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/storm/build.yml b/storm/build.yml
index 62766c48b..d693f0ac3 100644
--- a/storm/build.yml
+++ b/storm/build.yml
@@ -1,13 +1,13 @@
 repository: monasca/storm
 variants:
-  - tag: 1.1.1-1.0.8
+  - tag: 1.1.1-1.0.9
     aliases:
       - :latest
       - :1.1.1
     args:
       STORM_VERSION: 1.1.1
 
-  - tag: 1.0.3-1.0.8
+  - tag: 1.0.3-1.0.9
     aliases:
       - :1.0.3
     args:
diff --git a/storm/entrypoint.sh b/storm/entrypoint.sh
index c2d15373f..7aa4659a7 100755
--- a/storm/entrypoint.sh
+++ b/storm/entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/ash
+# shellcheck shell=dash
 
 if [ -n "$DEBUG" ]; then
   set -x
@@ -45,8 +46,7 @@ first_zk=$(echo "$STORM_ZOOKEEPER_SERVERS" | cut -d, -f1)
 if [ "$ZOOKEEPER_WAIT" = "true" ]; then
   success="false"
   for i in $(seq "$ZOOKEEPER_WAIT_RETRIES"); do
-    ok=$(echo ruok | nc "$first_zk" "$STORM_ZOOKEEPER_PORT" -w "$ZOOKEEPER_WAIT_TIMEOUT")
-    if [ $? -eq 0 -a "$ok" = "imok" ]; then
+    if ok=$(echo ruok | nc "$first_zk" "$STORM_ZOOKEEPER_PORT" -w "$ZOOKEEPER_WAIT_TIMEOUT") && [ "$ok" = "imok" ]; then
       success="true"
       break
     else
@@ -120,7 +120,7 @@ template_dir "$CONFIG_TEMPLATES" "$CONFIG_DEST"
 template_dir "$LOG_TEMPLATES" "$LOG_DEST"
 
 if [ "$WORKER_LOGS_TO_STDOUT" = "true" ]; then
-  for PORT in `echo "$SUPERVISOR_SLOTS_PORTS" | sed -e "s/,/ /" `; do
+  for PORT in $(echo "$SUPERVISOR_SLOTS_PORTS" | sed -e "s/,/ /"); do
     LOGDIR="/storm/logs/workers-artifacts/thresh/$PORT"
     mkdir -p "$LOGDIR"
     WORKER_LOG="$LOGDIR/worker.log"
diff --git a/tempest-tests/build.yml b/tempest-tests/build.yml
index b6379b259..e3d259f51 100644
--- a/tempest-tests/build.yml
+++ b/tempest-tests/build.yml
@@ -1,5 +1,5 @@
 repository: monasca/tempest-tests
 variants:
-  - tag: 1.0.0
+  - tag: 1.0.1
     aliases:
       - :latest
diff --git a/tempest-tests/start.sh b/tempest-tests/start.sh
index f2cb6dbdf..d5eee8990 100755
--- a/tempest-tests/start.sh
+++ b/tempest-tests/start.sh
@@ -37,10 +37,9 @@ if [ "$MONASCA_WAIT_FOR_API" = "true" ]; then
   success="false"
 
   for i in $(seq "$MONASCA_API_WAIT_RETRIES"); do
-    monasca --os-user-domain-name "${OS_DOMAIN_NAME}" --os-project-name "${OS_TENANT_NAME}" \
+    if monasca --os-user-domain-name "${OS_DOMAIN_NAME}" --os-project-name "${OS_TENANT_NAME}" \
        --os-auth-url "${AUTH_URI_V3}" --os-username "${OS_USERNAME}" \
-       --os-password "${OS_PASSWORD}" alarm-list --limit 1
-    if [ $? -eq 0 ]; then
+       --os-password "${OS_PASSWORD}" alarm-list --limit 1; then
       success="true"
       break
     else
@@ -72,7 +71,7 @@ ostestr --serial --regex "${OSTESTR_REGEX}"
 
 RESULT=$?
 
-if [ $RESULT != 0 -a "$STAY_ALIVE_ON_FAILURE" = "true" ]; then
+if [ $RESULT != 0 ] && [ "$STAY_ALIVE_ON_FAILURE" = "true" ]; then
   sleep 7200
 fi
 exit $RESULT