Merge lp:~doanac/ubuntu-test-cases/get-opts into lp:ubuntu-test-cases/touch

[Andy Doan]

Converts jenkins.sh and provision.sh to use getopts rather than environment variables.

NOTE: After merging this branch, we need to re-run setup_jenkins.py so that jobs call the scripts properly.

[Paul Larson (pwlars)]

114 +if [ -z $ANDROID_SERIAL ] ; then
115 + echo "ERROR: No android serial specified"
116 + usage
117 + exit 1
118 +fi

Do we really *need* to specify the serial? If there's just one device, or even if the environment variable is set, adb should "just work" right?

[Paul Larson (pwlars)]

I should clarify that... when testing things locally, it's sorta nice to be able to run without checking and specifying my adb id, if I just have a single device attached.

[Joe Talbott (joetalbott)]

On Thu, Sep 19, 2013 at 04:11:19AM -0000, Paul Larson wrote:
> I should clarify that... when testing things locally, it's sorta nice to be able to run without checking and specifying my adb id, if I just have a single device attached.

+1

> --
> https://code.launchpad.net/~doanac/ubuntu-test-cases/get-opts/+merge/186442
> Your team Ubuntu Test Case Developers is requested to review the proposed merge of lp:~doanac/ubuntu-test-cases/get-opts into lp:ubuntu-test-cases/touch.

[Andy Doan (doanac)]

On 09/19/2013 08:33 AM, Joe Talbott wrote:
> On Thu, Sep 19, 2013 at 04:11:19AM -0000, Paul Larson wrote:
>> >I should clarify that... when testing things locally, it's sorta nice to be able to run without checking and specifying my adb id, if I just have a single device attached.
> +1
>
I'll see what I can do.

[lp:~doanac/ubuntu-test-cases/get-opts]

26. By Andy Doan on 2013-09-19

make "-s ANDROID_SERIAL" optional

This also simplifies the use of adb commands in our scripts since
we can assume ANDROID_SERIAL is exported if/when its required.

[Andy Doan (doanac)]

The last commit addresses the concerns of Joe and Paul.

Paul - I'll let you merge/deploy the changes whenever you are ready for them.

review: Needs Resubmitting

[Paul Larson (pwlars)]

review: Approve

=== modified file 'jenkins/templates/touch-autopilot-base.xml.jinja2'
--- jenkins/templates/touch-autopilot-base.xml.jinja2	2013-09-13 18:05:45 +0000
+++ jenkins/templates/touch-autopilot-base.xml.jinja2	2013-09-19 15:29:16 +0000
@@ -14,7 +14,7 @@
 
 {% block apptest %}{% endblock %}
 
-FROM_HOST=1 ${BZRDIR}/scripts/jenkins.sh
+${BZRDIR}/scripts/jenkins.sh -s $ANDROID_SERIAL -a $APP
       </command>
 {% endblock %}
 

=== modified file 'jenkins/templates/touch-install-and-boot.xml.jinja2'
--- jenkins/templates/touch-install-and-boot.xml.jinja2	2013-09-18 15:29:48 +0000
+++ jenkins/templates/touch-install-and-boot.xml.jinja2	2013-09-19 15:29:16 +0000
@@ -15,14 +15,14 @@
 
 {% include "touch-setup.xml.jinja2" %}
 
-{% if system_image %}
-export TOUCH_IMAGE=--ubuntu-bootstrap
+{% if not system_image %}
+IMAGE_OPT=-D
 {% endif %}
 #Wait for images to actually show up on cdimage
 sleep 300
-${BZRDIR}/scripts/provision.sh
+${BZRDIR}/scripts/provision.sh -s $ANDROID_SERIAL $IMAGE_OPT
 
-APP="install-and-boot" FROM_HOST=1 ${BZRDIR}/scripts/jenkins.sh
+${BZRDIR}/scripts/jenkins.sh -s $ANDROID_SERIAL -a install-and-boot
       </command>
 {% endblock %}
 

=== modified file 'scripts/get-adb-id'
--- scripts/get-adb-id	2013-08-30 17:45:20 +0000
+++ scripts/get-adb-id	2013-09-19 15:29:16 +0000
@@ -20,6 +20,7 @@
 "manta-02":"R32D102RPPK",
 "manta-04":"R32D203DDZR",
 "manta-05":"R32D203DMBY",
+"mako-doanac": "00963b879612414a",
 }
 
 name = sys.argv[1]

=== modified file 'scripts/jenkins.sh'
--- scripts/jenkins.sh	2013-09-10 13:27:49 +0000
+++ scripts/jenkins.sh	2013-09-19 15:29:16 +0000
@@ -1,11 +1,6 @@
 #!/bin/bash
 
 ## This is the script jenkins should run to execute various touch applications
-## Intersting environment variables that must be set:
-##  ANDROID_SERIAL - specify another android device
-##  APP - the name of the app to test, ie share_app_autopilot
-##  QUICK - if set, skips the reboot and wait-for-network logic
-##  FROM_HOST - if set, runs the test from the host instead of the target
 
 set -e
 
@@ -15,11 +10,22 @@
 UTAHFILE=${RESDIR}/utah.yaml
 UTAH_PHABLET_CMD="${UTAH_PHABLET_CMD-/usr/share/utah/examples/run_utah_phablet.py}"
 
-ANDROID_SERIAL="${ANDROID_SERIAL-015d1884b20c1c0f}"  #doanac's nexus7 at home
-
-TESTSUITE_HOST=$(readlink -f ${BASEDIR}/tests/${APP})
-TESTSUITE_TARGET_BASE=/tmp/tests
-TESTSUITE_TARGET=${TESTSUITE_TARGET_BASE}/$(basename ${TESTSUITE_HOST})
+
+usage() {
+	cat <<EOF
+usage: $0 -a APP [-s ANDROID_SERIAL] [-T] [-Q]
+
+Provisions the given device with the latest build
+
+OPTIONS:
+  -h	Show this message
+  -s    Specify the serial of the device to install
+  -a    The application under the "tests" directory to test
+  -T    Run the utah test from the target instead of the host
+  -Q    "Quick" don't do a reboot of the device before running the test
+
+EOF
+}
 
 cleanup() {
 	set +e
@@ -35,7 +41,6 @@
 	adb shell cp /home/phablet/bin/* /usr/local/bin/
 
 	${UTAH_PHABLET_CMD} \
-		-s ${ANDROID_SERIAL} \
 		--results-dir ${RESDIR} \
 		--skip-install --skip-network --skip-utah \
 		--pull /var/crash \
@@ -44,16 +49,16 @@
 }
 
 test_from_host() {
-	export ANDROID_SERIAL   # need for utils/hosts scripts
-
 	export PATH=${BASEDIR}/utils/host:${PATH}
 
 	# allow for certain commands to run from host/target
 	# see unity8-autopilot/ts_control for example
 	export TARGET_PREFIX=adb-shell
 
+	[ -z $ANDROID_SERIAL ] || ADBOPTS="-s $ANDROID_SERIAL"
+
 	sudo TARGET_PREFIX=$TARGET_PREFIX PATH="${PATH}" ${UTAH_PHABLET_CMD} \
-		-s ${ANDROID_SERIAL} \
+		${ADBOPTS} \
 		--from-host \
 		--results-dir ${RESDIR} \
 		--skip-install --skip-network --skip-utah \
@@ -68,8 +73,8 @@
 
 	# print the build date so the jenkins job can use it as the
 	# build description
-	adb -s ${ANDROID_SERIAL} pull /var/log/installer/media-info ${RESDIR}
-	BUILDID=$(adb -s ${ANDROID_SERIAL} shell cat /home/phablet/.ci-version)
+	adb pull /var/log/installer/media-info ${RESDIR}
+	BUILDID=$(adb shell cat /home/phablet/.ci-version)
 	echo "= TOUCH IMAGE VERSION:$BUILDID"
 
 	adb shell "top -n1 -b" > ${RESDIR}/top.log
@@ -78,19 +83,19 @@
 	adb shell 'rm -f /var/crash/*'
 	if [ -z $QUICK ] ; then
 		# get the phone in sane place
-		adb -s ${ANDROID_SERIAL} reboot
+		adb reboot
 		# sometimes reboot doesn't happen fast enough, so add a little
 		# delay to help ensure its actually rebooted and we didn't just
 		# connect back to the device before it rebooted
-		adb -s ${ANDROID_SERIAL} wait-for-device
+		adb wait-for-device
 		sleep 5
-		adb -s ${ANDROID_SERIAL} wait-for-device
-		phablet-network -s ${ANDROID_SERIAL} --skip-setup
+		adb wait-for-device
+		phablet-network --skip-setup
 	else
 		echo "SKIPPING phone reboot..."
 	fi
 
-	if [ -z $FROM_HOST ] ; then
+	if [ ! -z $FROM_TARGET ] ; then
 		echo "launching test on the target...."
 		test_from_target
 	else
@@ -113,5 +118,46 @@
 	exit $EXITCODE
 }
 
+while getopts s:a:TQh opt; do
+    case $opt in
+    h)
+        usage
+        exit 0
+        ;;
+    s)
+        export ANDROID_SERIAL=$OPTARG
+        ;;
+    a)
+        APP=$OPTARG
+        ;;
+    Q)
+        QUICK=1
+        ;;
+    T)
+        FROM_TARGET=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 $APP ] ; then
+    echo "ERROR: No app specified"
+    usage
+    exit 1
+fi
+
+TESTSUITE_HOST=$(readlink -f ${BASEDIR}/tests/${APP})
+TESTSUITE_TARGET_BASE=/tmp/tests
+TESTSUITE_TARGET=${TESTSUITE_TARGET_BASE}/$(basename ${TESTSUITE_HOST})
+
 trap cleanup TERM INT EXIT
 main

=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2013-09-10 13:27:49 +0000
+++ scripts/provision.sh	2013-09-19 15:29:16 +0000
@@ -1,41 +1,82 @@
 #!/bin/bash
 
 ## This is the script jenkins should run to provision a device in the lab
-## Intersting environment variables that must be set:
-##  ANDROID_SERIAL - specify another android device
-##  NETWORK_FILE - an alternative network file if you aren't in the lab
-##  TOUCH_IMAGE=--ubuntu-bootstrap   (provision with read-only system image)
 
 set -e
-set -x
 
 BASEDIR=$(dirname $(readlink -f $0))
 
 RESDIR=`pwd`/clientlogs
+
 UTAH_PHABLET_CMD="${UTAH_PHABLET_CMD-/usr/share/utah/examples/run_utah_phablet.py}"
-
-ANDROID_SERIAL="${ANDROID_SERIAL-015d1884b20c1c0f}"  #doanac's nexus7 at home
 NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
 
+IMAGE_OPT="--ubuntu-bootstrap"
+
+usage() {
+cat <<EOF
+usage: $0 [-s ANDROID_SERIAL] [-n NETWORK_FILE] [-D]
+
+Provisions the given device with the latest build
+
+OPTIONS:
+  -h	Show this message
+  -s    Specify the serial of the device to install
+  -n    Select network file
+  -D    Use a "cdimage-touch" ie developer image rather than an ubuntu-system
+
+EOF
+}
+
+while getopts s:n:Dh opt; do
+    case $opt in
+    h)
+        usage
+        exit 0
+        ;;
+    n)
+        NETWORK_FILE=$OPTARG
+        ;;
+    s)
+	export ANDROID_SERIAL=$OPTARG
+        ;;
+    D)
+        IMAGE_OPT=""
+        ;;
+  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
+
+set -x
 rm -rf clientlogs
 mkdir clientlogs
 
-${UTAH_PHABLET_CMD} -s ${ANDROID_SERIAL} --results-dir ${RESDIR} --network-file=${NETWORK_FILE} ${TOUCH_IMAGE}
+${UTAH_PHABLET_CMD} --results-dir ${RESDIR} --network-file=${NETWORK_FILE} ${IMAGE_OPT}
 
 # mark the version we installed in /home/phablet/.ci-version
-if [ -n "$TOUCH_IMAGE" ]; then
-    DEVICE_TYPE=$(adb -s ${ANDROID_SERIAL} shell "getprop ro.cm.device" |tr -d '\r')
+if [ -n "$IMAGE_OPT" ] ; then
+    DEVICE_TYPE=$(adb shell "getprop ro.cm.device" |tr -d '\r')
     bzr export si-utils lp:~ubuntu-system-image/ubuntu-system-image/server/utils
     IMAGEVER=$(si-utils/check-latest ${DEVICE_TYPE} |sed -n 's/Current full image: \([0-9]*\).*ubuntu=\([0-9\.]*\),.*=\([0-9\.]*\))/\1:\2:\3/p')
     rm -rf si-utils
 else
-    IMAGEVER=$(adb -s ${ANDROID_SERIAL} shell "cat /var/log/installer/media-info |sed 's/.*(\([0-9\.]*\))/\1/'")
+    IMAGEVER=$(adb shell "cat /var/log/installer/media-info |sed 's/.*(\([0-9\.]*\))/\1/'")
 fi
-adb -s ${ANDROID_SERIAL} shell "echo '${IMAGEVER}' > /home/phablet/.ci-version"
+adb shell "echo '${IMAGEVER}' > /home/phablet/.ci-version"
 
 # get our target-based utilities into our PATH
-adb -s ${ANDROID_SERIAL} push ${BASEDIR}/../utils/target /home/phablet/bin
+adb push ${BASEDIR}/../utils/target /home/phablet/bin
 
 # ensure the "edges intro" is disabled so that it doesn't cause noise
 # in the system
-adb -s ${ANDROID_SERIAL} shell dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User32011 org.freedesktop.DBus.Properties.Set string:com.canonical.unity.AccountsService string:demo-edges variant:boolean:false
+adb shell dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User32011 org.freedesktop.DBus.Properties.Set string:com.canonical.unity.AccountsService string:demo-edges variant:boolean:false

=== modified file 'utils/host/adb-shell'
--- utils/host/adb-shell	2013-08-30 17:40:26 +0000
+++ utils/host/adb-shell	2013-09-19 15:29:16 +0000
@@ -10,7 +10,7 @@
 pat='ADB_RC=([[:digit:]]+)'
 
 {
-	adb -s $ANDROID_SERIAL shell "$* ; echo ADB_RC=\$?"
+	adb shell "$* ; echo ADB_RC=\$?"
 } | while read line; do
 	echo $line
 	if [[ $line =~ $pat ]] ; then