Merge lp:~vila/ubuntu-test-cases/fix-errorfile-path into lp:~canonical-ci-engineering/ubuntu-test-cases/boottest

Proposed by Vincent Ladeuil on 2015-02-11
Status: Merged
Merged at revision: 406
Proposed branch: lp:~vila/ubuntu-test-cases/fix-errorfile-path
Merge into: lp:~canonical-ci-engineering/ubuntu-test-cases/boottest
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/boottest.sh (+1/-1)
To merge this branch: bzr merge lp:~vila/ubuntu-test-cases/fix-errorfile-path
Reviewer Review Type Date Requested Status
Francis Ginther Approve on 2015-02-11
Paul Larson 2015-02-11 Approve on 2015-02-11
Review via email: mp+249326@code.launchpad.net

Description of the change

Fix wrong path for errorfile leading to job failures without producing that errorfile.

To post a comment you must log in.
Paul Larson (pwlars) wrote :

+1

review: Approve
Paul Larson (pwlars) wrote :

Actually I think maybe you missed something... looking further down in that file I see the previous results/... path used also. Maybe it would be better to just ensure the results dir is created?

Francis Ginther (fginther) wrote :

Good catch, the results for the first run are stuffed in ${PKG_SRC_DIR}, not 'results'.

review: Approve
Vincent Ladeuil (vila) wrote :

> Actually I think maybe you missed something... looking further down in that
> file I see the previous results/... path used also.

That was the mistake, copy/paste/edit missing edit ;)

> Maybe it would be better
> to just ensure the results dir is created?

Nah, each test uses its own dir, better to keep it that way for now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/boottest.sh'
2--- scripts/boottest.sh 2015-02-10 15:47:41 +0000
3+++ scripts/boottest.sh 2015-02-11 13:54:18 +0000
4@@ -97,7 +97,7 @@
5 set -e
6 if [ $RET -ne 0 ]; then
7 # Something went wrong with the testbed and/or adt-run itself
8- errfile=results/${RELEASE}_${ARCH}_${SRC_PKG_NAME}_$(date +%Y%m%d-%H%M%S).error
9+ errfile=${PKG_SRC_DIR}/${RELEASE}_${ARCH}_${SRC_PKG_NAME}_$(date +%Y%m%d-%H%M%S).error
10 echo "$RELEASE $ARCH $SRC_PKG_NAME" > $errfile
11 [ -f "$errfile" ] && rsync -a $errfile $RSYNC_DEST/${RELEASE}/tmp/ || true
12 # Ensure we leave a usable phone

Subscribers

People subscribed via source and target branches