summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2015-08-18 16:09:08 +0800
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2015-08-19 14:24:58 +0100
commit81771255201ffb921ff4c4600edb2c908a24d010 (patch)
tree0340fa872a77b46599731efe00f010c6f7171265
parent4819cf08f0dca48c135dfe75f6c6b932907c9355 (diff)
ubuntu: ltp: fix out of disk space issue
The current approach is download and install LTP in test folder, which causes the size of the folder is very big. Once the compressed size of the folder exceed the disk space available on master image, it will lead to result collection failure. Alternatively, we can download and install LTP under /opt/ltp directory. In this way, it addresses the out of disk space issue, and we only need compile and install LTP once for multiple LTP lava_test_shells in the same LAVA job. Change-Id: I5f5c37c38c2cbabb77c1a2227c5336a93cf872f2 Signed-off-by: Chase Qi <chase.qi@linaro.org> Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
-rwxr-xr-xcommon/scripts/ltpfixup.sh4
-rw-r--r--ubuntu/ltp.yaml5
2 files changed, 6 insertions, 3 deletions
diff --git a/common/scripts/ltpfixup.sh b/common/scripts/ltpfixup.sh
index 777f237..52c85c9 100755
--- a/common/scripts/ltpfixup.sh
+++ b/common/scripts/ltpfixup.sh
@@ -9,7 +9,7 @@ echo "Script path is: $SCRIPTPATH"
TST_CMDFILES=""
# List of test cases to be skipped
SKIPFILE=""
-# Used only for ltp-ddt tests. Only run test cases which match PATTERNS. Patterns are
+# Used only for ltp-ddt tests. Only run test cases which match PATTERNS. Patterns are
# seperated by a comma
PATTERNS=""
@@ -17,7 +17,7 @@ LTP_PATH=/opt/ltp
while getopts T:S:P:s: arg
do case $arg in
- T)
+ T)
TST_CMDFILES="$OPTARG"
LOG_FILE=`echo $OPTARG| sed 's,\/,_,'`;;
S) OPT=`echo $OPTARG | grep "http"`
diff --git a/ubuntu/ltp.yaml b/ubuntu/ltp.yaml
index d1eb43c..80eeb5a 100644
--- a/ubuntu/ltp.yaml
+++ b/ubuntu/ltp.yaml
@@ -20,6 +20,9 @@ metadata:
install:
steps:
- 'VERSION=20150420'
+ - 'rm -rf /opt/ltp'
+ - 'mkdir -p /opt/ltp'
+ - 'cd /opt/ltp'
- 'wget http://sourceforge.net/projects/ltp/files/LTP%20Source/ltp-$VERSION/ltp-full-$VERSION.tar.xz'
- 'tar --strip-components=1 -Jxf ltp-full-$VERSION.tar.xz'
- 'mkdir build'
@@ -46,7 +49,7 @@ params:
run:
steps:
- - './common/scripts/ltpfixup.sh -T $TST_CMDFILES -P $(readlink -f build) -S $SKIPFILE'
+ - './common/scripts/ltpfixup.sh -T $TST_CMDFILES -P /opt/ltp/build -S $SKIPFILE'
parse:
pattern: "^(?!.+ED)(?P<test_case_id>\\w+)\\s+(?P<result>\\w+)\\s+\\d$"