Mir

Merge lp://qastaging/~alan-griffiths/mir/experimenting-with-ci into lp://qastaging/mir

  1. experimenting-with-ci
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Work in progress
Proposed branch: lp://qastaging/~alan-griffiths/mir/experimenting-with-ci
Merge into: lp://qastaging/mir
Diff against target: 1267 lines (+3/-623)
42 files modified
include/client/mir_toolkit/mir_prompt_session.h (+0/-10)
include/server/mir/frontend/session_mediator_report.h (+0/-2)
include/server/mir/frontend/shell.h (+0/-2)
include/server/mir/scene/prompt_session_manager.h (+0/-14)
include/server/mir/shell/session_coordinator_wrapper.h (+0/-4)
include/shared/mir_toolkit/client_types.h (+0/-9)
include/test/mir_test/test_protobuf_client.h (+0/-5)
include/test/mir_test_doubles/mock_shell.h (+0/-3)
include/test/mir_test_doubles/null_prompt_session_manager.h (+0/-9)
include/test/mir_test_doubles/stub_shell.h (+0/-5)
src/client/mir_prompt_session.cpp (+0/-31)
src/client/mir_prompt_session.h (+0/-4)
src/client/mir_prompt_session_api.cpp (+0/-39)
src/server/frontend/no_prompt_shell.cpp (+0/-7)
src/server/frontend/no_prompt_shell.h (+0/-4)
src/server/frontend/protobuf_message_processor.cpp (+0/-4)
src/server/frontend/session_mediator.cpp (+0/-24)
src/server/frontend/session_mediator.h (+0/-5)
src/server/frontend/shell_wrapper.cpp (+0/-7)
src/server/frontend/shell_wrapper.h (+0/-4)
src/server/report/logging/session_mediator_report.cpp (+0/-5)
src/server/report/logging/session_mediator_report.h (+0/-2)
src/server/report/lttng/session_mediator_report.cpp (+0/-5)
src/server/report/lttng/session_mediator_report.h (+0/-1)
src/server/report/lttng/session_mediator_report_tp.h (+0/-10)
src/server/report/null/session_mediator_report.cpp (+0/-4)
src/server/report/null/session_mediator_report.h (+0/-2)
src/server/scene/prompt_session_container.cpp (+0/-43)
src/server/scene/prompt_session_container.h (+0/-37)
src/server/scene/prompt_session_manager_impl.cpp (+0/-45)
src/server/scene/prompt_session_manager_impl.h (+0/-12)
src/server/scene/session_manager.cpp (+0/-11)
src/server/scene/session_manager.h (+0/-2)
src/server/shell/session_coordinator_wrapper.cpp (+0/-7)
src/shared/protobuf/mir_protobuf.proto (+0/-5)
tests/acceptance-tests/test_nested_mir.cpp (+0/-1)
tests/acceptance-tests/test_prompt_session_client_api.cpp (+2/-59)
tests/integration-tests/frontend/test_application_mediator_report.cpp (+0/-61)
tests/mir_test_doubles/test_protobuf_client.cpp (+0/-8)
tests/unit-tests/client/test_mir_prompt_session.cpp (+0/-16)
tests/unit-tests/scene/test_prompt_session_container.cpp (+0/-44)
tests/unit-tests/scene/test_prompt_session_manager.cpp (+1/-51)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/experimenting-with-ci
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mir development team Pending
Review via email: mp+226486@code.qastaging.launchpad.net

Commit message

*EXPERIMENT WITH CI* - don't bother reviewing

Description of the change

*EXPERIMENT WITH CI* - don't bother reviewing

In https://code.launchpad.net/~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync/+merge/226177 things started failing on mako when I bumped the client ABI/so number.

So testing whether that is the problem being seen on that branch.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1767
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/921
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/659
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/659/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/657
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/657/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2979
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2979/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2061
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9713

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2138/rebuild

review: Approve (continuous-integration)
Reply

Unmerged revisions

1767. By Alan Griffiths

Merge the guts of lp:~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync

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