Autopilot

Merge lp:~veebers/autopilot/legacy-lp1352889 into lp:autopilot/legacy

  1. legacy-lp1352889
  2. Merge into legacy
Proposed by Christopher Lee
Status: Merged
Approved by: Christopher Lee
Approved revision: 490
Merged at revision: 494
Proposed branch: lp:~veebers/autopilot/legacy-lp1352889
Merge into: lp:autopilot/legacy
Prerequisite: lp:~veebers/autopilot/legacy-update-from-distro
Diff against target: 12 lines (+1/-1)
1 file modified
autopilot/process/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~veebers/autopilot/legacy-lp1352889
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Autopilot Hackers Pending
Review via email: mp+230241@code.launchpad.net

This proposal supersedes a proposal from 2014-08-05.

Commit message

Rename the reference to the Mahjongg .desktop file to match the change in the Mahjongg package.

Description of the change

Rename the reference to the Mahjongg .desktop file to match the change in the Mahjongg package.

Resubmitted with build and distro fixes.

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

FAILED: Continuous integration, rev:489
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2679/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-legacy-ci/9/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Lee (veebers) wrote : Posted in a previous version of this proposal

The fix looks good to me, the failing CI doesn't. I suspect this is due to recent changes in utopic + building autopilot.
I'll take a look at that and prepare a MP that should fix it.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:490
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~veebers/autopilot/legacy-lp1352889/+merge/230241/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/12/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2845
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2845/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-legacy-ci/12/rebuild

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

FAILED: Continuous integration, rev:490
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~veebers/autopilot/legacy-lp1352889/+merge/230241/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2846
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2846/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-legacy-ci/13/rebuild

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

FAILED: Continuous integration, rev:490
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~veebers/autopilot/legacy-lp1352889/+merge/230241/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2847
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2847/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-legacy-ci/14/rebuild

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

PASSED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/276
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/180/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2904
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4611
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4611/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6827/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11291

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-legacy-ci/15/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/process/__init__.py'
2--- autopilot/process/__init__.py 2013-07-14 08:23:30 +0000
3+++ autopilot/process/__init__.py 2014-08-10 22:42:23 +0000
4@@ -43,7 +43,7 @@
5 'process-name': 'gnome-calculator',
6 },
7 'Mahjongg': {
8- 'desktop-file': 'mahjongg.desktop',
9+ 'desktop-file': 'gnome-mahjongg.desktop',
10 'process-name': 'gnome-mahjongg',
11 },
12 'Remmina': {

Subscribers

People subscribed via source and target branches