Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some linter warnings, part 18 #293

Merged
merged 3 commits into from
Oct 24, 2017
+9 −10
Merged

Fix some linter warnings, part 18 #293

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6db8a1
Fix some linter warnings, part 18
digitalfishpond Oct 24, 2017
f2bebe9
Merge branch 'master' into fix-lint-18
digitalfishpond Oct 24, 2017
ab91502
Merge branch 'master' into fix-lint-18
kornicameister Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions storm/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions storm/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/ash
# shellcheck shell=dash

if [ -n "$DEBUG" ]; then
set -x
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tempest-tests/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repository: monasca/tempest-tests
variants:
- tag: 1.0.0
- tag: 1.0.1
aliases:
- :latest
7 changes: 3 additions & 4 deletions tempest-tests/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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