Merge "comparison to stable/grizzly is not numeric"

This commit is contained in:
Jenkins
2014-01-17 23:11:07 +00:00
committed by Gerrit Code Review

View File

@@ -346,7 +346,7 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
res=$?
fi
if [[ "$LOCALRC_BRANCH" -ne "stable/grizzly" ]] && \
if [[ "$GRENADE_OLD_BRANCH" != "stable/grizzly" ]] && \
[[ "$DEVSTACK_GATE_TEMPEST_STRESS" -ne "1" ]] ; then
tools/check_logs.py -d $BASE/new/screen-logs
res2=$?