summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-03-13 20:52:43 +0000
committervarac <varacanero@zeromail.org>2014-03-13 20:52:43 +0000
commit58f6b7137151395293a4fde518fdf5389b3a05d3 (patch)
tree3dffbb8e465cd519e5cbb2daf0772f57ea66c584
parentf9986db8584892a73f923be67acdbe1abfdb5ba4 (diff)
use the --no-color flag (Feature #5305)
-rwxr-xr-xleap-platform-test5
1 files changed, 1 insertions, 4 deletions
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