Merge lp:~pwlars/ubuntu-test-cases/jenkins-provision-version into lp:ubuntu-test-cases/smoke-touch-apps

[Paul Larson]

* Move the version tagging to provision.sh
* make jenkins.sh use it

[lp:~pwlars/ubuntu-test-cases/jenkins-provision-version]

88. By Paul Larson on 2013-09-03

missing quote

[Andy Doan (doanac)]

8 - BUILDID=`cat ${RESDIR}/media-info | awk '{ print $(NF)}' | sed -e 's/(//' -e 's/)//'`
9 - echo "= TOUCH BUILD DATE:$BUILDID"
10 + BUILDID=$(adb shell cat /home/phablet/.ci-version)
11 + echo "= TOUCH IMAGE VERSION:$BUILDID"

you've got spaces instead of tabs I think

[Andy Doan (doanac)]

+1 once you fix tabs/spaces

review: Approve

[lp:~pwlars/ubuntu-test-cases/jenkins-provision-version]

89. By Paul Larson on 2013-09-04

Fixes and cleanups after testing locally

=== modified file 'jenkins/jenkins.sh'
--- jenkins/jenkins.sh	2013-08-30 15:26:47 +0000
+++ jenkins/jenkins.sh	2013-09-04 03:17:16 +0000
@@ -51,7 +51,7 @@
 		--from-host \
 		--results-dir ${RESDIR} \
 		--skip-install --skip-network --skip-utah \
-                --pull /var/crash \
+		--pull /var/crash \
 		--pull /home/phablet/.cache/upstart \
 		-l ${TESTSUITE_HOST}/master.run
 }
@@ -63,8 +63,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=`cat ${RESDIR}/media-info | awk '{ print $(NF)}' | sed -e 's/(//' -e 's/)//'`
-	echo "= TOUCH BUILD DATE:$BUILDID"
+	BUILDID=$(adb shell cat /home/phablet/.ci-version)
+	echo "= TOUCH IMAGE VERSION:$BUILDID"
 
 	adb shell "top -n1 -b" > ${RESDIR}/top.log
 
@@ -91,7 +91,7 @@
 		echo "launching test from the host...."
 		test_from_host
 	fi
-        adb shell 'rm -f /var/crash/*'
+	adb shell 'rm -f /var/crash/*'
 
 	if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then
 		echo "errors found"

=== modified file 'jenkins/provision.sh'
--- jenkins/provision.sh	2013-08-21 20:24:54 +0000
+++ jenkins/provision.sh	2013-09-04 03:17:16 +0000
@@ -22,5 +22,16 @@
 
 ${UTAH_PHABLET_CMD} -s ${ANDROID_SERIAL} --results-dir ${RESDIR} --network-file=${NETWORK_FILE} ${TOUCH_IMAGE}
 
+# mark the version we installed in /home/phablet/.ci-version
+if [ -n "$TOUCH_IMAGE" ]; then
+    DEVICE_TYPE=$(adb shell "getprop ro.cm.device" |tr -d '\r')
+    bzr export utils lp:~ubuntu-system-image/ubuntu-system-image/server/utils
+    IMAGEVER=$(utils/check-latest ${DEVICE_TYPE} |sed -n 's/Current full image: \([0-9]*\).*ubuntu=\([0-9\.]*\),.*=\([0-9\.]*\))/\1:\2:\3/p')
+    rm -rf utils
+else
+    IMAGEVER=$(adb shell "cat /var/log/installer/media-info |sed 's/.*(\([0-9\.]*\))/\1/'")
+fi
+adb shell "echo '${IMAGEVER}' > /home/phablet/.ci-version"
+
 # get our target-based utilities into our PATH
 adb -s ${ANDROID_SERIAL} push ${BASEDIR}/../utils/target /usr/local/bin/