Merge lp:~psivaa/ubuntu-test-cases/rsync-results-to-tachash into lp:~canonical-ci-engineering/ubuntu-test-cases/boottest

[Para Siva]

To add result and error file rsync'ing back to the jenkins master from the phone slaves.

To add result and error file rsync'ing back to the jenkins master from the phone slaves.

This is based on a (probably) temporary rsync destination in tachash under /var/local/boottest/ and could/ should be modified when we make the final decision.

[Vincent Ladeuil (vila)]

See inline comment, then push to lp:~canonical-ci-engineering/ubuntu-test-cases/boottest

review: Approve

[lp:~psivaa/ubuntu-test-cases/rsync-results-to-tachash]

402. By Para Siva on 2015-01-30

Review comment to make the RSYNC_DEST overridable

403. By Para Siva on 2015-01-30

Remove blank line between comment and code

[Francis Ginther (fginther)]

Approve, this is consistent with the results handling for adt runs, just in a different base directory. If this is not the best location, it can be revisited.

review: Approve

=== modified file 'scripts/boottest.sh'
--- scripts/boottest.sh	2015-01-29 14:28:51 +0000
+++ scripts/boottest.sh	2015-01-30 13:57:39 +0000
@@ -13,6 +13,14 @@
 # Default adt-run timeout
 export ADT_TIMEOUT=${ADT_TIMEOUT:-600}
 
+# XXX psivaa 20150130: This is to use /var/local/boottest
+# directory in tachash for rsyncing the results back.
+# This should be revisited and fixed when the actual directory
+# is decided for final
+# May need tweaking/ removing the boottest section of /etc/rsyncd.conf
+# in tachash
+export RSYNC_DEST=${RSYNC_DEST:-rsync://tachash.ubuntu-ci/boottest/}
+
 # If the NODE_NAME is unset, we're running locally, the commands that
 # requires a phone are prefixed with "[ -z ${NODE_NAME} ] ||"
 # If you have a phone available locally, set ANDROID_SERIAL and NODE_NAME=yes
@@ -119,12 +127,12 @@
     [ $RET -gt 0 ] && result="FAIL"
     set +x  # quiet mode as it pollutes output
     echo "$RELEASE $ARCH $(cat results/testpkg-version) $result $(sort -u results/*-packages|tr -s '[\n\t]' ' ')" > $resultfile
-#    [ -f "$resultfile" ] && rsync -a $resultfile $RSYNC_DEST/${RELEASE}/tmp/ || true
+    [ -f "$resultfile" ] && rsync -a $resultfile $RSYNC_DEST/${RELEASE}/tmp/ || true
 else
     # Something went wrong with the testbed
     errfile=results/${RELEASE}_${ARCH}_${SRC_PKG_NAME}_$(date +%Y%m%d-%H%M%S).error
     echo "$RELEASE $ARCH $SRC_PKG_NAME" > $errfile
-#    [ -f "$errfile" ] && rsync -a $errfile $RSYNC_DEST/${RELEASE}/tmp/ || true
+    [ -f "$errfile" ] && rsync -a $errfile $RSYNC_DEST/${RELEASE}/tmp/ || true
 fi
 
 exit $RET