Merge lp:~pwlars/ubuntu-test-cases/user-adb-support into lp:ubuntu-test-cases/touch

[Paul Larson]

I want to go ahead and throw this out there for review, but I'm not 100% confident in it just yet, so please don't merge *yet*.

This adds support for the upcoming changes that will make adb run as the phablet user rather than root. For CI, that means that when we turn on developer mode to get adb at all, and adb to the device, we will be running as the phablet user rather than root, and the phablet user will not come preconfigured with NOPASSWD sudo.

This MP first enables NOPASSWD sudo for the phablet user (with the assumption that we will use --password phablet for udf when it is supported). It also changes the calls to adb shell so that we make no assumptions about whether we are running as phablet or root.

I've run through it without the updated adbd and it appears to be happy with our current environment. I've also manually installed an image with the updated adbd from ogra and bypassed the udf line to have it run provision as if the image had already been installed. The only problem I hit so far on this with provision was the call to phablet-network fails because it tries to push the network config without proper permissions. Since we are relying on those tools like everyone else, I'm assuming they will be fixed up as part of the upcoming change.

[Para Siva (psivaa)]

Just one question inline, but looks fine by me otherwise.

review: Approve

=== modified file 'scripts/jenkins.sh'
--- scripts/jenkins.sh	2014-07-01 21:31:23 +0000
+++ scripts/jenkins.sh	2014-07-07 21:18:41 +0000
@@ -93,7 +93,7 @@
 	adb shell "top -n1 -b" > ${RESDIR}/top.log
 
 	set -x
-	adb shell 'rm -f /var/crash/*'
+	adb shell 'sudo rm -f /var/crash/*'
 	if [ -z $QUICK ] ; then
 		# get the phone in sane place
 		adb reboot
@@ -104,19 +104,19 @@
 		sleep 5
 		adb wait-for-device
 		phablet-network --skip-setup -t 90s
-		adb shell powerd-cli active &
+		adb shell sudo powerd-cli active &
 		PIDS="$PIDS $!"
-		adb shell powerd-cli display on &
+		adb shell sudo powerd-cli display on &
 		PIDS="$PIDS $!"
 	else
 		echo "SKIPPING phone reboot..."
 	fi
 
-	${BASEDIR}/utils/host/adb-shell "aa-clickhook -f --include=/usr/share/autopilot-touch/apparmor/click.rules"
+	${BASEDIR}/utils/host/adb-shell "sudo aa-clickhook -f --include=/usr/share/autopilot-touch/apparmor/click.rules"
 
 	echo "launching test from the host...."
 	test_from_host
-	adb shell 'rm -f /var/crash/*'
+	adb shell 'sudo rm -f /var/crash/*'
 
 	if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then
 		echo "errors found"

=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2014-06-24 20:04:02 +0000
+++ scripts/provision.sh	2014-07-07 21:18:41 +0000
@@ -34,8 +34,8 @@
 image_info() {
 	# mark the version we installed in /home/phablet/.ci-[uuid,flash-args]
 	# adb shell messes up \n's with \r\n's so do the whole of the regex on the target
-	IMAGEVER=$(adb shell "system-image-cli -i | sed -n -e 's/version version: \([0-9]*\)/\1/p' -e 's/version ubuntu: \([0-9]*\)/\1/p' -e 's/version device: \([0-9]*\)/\1/p' | paste -s -d:")
-	CHAN=$(adb shell "system-image-cli -i | sed -n -e 's/channel: \(.*\)/\1/p' | paste -s -d:")
+	IMAGEVER=$(adb shell "sudo system-image-cli -i | sed -n -e 's/version version: \([0-9]*\)/\1/p' -e 's/version ubuntu: \([0-9]*\)/\1/p' -e 's/version device: \([0-9]*\)/\1/p' | paste -s -d:")
+	CHAN=$(adb shell "sudo system-image-cli -i | sed -n -e 's/channel: \(.*\)/\1/p' | paste -s -d:")
 	REV=$(echo $IMAGEVER | cut -d: -f1)
 	echo "$IMAGE_OPT" | grep -q "\-\-revision" || IMAGE_OPT="${IMAGE_OPT} --revision $REV"
 	echo "$IMAGE_OPT" | grep -q "\-\-channel" || IMAGE_OPT="${IMAGE_OPT} --channel $CHAN"
@@ -119,6 +119,9 @@
 	${BASEDIR}/reboot-and-wait
 fi
 
+log "SETTING UP SUDO"
+adb shell "echo phablet |sudo -S bash -c 'echo phablet ALL=\(ALL\) NOPASSWD: ALL > /etc/sudoers.d/phablet && chmod 600 /etc/sudoers.d/phablet'"
+
 log "SETTING UP CLICK PACKAGES"
 phablet-click-test-setup
 
@@ -139,5 +142,5 @@
 	log "CUSTOMIZING IMAGE"
 	phablet-config writable-image $CUSTOMIZE
         # Make sure whoopsie-upload-all can work (bug #1245524)
-        adb shell "sed -i '/Waiting for whoopsie/ a\    subprocess.call([\"restart\", \"whoopsie\"])' /usr/share/apport/whoopsie-upload-all"
+        adb shell "sudo sed -i '/Waiting for whoopsie/ a\    subprocess.call([\"restart\", \"whoopsie\"])' /usr/share/apport/whoopsie-upload-all"
 fi

=== modified file 'scripts/run-autopilot-tests.sh'
--- scripts/run-autopilot-tests.sh	2014-07-01 21:31:23 +0000
+++ scripts/run-autopilot-tests.sh	2014-07-07 21:18:41 +0000
@@ -107,10 +107,10 @@
 	if [ -z $QUICK ] ; then
 		reboot-and-unlock.sh
 		FILES="/var/crash/* /home/phablet/.cache/upstart/*.log*"
-		if ! adb shell "rm -rf $FILES" ; then
+		if ! adb shell "sudo rm -rf $FILES" ; then
 			log_error "unable to remove crash and log files, retrying"
 			adb wait-for-device
-			adb shell "rm -rf $FILES"
+			adb shell "sudo rm -rf $FILES"
 		fi
 	else
 		echo "SKIPPING phone reboot..."
@@ -120,9 +120,9 @@
 if [ -z $USE_EMULATOR ] ; then
 grab_powerd() {
 	echo "grabbing powerd cli locks..."
-	adb shell powerd-cli active &
+	adb shell sudo powerd-cli active &
 	PIDS="$!"
-	adb shell powerd-cli display on &
+	adb shell sudo powerd-cli display on &
 	PIDS="$PIDS $!"
 }
 

=== modified file 'scripts/run-smoke'
--- scripts/run-smoke	2014-05-19 17:05:08 +0000
+++ scripts/run-smoke	2014-07-07 21:18:41 +0000
@@ -187,7 +187,8 @@
 
 
 def _image_info():
-    info = subprocess.check_output(['adb', 'shell', 'system-image-cli', '-i'])
+    info = subprocess.check_output(['adb', 'shell', 'sudo',
+                                    'system-image-cli', '-i'])
     v_ver = u_ver = d_ver = channel = None
     for line in info.split('\n'):
         if not line.strip():

=== modified file 'utils/target/prepare-autopilot-test.sh'
--- utils/target/prepare-autopilot-test.sh	2014-04-15 15:18:23 +0000
+++ utils/target/prepare-autopilot-test.sh	2014-07-07 21:18:41 +0000
@@ -8,7 +8,7 @@
 	MISSING=0
 	dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
 	if [ $MISSING -eq 1 ] ; then
-		apt-get install -yq --force-yes $PKGS
+		sudo apt-get install -yq --force-yes $PKGS
 	else
 		echo "setup not needed"
 	fi