Ubuntu UI Toolkit

Merge lp:~bzoltan/ubuntu-ui-toolkit/silo_pinning into lp:ubuntu-ui-toolkit/staging

  1. silo_pinning
  2. Merge into staging
Proposed by Zoltan Balogh on 2015-09-16
Status: Merged
Approved by: Zoltan Balogh on 2015-09-16
Approved revision: 1638
Merged at revision: 1639
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/silo_pinning
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 79 lines (+19/-8)
1 file modified
tests/uitk_test_plan.sh (+19/-8)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/silo_pinning
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-09-16
Timo Jyrinki (community) 2015-09-16 Approve on 2015-09-16
Review via email: mp+271235@code.launchpad.net

Commit Message

Customize the UITK test plan and add silo pinning.

Description of the Change

Customize the UITK test plan and add silo pinning.

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Approved based on http://paste.ubuntu.com/12425794/ while Launchpad is sleeping.

review: Approve
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/uitk_test_plan.sh'
2--- tests/uitk_test_plan.sh 2015-07-13 08:04:32 +0000
3+++ tests/uitk_test_plan.sh 2015-09-16 11:29:53 +0000
4@@ -32,7 +32,7 @@
5 SERIES="vivid"
6 CHANNEL="ubuntu-touch/rc-proposed/${DISTRO}"
7 PASSWORD="0000"
8-BOOTTIME=500
9+BOOTTIME=250
10 ONLYCOMPARE=false
11 DISTUPGRADE=false
12 BOOTSTRAP=false
13@@ -56,7 +56,7 @@
14 # comment out if filemanager AP:s broken
15 # " filemanager"
16 # " ubuntu_terminal_app"
17- " -n unity8"
18+# " -n unity8"
19 " ubuntu_clock_app"
20 # " -p dialer-app-autopilot dialer_app"
21 # " -p reminders-app-autopilot reminders"
22@@ -78,7 +78,7 @@
23 reminders-app-autopilot \
24 address-book-app-autopilot \
25 # messaging-app-autopilot \
26- unity8-autopilot \
27+# unity8-autopilot \
28 dialer-app-autopilot \
29 camera-app-autopilot \
30 webbrowser-app-autopilot \
31@@ -89,6 +89,12 @@
32 ubuntu-system-settings-online-accounts-autopilot"
33 # messaging-app-autopilot \
34
35+declare -a UNREGISTERED_APPS=(
36+ "com.ubuntu.terminal"
37+ "com.ubuntu.calculator"
38+ "com.ubuntu.shorts"
39+)
40+
41 fatal_failure () {
42 echo -e "\e[31mFailed operation:\e[0m $1"
43 exit
44@@ -178,10 +184,13 @@
45 network
46 adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S reboot 2>&1|grep -v password"
47 sleep_indicator 120
48- # Required for at least rtm-14.09/mako, phablet-click-test-setup fails otherwise and we don't need terminal
49- adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S click unregister com.ubuntu.terminal 2>&1|grep -v password"
50- # Enable if calculator AP:s broken, to prevent phablet-click-test-setup trying to check out its tests.
51- #adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S click unregister com.ubuntu.calculator 2>&1|grep -v password"
52+ # Unregister few apps as they break phablet-click-test-setup or something else
53+ echo -e "Unregister few apps"
54+ for APP_TO_UNREGISTER in "${UNREGISTERED_APPS[@]}"
55+ do
56+ echo -e "\e[31m${APP_TO_UNREGISTER}\e[0m"
57+ adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S click unregister ${APP_TO_UNREGISTER} 2>&1|grep -v password"
58+ done
59 echo -e "phablet-click-test-setup \e[31m${DISTRO} ${SERIES}\e[0m"
60 phablet-click-test-setup -s ${SERIALNUMBER} --distribution=${DISTRO} --series=${SERIES} 2>&1 || fatal_failure "phablet-click-test-setup has failed"
61 echo "Sleep after phablet-click-test-setup";
62@@ -200,6 +209,9 @@
63 network
64 # TODO: hide the sudo output
65 adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S bash -c 'echo \"deb http://ppa.launchpad.net/ci-train-ppa-service/landing-${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/silo-${PPA}.list' 2>&1|grep -v password > /dev/null "
66+ # pin up the silo
67+ adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S bash -c 'echo -e \"Package: *\nPin: release o=LP-PPA-ci-train-ppa-service-landing-${PPA}\nPin-Priority: 1100\" > /etc/apt/preferences.d/silo.pref' 2>&1|grep -v password > /dev/null "
68+ # Resynchronize the package index files from their sources.
69 adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
70 else
71 echo -e "Set up with the PPA \e[31m${PPA}\e[0m"
72@@ -208,7 +220,6 @@
73 network
74 adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S bash -c 'echo \"deb http://ppa.launchpad.net/${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/testing-ppa.list' 2>&1|grep -v password > /dev/null"
75 adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
76-
77 fi
78 fi
79 adb -s ${SERIALNUMBER} shell rm -rf /home/phablet/autopilot/ubuntuuitoolkit

Subscribers

People subscribed via source and target branches