From 0c72ead2eae4ed32a0efe7aa865769e454ffb1a7 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 24 Dec 2013 09:58:01 -0500 Subject: [PATCH] comparison to stable/grizzly is not numeric the current d-g code uses -ne which is an explicitly numeric opperator. Make this != to do the right thing with strings. Use variable that is local to setup_localrc(). Without this there we get: [[: stable/grizzly: division by 0 (error token is "grizzly") Change-Id: Ie338b33e4bc655cb8e06b8bf80ab75bb58bf0e5e --- devstack-vm-gate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 25b54b4d..9cf87f8d 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -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=$?