Mir

Merge lp://qastaging/mir/0.7 into lp://qastaging/mir/ubuntu

0.7
Merge into ubuntu

Proposed by Andreas Pokorny on 2014-09-16

Status:

Merged

Approved by:

Daniel van Vugt on 2014-09-19

Approved revision:

1913

Merged at revision:

1213

Proposed branch:

lp://qastaging/mir/0.7

Merge into:

lp://qastaging/mir/ubuntu

Diff against target:

512 lines (+201/-46)

14 files modified

CMakeLists.txt (+1/-1)
cmake/EnableCoverageReport.cmake (+26/-26)
debian/changelog (+14/-0)
debian/control (+0/-2)
include/test/mir_test/auto_unblock_thread.h (+2/-2)
include/test/mir_test/cross_process_action.h (+2/-1)
include/test/mir_test_framework/display_server_test_fixture.h (+1/-1)
include/test/mir_test_framework/testing_process_manager.h (+1/-1)
src/server/frontend/socket_messenger.cpp (+21/-5)
tests/acceptance-tests/CMakeLists.txt (+1/-0)
tests/acceptance-tests/test_unresponsive_client.cpp (+122/-0)
tests/mir_test/cross_process_action.cpp (+2/-2)
tests/mir_test_framework/display_server_test_fixture.cpp (+2/-2)
tests/mir_test_framework/testing_process_manager.cpp (+6/-3)

To merge this branch:

bzr merge lp://qastaging/mir/0.7

Related bugs:

Bug #1350207: A frozen client can hang the whole server	Critical	Fix Released
Bug #1370866: Overly strict libmirplatform* dependencies are blocking CI	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2014-09-16	Approve on 2014-09-19
PS Jenkins bot (community)	continuous-integration		Approve on 2014-09-18
Cemil Azizoglu (community)			Approve on 2014-09-17
Review via email: mp+234796@code.qastaging.launchpad.net

Commit message

Mir 0.7.3 release

Description of the change

Mir 0.7.3 release

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

#

FAILED: Continuous integration, rev:1908
http://jenkins.qa.ubuntu.com/job/mir-ci/1691/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1783
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/29/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/29/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/29/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1691/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-09-17:

#

Incorrect version string:
18 +mir (0.7.3) UNRELEASED; urgency=medium
As we're packaging for Ubuntu it should be something like 0.7.3-0ubuntu1 to start with.

If you create your changelog entry with the "dch -i" command it should set this for you.

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) on 2014-09-17:

#

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

#

FAILED: Continuous integration, rev:1909
http://jenkins.qa.ubuntu.com/job/mir-ci/1692/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1796
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/30/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/30/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/30/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1692/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-09-17:

#

Arguably, r1910 should be mentioned in the changelog. Any change in a stable branch should be mentioned...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

#

PASSED: Continuous integration, rev:1910
http://jenkins.qa.ubuntu.com/job/mir-ci/1693/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1693/rebuild

review: Approve (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2014-09-17:

#

LGTM.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

#

PASSED: Continuous integration, rev:1911
http://jenkins.qa.ubuntu.com/job/mir-ci/1694/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/32/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1694/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-09-18:

#

I just noticed bug 1370866 in 0.7.2 on our build machines is blocking CI for some pending branches. We need to fix that one too.

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-09-18:

#

Fix pushed to revision 1912. Just wait for Launchpad to update, then approved.

lp://qastaging/mir/0.7 updated on 2014-09-18

1912. By Daniel van Vugt on 2014-09-18

Cherry pick bug fix LP: #1370866 from 0.8:

Relax dependencies on libmirplatform2. Any binary package that uses
libmirplatform2 should already be ABI compatible with any version of
libmirplatform2. Assuming we maintain our ABIs correctly...

Minimising exact version requirements should minimise future package
upgrade problems.

1913. By Andreas Pokorny on 2014-09-18

ping

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

#

PASSED: Continuous integration, rev:1913
http://jenkins.qa.ubuntu.com/job/mir-ci/1695/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/33/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1695/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) on 2014-09-19:

#

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-09-19:

#

*** No more changes ***

It's now in utopic-proposed: https://launchpad.net/ubuntu/+source/mir

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Mir development team