aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2016-09-22 14:27:41 +0200
committerJan Gelety <jgelety@cisco.com>2016-09-25 20:26:06 +0200
commit40d7e3b74c92f634c345192e87c2c50705c31eb6 (patch)
tree2e61c276a099981892835f192e4336702846d45b
parent030f0dff4adbb5da9be2a18cbafec9b077a6723f (diff)
Use tmp directory for log files
- store log files in tmp directory and exclude all files in this directory from archiving when creating tarballs Change-Id: Ie3e11670c9d466c5fcf41d03ccd0a7bbb04ffeb0 Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rwxr-xr-xbootstrap.sh12
-rw-r--r--resources/libraries/python/SetupFramework.py4
2 files changed, 10 insertions, 6 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index 2796e5031c..2bd3a0f072 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -34,11 +34,15 @@ TEST_GROUPS=("bridge_domain,dhcp,gre,honeycomb,l2_xconnect,lisp,softwire" "cop,i
SUITE_PATH="tests.func"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-LOG_PATH="${SCRIPT_DIR}"
-# Create temp dir for tarballs
-mkdir ${SCRIPT_DIR}/../temp
-export TMPDIR="${SCRIPT_DIR}/../temp"
+# Create tmp dir
+mkdir ${SCRIPT_DIR}/tmp
+
+# Use tmp dir to store log files
+LOG_PATH="${SCRIPT_DIR}/tmp"
+
+# Use tmp dir for tarballs
+export TMPDIR="${SCRIPT_DIR}/tmp"
SHARED_MEMORY_PATH="/run/shm"
diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py
index 7914d7c3f2..1a1e991b3b 100644
--- a/resources/libraries/python/SetupFramework.py
+++ b/resources/libraries/python/SetupFramework.py
@@ -50,8 +50,8 @@ def pack_framework_dir():
tmpfile.close()
proc = Popen(
- split("tar --exclude-vcs -zcf {0} .".format(file_name)),
- stdout=PIPE, stderr=PIPE)
+ split("tar --exclude-vcs --exclude=./tmp --exclude=*.deb -zcf {0} .".
+ format(file_name)), stdout=PIPE, stderr=PIPE)
(stdout, stderr) = proc.communicate()
logger.debug(stdout)