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

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 532
Merged at revision: 537
Proposed branch: lp:~sil2100/cupstream2distro-config/daily_release_stuff
Merge into: lp:cupstream2distro-config
Diff against target: 107 lines (+34/-20)
5 files modified
stacks/head/indicators.cfg (+1/-2)
stacks/head/phone.cfg (+1/-1)
stacks/head/sdk.cfg (+0/-16)
stacks/head/webcred.cfg (+0/-1)
stacks/no-dailies/sdk.cfg (+32/-0)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/daily_release_stuff
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+175603@code.launchpad.net

Commit message

Enable indicator-location and webaccounts-browser-extension for daily-release, move ubuntu-ui-extras to no-dailies as we're not releasing this one, but autolanding jobs might be useful in the nearest future

Description of the change

Enable indicator-location and webaccounts-browser-extension for daily-release, move ubuntu-ui-extras to no-dailies as we're not releasing this one, but autolanding jobs might be useful in the nearest future

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Ok, looks good, can you try to install the indicator-location package during tests? (to at least ensure not everything will explode as with indicator-network in the past). You will need to add emerillon I guess with geoip.

Ah, would be great to have:
https://code.launchpad.net/~didrocks/indicator-location/small-rules-simplification/+merge/175737
pushed as well :)

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Checked, indicator-location didn't break anything in my system ;) It was just standing there in the indicators.

532. By Łukasz Zemczak

Add indicator-location to packages, along with its deps

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

perfect, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stacks/head/indicators.cfg'
--- stacks/head/indicators.cfg 2013-07-16 13:16:32 +0000
+++ stacks/head/indicators.cfg 2013-07-19 10:04:26 +0000
@@ -19,7 +19,7 @@
19 test_parameters:19 test_parameters:
20 apmachines: ati intel20 apmachines: ati intel
21 # remove indicator-netwok from the packages to tests, it's making the whole panel segfaulting21 # remove indicator-netwok from the packages to tests, it's making the whole panel segfaulting
22 packages: gir1.2-dbusmenu-glib-0.4 bamfdaemon indicator-datetime indicator-messages indicator-application libindicator7 indicator-sound libmessaging-menu0 indicator-printers indicator-power appmenu-qt gir1.2-messagingmenu-1.0 indicator-appmenu libindicator3-7 libbamf3-1 libsync-menu1 libido3-0.1-0 gir1.2-syncmenu-0.1 libido3-0.1-0 libdbusmenu-glib4 indicator-bluetooth telepathy-indicator python-appindicator libappindicator3-1 libappindicator1 gir1.2-appindicator3-0.1 libdbusmenu-qt5 appmenu-qt5 libqmenumodel0 unity-gtk3-module unity-gtk-module-common libunity-gtk3-parser0 unity-gtk2-module libunity-gtk2-parser022 packages: indicator-location emerillon libchamplain-0.12-0 libchamplain-gtk-0.12-0 geoclue-ubuntu-geoip gir1.2-dbusmenu-glib-0.4 bamfdaemon indicator-datetime indicator-messages indicator-application libindicator7 indicator-sound libmessaging-menu0 indicator-printers indicator-power appmenu-qt gir1.2-messagingmenu-1.0 indicator-appmenu libindicator3-7 libbamf3-1 libsync-menu1 libido3-0.1-0 gir1.2-syncmenu-0.1 libido3-0.1-0 libdbusmenu-glib4 indicator-bluetooth telepathy-indicator python-appindicator libappindicator3-1 libappindicator1 gir1.2-appindicator3-0.1 libdbusmenu-qt5 appmenu-qt5 libqmenumodel0 unity-gtk3-module unity-gtk-module-common libunity-gtk3-parser0 unity-gtk2-module libunity-gtk2-parser0
23 testpackages: python-autopilot autopilot-desktop recordmydesktop unity-autopilot unity-gtk-module-autopilot23 testpackages: python-autopilot autopilot-desktop recordmydesktop unity-autopilot unity-gtk-module-autopilot
24 tests: unity.tests.test_panel.PanelCrossMonitorsTests.test_hovering_indicators_on_multiple_monitors unity.tests.test_panel.PanelHoverTests.test_hovering_indicators_open_menus unity.tests.test_panel.PanelHoverTests.test_hovering_over_indicators_does_not_show_app_menus unity.tests.test_panel.PanelHoverTests.test_menus_and_btns_hidden_with_mouse_over_indicators unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_closes_on_click_outside unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_closes_on_click unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_on_click unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_next_works unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_prev_works unity.tests.test_panel.PanelWindowButtonsTests.test_window_buttons_show_when_indicator_active_and_mouse_over_panel unity.tests.test_gobject_introspection unity_gtk_module chewie_client24 tests: unity.tests.test_panel.PanelCrossMonitorsTests.test_hovering_indicators_on_multiple_monitors unity.tests.test_panel.PanelHoverTests.test_hovering_indicators_open_menus unity.tests.test_panel.PanelHoverTests.test_hovering_over_indicators_does_not_show_app_menus unity.tests.test_panel.PanelHoverTests.test_menus_and_btns_hidden_with_mouse_over_indicators unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_closes_on_click_outside unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_closes_on_click unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_on_click unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_next_works unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_prev_works unity.tests.test_panel.PanelWindowButtonsTests.test_window_buttons_show_when_indicator_active_and_mouse_over_panel unity.tests.test_gobject_introspection unity_gtk_module chewie_client
25 projects:25 projects:
@@ -45,7 +45,6 @@
45 archive_artifacts: '**/results/**'45 archive_artifacts: '**/results/**'
46 publish_coverage: '**/results/coverage.xml'46 publish_coverage: '**/results/coverage.xml'
47 indicator-location:47 indicator-location:
48 daily_release: False
49 indicator-messages:48 indicator-messages:
50 hooks: B10gcovr_run H10enable_coverage D10install_lcov49 hooks: B10gcovr_run H10enable_coverage D10install_lcov
51 archive_artifacts: '**/results/**'50 archive_artifacts: '**/results/**'
5251
=== modified file 'stacks/head/phone.cfg'
--- stacks/head/phone.cfg 2013-07-19 07:59:12 +0000
+++ stacks/head/phone.cfg 2013-07-19 10:04:26 +0000
@@ -84,7 +84,7 @@
84 aggregate_tests: generic-mediumtests-saucy84 aggregate_tests: generic-mediumtests-saucy
85 archive_artifacts: '**/*test*.xml'85 archive_artifacts: '**/*test*.xml'
86 publish_junit: '**/*test*.xml'86 publish_junit: '**/*test*.xml'
87 daily_release: False87 daily_release: False # This is deprecated, project will be removed once other phone bits are mature
88 hooks: D09add_ppa~phablet-team~ppa B09googletests B10gcovr_run H10enable_coverage D10install_lcov A10checklicenseheaders88 hooks: D09add_ppa~phablet-team~ppa B09googletests B10gcovr_run H10enable_coverage D10install_lcov A10checklicenseheaders
89 history-service:89 history-service:
90 configurations:90 configurations:
9191
=== modified file 'stacks/head/sdk.cfg'
--- stacks/head/sdk.cfg 2013-07-19 04:38:42 +0000
+++ stacks/head/sdk.cfg 2013-07-19 10:04:26 +0000
@@ -81,22 +81,6 @@
81 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'81 archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
82 dee-qt:82 dee-qt:
83 contact_email: allan.lesage@canonical.com83 contact_email: allan.lesage@canonical.com
84 ubuntu-ui-extras:
85 contact_email: omer.akram@canonical.com
86 daily_release: False
87 hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov
88 test_suite: ubuntu_ui_extras
89 archive_artifacts: '**/results/coverage.xml'
90 publish_coverage: '**/results/coverage.xml'
91 aggregate_tests: generic-mediumtests-saucy saucy-amd64
92 configurations:
93 saucy-armhf:
94 node_label: panda-pbuilder
95 archive_artifacts: '**/output/*deb'
96 publish_junit: False
97 publish_coverage: False
98 generic-mediumtests-saucy:
99 template: False
100 ubuntu-html5-theme:84 ubuntu-html5-theme:
101 contact_email: victor.ruiz@canonical.com85 contact_email: victor.ruiz@canonical.com
102 hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicense3party86 hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicense3party
10387
=== modified file 'stacks/head/webcred.cfg'
--- stacks/head/webcred.cfg 2013-06-25 12:25:34 +0000
+++ stacks/head/webcred.cfg 2013-07-19 10:04:26 +0000
@@ -40,5 +40,4 @@
40 signon-ui:40 signon-ui:
41 hooks: D09add_ppa~online-accounts~trunk H10enable_coverage D10install_lcov B09qmakecoverage41 hooks: D09add_ppa~online-accounts~trunk H10enable_coverage D10install_lcov B09qmakecoverage
42 webaccounts-browser-extension:42 webaccounts-browser-extension:
43 daily_release: False
44 uoa-integration-tests:43 uoa-integration-tests:
4544
=== added file 'stacks/no-dailies/sdk.cfg'
--- stacks/no-dailies/sdk.cfg 1970-01-01 00:00:00 +0000
+++ stacks/no-dailies/sdk.cfg 2013-07-19 10:04:26 +0000
@@ -0,0 +1,32 @@
1stack:
2 name: sdk
3 series: saucy
4 #ppa: ubuntu-unity/daily-build-next
5 #dest: ubuntu-unity/next
6 #extracheck: ps-generic-autopilot-release-testing
7 #schedule: 0 4 * * 1-5
8 ci_default:
9 configurations:
10 saucy-amd64:
11 template: pbuilder-config.xml.tmpl
12 node_label: pbuilder
13 saucy-armhf:
14 template: pbuilder-config.xml.tmpl
15 node_label: panda-pbuilder
16 projects:
17 ubuntu-ui-extras:
18 contact_email: omer.akram@canonical.com
19 daily_release: False
20 hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov
21 test_suite: ubuntu_ui_extras
22 archive_artifacts: '**/results/coverage.xml'
23 publish_coverage: '**/results/coverage.xml'
24 aggregate_tests: generic-mediumtests-saucy saucy-amd64
25 configurations:
26 saucy-armhf:
27 node_label: panda-pbuilder
28 archive_artifacts: '**/output/*deb'
29 publish_junit: False
30 publish_coverage: False
31 generic-mediumtests-saucy:
32 template: False

Subscribers

People subscribed via source and target branches

to all changes: