From 58f6b7137151395293a4fde518fdf5389b3a05d3 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 13 Mar 2014 20:52:43 +0000 Subject: use the --no-color flag (Feature #5305) --- leap-platform-test | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'leap-platform-test') diff --git a/leap-platform-test b/leap-platform-test index 3283079..ff2b582 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -91,9 +91,6 @@ create_provider() { deploy() { - # remove colors until #1751 is fixed - RMCOLORS='s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' - # we need to deploy with verbose level 2, and filter out unwanted stuff # until puppet errors show up in verbose level 0 +1 (#1750) FILTER_CLI='= read|= loading|= no change| - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path| - cd .*; rsync -| - hiera| = created hiera/| = updated hiera/| = updated secrets.json| - cd /root/| - rolling backexecuting| - files/|\[bin,tests,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v| - \[.*\] ok' @@ -118,7 +115,7 @@ deploy() { ERRLOG2="$LOGDIR/deploy-error.log" echo "Deploying \"$vm\" on `date`"|tee -a $LOG1 $LOG2 - $LEAP_CMD $OPTS -v 2 deploy $vm 2>&1 | sed -r "$RMCOLORS" | tee -a $LOG1 $LOG2 | egrep -v "$FILTER_ALL" | tee -a $ERRLOG1 $ERRLOG2 > /dev/null + $LEAP_CMD $OPTS -v 2 deploy $vm 2>&1 | tee -a $LOG1 $LOG2 | egrep -v "$FILTER_ALL" | tee -a $ERRLOG1 $ERRLOG2 > /dev/null if [ -s $ERRLOG1 ] then -- cgit v1.2.3