openstack
/
grenade
Code Issues Proposed changes

fix trueorfalse usage 

A bunch of the trueorfalse usage was wrong, and thus could not be
overridden. Also, if tempest is attempted to upgrade when the smoke
tests haven't run, it doesn't actually work. So adjust that
conditional appropriately.

Change-Id: I847a8c2ca7cd044cf02e18321eba00b6cc55ebed
This commit is contained in:
Sean Dague 2015-04-07 13:28:20 -04:00
parent 6bb23b443f
commit 34ce8da5c9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grenade.sh
View File

@ -25,9 +25,9 @@ source $GRENADE_DIR/functions
source $GRENADE_DIR/grenaderc
source $GRENADE_DIR/inc/bootstrap
RUN_BASE=$(trueorfalse True $RUN_BASE)
RUN_TARGET=$(trueorfalse True $RUN_TARGET)
VERBOSE=$(trueorfalse True $VERBOSE)
RUN_BASE=$(trueorfalse True RUN_BASE)
RUN_TARGET=$(trueorfalse True RUN_TARGET)
VERBOSE=$(trueorfalse True VERBOSE)
while getopts bqs:t c; do
case $c in
@ -200,10 +200,10 @@ BASE_RUN_SMOKE=${BASE_RUN_SMOKE:-$RUN_SMOKE}
TARGET_RUN_SMOKE=${TARGET_RUN_SMOKE:-$RUN_SMOKE}
# Set up for Javelin (default to True)
RUN_JAVELIN=$(trueorfalse True $RUN_JAVELIN)
RUN_JAVELIN=$(trueorfalse True RUN_JAVELIN)
function run_javelin() {
if [ "$RUN_JAVELIN" != "True" ]; then
if [[ "$RUN_JAVELIN" != "True" ]]; then
return
fi
local action=$1