Prevent prep and logs from being captured when collecting logs
Resolve awk warnings in collect-logs.sh
refs #4624
refs #4411
Change-Id: I2fdb385f12374864f572e3529c837cbaa51fdfb2
diff --git a/Vagrantfile b/Vagrantfile
index 56bb131..95c0ab1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -11,6 +11,8 @@
$setup_integ = <<SCRIPT
cp -R /vagrant integration-tests
cd integration-tests && ./install_apps.py install_all 2>&1 | tee install.log
+rm -rf prepare
+cd install_helpers/tools && make clean
SCRIPT
$setup_ssh = <<SCRIPT
diff --git a/collect-logs.sh b/collect-logs.sh
index e594479..453dd60 100755
--- a/collect-logs.sh
+++ b/collect-logs.sh
@@ -1,4 +1,4 @@
#!/bin/sh
cd integration-tests
-tar cf - --ignore-failed-read --exclude='.vagrant*' $(git status -s -uall --porcelain --ignored | awk '$1!="D" && $2!~"\.pyc$"{print $2}') | tar xf - -C /vagrant/logs/$1
+tar cf - --ignore-failed-read --exclude='.vagrant*' --exclude='logs*' $(git status -s -uall --porcelain --ignored | awk '$1!="D" && $2!~".pyc$"{print $2}') | tar xf - -C /vagrant/logs/$1