diff options
| author | varac <varacanero@zeromail.org> | 2015-11-16 11:53:56 +0000 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-16 11:53:56 +0000 |
| commit | 8b43ea92ad5641c5875d9ef6b82bd462e4995ee4 (patch) | |
| tree | 97cd072c87e8929ded01608233c2a847bdd9de33 | |
| parent | ba67c2853851c62b6db3a45fef03c949bb755f3d (diff) | |
use case-insensitive filter for puppet errors, checkout platform repo without much noise
puppet 3 changed to uppercase 'Notice:' etc.
| -rwxr-xr-x | leap-platform-test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/leap-platform-test b/leap-platform-test index 138a96c..fd1fa06 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -179,9 +179,9 @@ deploy() { if $verbose then $LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | tee -a "$LOG1" "$LOG2" "$LOG_GLOBAL" - cat $LOG2 | strip_colors | egrep -v "$FILTER_ALL" | tee -a "$ERRLOG1" "$ERRLOG2" "$ERRLOG_GLOBAL" > /dev/null + cat $LOG2 | strip_colors | egrep -iv "$FILTER_ALL" | tee -a "$ERRLOG1" "$ERRLOG2" "$ERRLOG_GLOBAL" > /dev/null else - $LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | tee -a "$LOG1" "$LOG2" "$LOG_GLOBAL" | strip_colors | egrep -v "$FILTER_ALL" | tee -a "$ERRLOG1" "$ERRLOG2" "$ERRLOG_GLOBAL" > /dev/null + $LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | tee -a "$LOG1" "$LOG2" "$LOG_GLOBAL" | strip_colors | egrep -iv "$FILTER_ALL" | tee -a "$ERRLOG1" "$ERRLOG2" "$ERRLOG_GLOBAL" > /dev/null fi # send an host-specific error mail on deploy failures @@ -459,9 +459,9 @@ run_tests () { #$LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | tee -a "$LOG1" "$LOG2" $LEAP_CMD $OPTS test --continue 2>&1 | tee -a "$TEST_LOG1" "$TEST_LOG2" test_failure=${PIPESTATUS[0]} - egrep -v "$TEST_FILTER" $TEST_LOG2 | tee -a "$TEST_LOG1" "$TEST_LOG2" > /dev/null + egrep -iv "$TEST_FILTER" $TEST_LOG2 | tee -a "$TEST_LOG1" "$TEST_LOG2" > /dev/null else - $LEAP_CMD $OPTS test --continue 2>&1 | egrep -v "$TEST_FILTER" | tee -a "$TEST_LOG1" "$TEST_LOG2" + $LEAP_CMD $OPTS test --continue 2>&1 | egrep -iv "$TEST_FILTER" | tee -a "$TEST_LOG1" "$TEST_LOG2" test_failure=${PIPESTATUS[0]} fi @@ -494,8 +494,8 @@ update_platform () { git clean -f git fetch - git checkout origin/$PLATFORM_BRANCH - git checkout -B $PLATFORM_BRANCH + git branch -D $PLATFORM_BRANCH + git checkout -b $PLATFORM_BRANCH origin/$PLATFORM_BRANCH git submodule sync git submodule update --init |