Merge lp:~sil2100/cupstream2distro-config/webapp_stack_dep_and_tweak into lp:cupstream2distro-config

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 583
Merged at revision: 583
Proposed branch: lp:~sil2100/cupstream2distro-config/webapp_stack_dep_and_tweak
Merge into: lp:cupstream2distro-config
Diff against target: 37 lines (+3/-2)
3 files modified
stacks/head/apps.cfg (+1/-0)
stacks/head/unity.cfg (+1/-1)
stacks/head/webapp.cfg (+1/-1)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/webapp_stack_dep_and_tweak
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+178512@code.launchpad.net

Commit message

Since webbrowser-app now depends on unity-webapps-qml, we need the apps stack depending on webapps stack now. Also, tweak the schedules a bit since those didn't make sense.

Description of the change

Since webbrowser-app now depends on unity-webapps-qml, we need the apps stack depending on webapps stack now. Also, tweak the schedules a bit since those didn't make sense.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

looking good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/apps.cfg'
2--- stacks/head/apps.cfg 2013-08-05 07:23:43 +0000
3+++ stacks/head/apps.cfg 2013-08-05 07:45:37 +0000
4@@ -11,6 +11,7 @@
5 - hud
6 - sdk
7 - webcred
8+ - webapp
9 test_parameters:
10 apmachines: ati intel
11 packages: unity-webapps-qml qtdeclarative5-ubuntu-ui-extras-browser-plugin-assets libunity-action-qt1 qtdeclarative5-unity-action-plugin qtdeclarative5-friends-plugin libdee-qt5-3 hud libhud2 libaccounts-qt5-1 libsignon-qt5-1 qtdeclarative5-accounts-plugin qmlscene qtdeclarative5-localstorage-plugin libqt5qml-graphicaleffects libqt5svg5 libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-ui-toolkit-theme libqt5multimedia5 libqt5multimediaquick-p5 qtdeclarative5-qtmultimedia-plugin libqt5webkit5-qmlwebkitplugin qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-extras-browser-plugin qtdeclarative5-window-plugin gallery-app notes-app webbrowser-app share-app
12
13=== modified file 'stacks/head/unity.cfg'
14--- stacks/head/unity.cfg 2013-08-03 10:39:31 +0000
15+++ stacks/head/unity.cfg 2013-08-05 07:45:37 +0000
16@@ -4,7 +4,7 @@
17 series-version: '13.10'
18 ppa: ubuntu-unity/daily-build
19 extracheck: autopilot-saucy-daily_release
20- schedule: 0 4 * * 1-7
21+ schedule: 0 5 * * 1-7
22 ci_default:
23 contact_email: "francis.ginther@canonical.com"
24 team: PS-QA
25
26=== modified file 'stacks/head/webapp.cfg'
27--- stacks/head/webapp.cfg 2013-08-01 08:27:01 +0000
28+++ stacks/head/webapp.cfg 2013-08-05 07:45:37 +0000
29@@ -4,7 +4,7 @@
30 series-version: '13.10'
31 ppa: ubuntu-unity/daily-build
32 extracheck: autopilot-saucy-daily_release
33- schedule: 0 5 * * 1-7
34+ schedule: 45 4 * * 1-7
35 test_parameters:
36 apmachines: ati intel
37 packages: hud libunity-action-qt1 qtdeclarative5-unity-action-plugin libhud-qt1 libhud2 libqt5webkit5-qmlwebkitplugin qtdeclarative5-hud1.0 qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin chromium-browser chromium-browser-l10n chromium-codecs-ffmpeg libxss1 unity-webapps-qml libunity-webapps0 unity-webapps-service unity-chromium-extension xul-ext-unity libufe-xidgetter0 xul-ext-websites-integration unity-webapps-amazon unity-webapps-amazoncloudreader unity-webapps-bbcnews unity-webapps-cnn-news unity-webapps-deezer unity-webapps-deviantart unity-webapps-facebookmessenger unity-webapps-gmail unity-webapps-googlecalendar unity-webapps-googledocs unity-webapps-googlenews unity-webapps-googleplus unity-webapps-googleplusgames unity-webapps-grooveshark unity-webapps-hulu-player unity-webapps-lastfm-radio unity-webapps-launchpad unity-webapps-librefm unity-webapps-linkedin unity-webapps-livemail unity-webapps-mail-ru unity-webapps-newsblur unity-webapps-pandora unity-webapps-qq-mail unity-webapps-reddit unity-webapps-tumblr unity-webapps-twitter unity-webapps-vkcom unity-webapps-wordpress unity-webapps-yahoomail unity-webapps-yahoonews unity-webapps-yandexmail unity-webapps-yandexmusic unity-webapps-yandexnews unity-webapps-youtube

Subscribers

People subscribed via source and target branches

to all changes: