Merge lp:~fginther/ubuntu-test-cases/upstream-merger into lp:ubuntu-test-cases/touch

[Francis Ginther]

Add support for zip package archives created by jenkins.

This allows adding packages from a zip archive produced from a jenkins job. This is used for upstream merger testing where the packages under test have not landed in any PPA or ubuntu archive yet.

[Paul Larson (pwlars)]

+ echo "$NETWORK_FILE"
Maybe add a bit more text around this to make it clear what you are telling the user?

[Andy Doan (doanac)]

there also looks like there might be some tabs vs spaces troubles.

[lp:~fginther/ubuntu-test-cases/upstream-merger]

105. By Francis Ginther on 2013-11-05

Removed a debug statement and corrected reference.

106. By Francis Ginther on 2013-11-06

Add support for installing click packages and tests.

107. By Francis Ginther on 2013-11-06

Move usage of click to the android device.

108. By Francis Ginther on 2013-11-06

Fix placement of adb -s option."

109. By Francis Ginther on 2013-11-12

Add generic test runner.

Unmerged revisions

109. By Francis Ginther on 2013-11-12

Add generic test runner.

108. By Francis Ginther on 2013-11-06

Fix placement of adb -s option."

107. By Francis Ginther on 2013-11-06

Move usage of click to the android device.

106. By Francis Ginther on 2013-11-06

Add support for installing click packages and tests.

105. By Francis Ginther on 2013-11-05

Removed a debug statement and corrected reference.

104. By Francis Ginther on 2013-10-30

Add support for zip package archives.

=== added file 'scripts/click-info.py'
--- scripts/click-info.py	1970-01-01 00:00:00 +0000
+++ scripts/click-info.py	2013-11-12 14:46:32 +0000
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+
+import argparse
+import json
+import subprocess
+import sys
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(
+        description='Provides information regarding a click package')
+    parser.add_argument('--key',
+                        required=True,
+                        help='Returns the requested manifest key value.')
+    parser.add_argument('--serial',
+                        default=None,
+                        help='Specify the android device serial number.')
+    parser.add_argument('package', nargs=1,
+                        help='Click pacake to inspect')
+    return parser.parse_args()
+
+
+def get_value(key, serial, package):
+    cmd = 'adb %s shell click info %s' % (serial, package)
+    data = json.loads(subprocess.check_output(cmd, shell=True))
+    if key in data:
+        return data[key]
+    return None
+
+
+def main():
+    args = parse_arguments()
+    serial = ""
+    if args.serial:
+        serial = "-s %s" % (args.serial)
+    print(get_value(args.key, serial, args.package[0]))
+
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())

=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2013-11-08 03:13:39 +0000
+++ scripts/provision.sh	2013-11-12 14:46:32 +0000
@@ -7,6 +7,7 @@
 BASEDIR=$(dirname $(readlink -f $0))
 
 RESDIR=`pwd`/clientlogs
+ZIPDIR=`pwd`/archive
 
 NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
 
@@ -25,7 +26,10 @@
   -n    Select network file
   -P    add the ppa to the target (can be repeated)
   -p    add the package to the target (can be repeated)
+  -a    add a URL for a jenkins created zip archive of packages
   -w    make the system writeable (implied with -p and -P arguments)
+  -c    Specify the click package to install
+  -C    Specify the source directory for click tests
 
 EOF
 }
@@ -49,7 +53,7 @@
 	adb push $RESDIR/.ci-customizations /home/phablet/.ci-customizations
 }
 
-while getopts i:s:n:P:p:wh opt; do
+while getopts i:s:n:P:p:a:c:C:wh opt; do
 	case $opt in
 	h)
 		usage
@@ -74,6 +78,15 @@
 	p)
 		CUSTOMIZE="$CUSTOMIZE -p $OPTARG"
 		;;
+	a)
+		ARCHIVE="$OPTARG"
+		;;
+        c)
+		CLICK_PACKAGE="$OPTARG"
+		;;
+        C)
+		CLICK_SOURCE="$OPTARG"
+		;;
 	esac
 done
 
@@ -91,12 +104,74 @@
 set -x
 [ -d $RESDIR ] && rm -rf $RESDIR
 mkdir -p $RESDIR
-
-phablet-flash $IMAGE_OPT
-adb wait-for-device
-sleep 20  #give the system a little time
-
-phablet-click-test-setup
+[ -d $ZIPDIR ] && rm -rf $ZIPDIR
+
+# Setup the local archive bits first, exit out before flashing if it fails
+if [ -n "$ARCHIVE" ]; then
+    wget $ARCHIVE
+    ZIPNAME=`basename $ARCHIVE`
+    unzip $ZIPNAME -d $ZIPDIR
+    rm $ZIPNAME
+    if [ -d $ZIPDIR/archive/work/output ]; then
+        ARCHIVEDIR=$ZIPDIR/archive/work/output
+    elif [ -e $ZIPDIR/output ]; then
+        ARCHIVEDIR=$ZIPDIR/output
+        chmod 755 $ARCHIVEDIR
+    else
+        echo "E: Cannot find local package archive" >&2
+        exit 1
+    fi
+    cd $ARCHIVEDIR
+    dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
+    cd -
+fi
+
+if [ -n "$SKIP_FLASH" ]; then
+    echo "SKIPPING phablet-flash AS REQUESTED"
+else
+    phablet-flash $IMAGE_OPT
+    adb wait-for-device
+    sleep 20  #give the system a little time
+fi
+
+CLICK_PACKAGE_NAME=""
+CLICK_PACKAGE_SETUP=""
+if [ -n "$CLICK_PACKAGE" ]; then
+    # Copy click package to device and install
+    CLICK_SERIAL=""
+    if [ -n "$ANDROID_SERIAL" ]; then
+        CLICK_SERIAL="--serial $ANDROID_SERIAL"
+    fi
+    CLICK_BASE_NAME=`basename ${CLICK_PACKAGE}`
+    adb push "${CLICK_PACKAGE}" /home/phablet/
+    adb shell "chown phablet:phablet /home/phablet/${CLICK_BASE_NAME}"
+
+    CLICK_PACKAGE_NAME=`$BASEDIR/click-info.py $CLICK_SERIAL --key name /home/phablet/${CLICK_BASE_NAME}`
+    CLICK_PACKAGE_VERSION=`$BASEDIR/click-info.py $CLICK_SERIAL --key version /home/phablet/${CLICK_BASE_NAME}`
+    CLICK_PACKAGE_SETUP="--click ${CLICK_BASE_NAME}"
+    adb shell "click install --user phablet /home/phablet/${CLICK_BASE_NAME}"
+    adb shell "click register --user phablet ${CLICK_PACKAGE_NAME} ${CLICK_PACKAGE_VERSION}"
+fi
+
+if [ -n "$SKIP_CLICK" ]; then
+    echo "SKIPPING phablet-click-test-setup AS REQUESTED"
+else
+    phablet-click-test-setup $CLICK_PACKAGE_SETUP
+fi
+
+if [ -n "$CLICK_SOURCE" ]; then
+    # Copy click tests to device
+    # phablet-click-test-setup install tests under /home/phablet/autopilot
+    AUTOPILOTFILES=`ls ${CLICK_SOURCE}/tests/autopilot/`
+    for DIR in $AUTOPILOTFILES; do
+        if [ -d "${CLICK_SOURCE}/tests/autopilot/$DIR" ]; then
+            adb shell "rm -rf /home/phablet/autopilot/${DIR}"
+            adb push ${CLICK_SOURCE}/tests/autopilot/${DIR} /home/phablet/autopilot/${DIR}
+            adb shell "chown -R phablet:phablet /home/phablet/autopilot"
+        fi
+    done
+fi
+
 phablet-network -n $NETWORK_FILE
 
 if [ "$IMAGE_TYPE" = "touch_sf4p" ]; then
@@ -113,6 +188,14 @@
 
 image_info
 
+# Setup the provided archive on the device
+if [ -n "$ARCHIVE" ]; then
+    phablet-config writable-image
+    adb push $ARCHIVEDIR /home/phablet/archive
+    adb push ${BASEDIR}/../support/00localrepo.list /etc/apt/sources.list.d
+    adb push ${BASEDIR}/../support/local-pin-1100 /etc/apt/preferences.d
+fi
+
 if [ -n "$CUSTOMIZE" ] ; then
 	echo "= CUSTOMIZING IMAGE"
 	phablet-config writable-image $CUSTOMIZE

=== added file 'scripts/run-generic-tests.sh'
--- scripts/run-generic-tests.sh	1970-01-01 00:00:00 +0000
+++ scripts/run-generic-tests.sh	2013-11-12 14:46:32 +0000
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+set -e
+
+BASEDIR=$(dirname $(readlink -f $0))/..
+RESDIR=`pwd`/clientlogs
+
+export PATH=${BASEDIR}/utils/host:${PATH}
+export TARGET_PREFIX=adb-shell
+
+
+usage() {
+	cat <<EOF
+usage: $0 -t test-command  [-s ANDROID_SERIAL] ] [-Q] [-o results_dir] [-S]
+
+Runs a set of autopilot tests on the target
+
+OPTIONS:
+  -h    Show this message
+  -s    Specify the serial of the device to test.
+  -t    The test to execute.
+  -a    A test artifact to collect (can be repeated).
+  -o    Specify the directory to place results in.
+        Default: $RESDIR
+  -Q    "Quick" don't do a reboot of teh device before/between tests.
+  -S    Skip the system-settle tests that run before/after each test.
+
+EOF
+}
+
+system_settle() {
+	[ -z $NOSETTLE ] || return 0
+
+	label=$1
+	odir=$2
+	rc=0
+	settle=${BASEDIR}/tests/systemsettle/systemsettle.sh
+	{
+		export UTAH_PROBE_DIR=${odir}  # needed for log file location
+		timeout 120s $settle -c5 -d2 -p 97.5 -l $label || rc=1
+		echo $rc > ${odir}/settle_${label}.rc
+	} 2>&1 | tee ${odir}/settle_${label}.log
+
+	if [ "$label" = "after" ] ; then
+		${BASEDIR}/scripts/combine_results ${odir}
+	fi
+}
+
+run_test() {
+	test=$1
+
+	test_dir=`echo ${test} | cut -d" " -f1`
+	odir=${RESDIR}/${test_dir}
+	[ -d $odir ] && rm -rf $odir
+	mkdir -p $odir
+
+	system_settle before $odir
+
+	adb shell $test
+
+	system_settle after $odir
+}
+
+reboot_wait() {
+	if [ -z $QUICK ] ; then
+		${BASEDIR}/scripts/reboot-and-wait
+		adb shell 'rm -rf /var/crash/* /home/phablet/.cache/upstart/*.log'
+	else
+		echo "SKIPPING phone reboot..."
+	fi
+}
+
+collect_logs() {
+	for artifact in $ARTIFACTS; do
+		adb pull $artifact ${RESDIR}
+	done
+}
+
+main() {
+	# print the build date so the jenkins job can use it as the
+	# build description
+	BUILDID=$(adb shell cat /home/phablet/.ci-version)
+	echo "= TOUCH IMAGE VERSION:$BUILDID"
+
+	[ -d $RESDIR ] || mkdir -p $RESDIR
+
+	set -x
+
+	set +x
+	echo "========================================================"
+	echo "= testing $TEST"
+	echo "========================================================"
+	set -x
+	reboot_wait
+	run_test "$TEST"
+	collect_logs
+}
+
+while getopts s:t:a:o:QSh opt; do
+	case $opt in
+	h)
+		usage
+		exit 0
+		;;
+	s)
+		export ANDROID_SERIAL=$OPTARG
+		;;
+	o)
+		RESDIR=$OPTARG
+		;;
+	t)
+		TEST=$OPTARG
+		;;
+	a)
+		ARTIFACTS="$ARTIFACTS $OPTARG"
+		;;
+	Q)
+		QUICK=1
+		;;
+	S)
+		NOSETTLE=1
+		;;
+	esac
+done
+
+if [ -z $ANDROID_SERIAL ] ; then
+	# ensure we only have one device attached
+	lines=$(adb devices | wc -l)
+	if [ $lines -gt 3 ] ; then
+		echo "ERROR: More than one device attached, please use -s option"
+		echo
+		usage
+		exit 1
+	fi
+fi
+if [ -z "$TEST" ] ; then
+	echo "ERROR: No test specified"
+	usage
+	exit 1
+fi
+
+main

=== added directory 'support'
=== added file 'support/00localrepo.list'
--- support/00localrepo.list	1970-01-01 00:00:00 +0000
+++ support/00localrepo.list	2013-11-12 14:46:32 +0000
@@ -0,0 +1,1 @@
+deb file:/home/phablet/archive/ ./

=== added file 'support/local-pin-1100'
--- support/local-pin-1100	1970-01-01 00:00:00 +0000
+++ support/local-pin-1100	2013-11-12 14:46:32 +0000
@@ -0,0 +1,3 @@
+Package: *
+Pin: origin ""
+Pin-Priority: 1100