Merge lp:~didrocks/cupstream2distro-config/move-unity-notifications into lp:cupstream2distro-config

Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Francis Ginther
Approved revision: 450
Merged at revision: 449
Proposed branch: lp:~didrocks/cupstream2distro-config/move-unity-notifications
Merge into: lp:cupstream2distro-config
Diff against target: 45 lines (+9/-8)
2 files modified
stacks/head/mir.cfg (+9/-1)
stacks/phablet/shell.cfg (+0/-7)
To merge this branch: bzr merge lp:~didrocks/cupstream2distro-config/move-unity-notifications
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Sergio Schvezov Pending
Review via email: mp+170389@code.launchpad.net

Commit message

Move unity-notification to head/misc to have it under daily release

Description of the change

Move unity-notification to head/misc to have it under daily release

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
Francis Ginther (fginther) wrote :

unity-notifications is missing the "node_label" parameter that was defined in the phablet/shell.cfg ci_default section. The new block should be:

    unity-notifications:
      hooks: H10enable_coverage B10gcovr_run
      configurations:
        saucy-armhf:
          node_label: panda-pbuilder
          archive_artifacts: '**/coverage*.xml, **/output/*deb'
      archive_artifacts: '**/coverage*.xml'
      publish_coverage: '**/coverage*.xml'

Also the old job used 'phablet-land' to dput the packages into the phablet PPAs. Therefore, I would like Sergio to sign off on this change.

review: Needs Fixing
450. By Didier Roche-Tolomelli

fix missing node-label

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

@Francis: fix pushed. I would say that we could merge this, as this component will be in distro then, and so, won't need any ppa

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

Thanks for the fix. Ok, on pushing to distro.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Jobs have been deployed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stacks/head/mir.cfg'
--- stacks/head/mir.cfg 2013-06-19 09:15:17 +0000
+++ stacks/head/mir.cfg 2013-06-19 16:58:25 +0000
@@ -3,7 +3,7 @@
3 series: raring3 series: raring
4 ppa: ubuntu-unity/daily-build-next4 ppa: ubuntu-unity/daily-build-next
5 dest: ubuntu-unity/next5 dest: ubuntu-unity/next
6 extracheck: autopilot-saucy-daily_release6 extracheck: False # autopilot-saucy-daily_release
7 schedule: 1 0 * * 1-77 schedule: 1 0 * * 1-7
8 dependencies:8 dependencies:
9 - qa9 - qa
@@ -65,6 +65,14 @@
65 contact_email: thomi.richards@canonical.com francis.ginther@canonical.com65 contact_email: thomi.richards@canonical.com francis.ginther@canonical.com
66 hooks: H05set_package_version D00mbs_archive D08add_ppa-qt5-proper D09add_ppa-mir-team-staging66 hooks: H05set_package_version D00mbs_archive D08add_ppa-qt5-proper D09add_ppa-mir-team-staging
67 daily_release: False67 daily_release: False
68 unity-notifications:
69 hooks: H10enable_coverage B10gcovr_run
70 configurations:
71 saucy-armhf:
72 node_label: panda-pbuilder
73 archive_artifacts: '**/coverage*.xml, **/output/*deb'
74 archive_artifacts: '**/coverage*.xml'
75 publish_coverage: '**/coverage*.xml'
68 unity-system-compositor:76 unity-system-compositor:
69 daily_release: False77 daily_release: False
70 contact_email: thomi.richards@canonical.com francis.ginther@canonical.com78 contact_email: thomi.richards@canonical.com francis.ginther@canonical.com
7179
=== modified file 'stacks/phablet/shell.cfg'
--- stacks/phablet/shell.cfg 2013-06-19 08:26:33 +0000
+++ stacks/phablet/shell.cfg 2013-06-19 16:58:25 +0000
@@ -84,13 +84,6 @@
84 CCACHE_DISABLE: 184 CCACHE_DISABLE: 1
85 autolanding:85 autolanding:
86 CCACHE_DISABLE: 186 CCACHE_DISABLE: 1
87 unity-notifications:
88 hooks: H10enable_coverage B10gcovr_run
89 configurations:
90 saucy-armhf:
91 archive_artifacts: '**/coverage*.xml, **/output/*deb'
92 archive_artifacts: '**/coverage*.xml'
93 publish_coverage: '**/coverage*.xml'
94 libunity:87 libunity:
95 target_branch: lp:libunity/phablet88 target_branch: lp:libunity/phablet
96 build_timeout: 36089 build_timeout: 360

Subscribers

People subscribed via source and target branches

to all changes: