Checkbox

Merge lp://qastaging/~taihsiangho/checkbox/checkbox-150622-rollback-autostart into lp://qastaging/checkbox

checkbox-150622-rollback-autostart
Merge into trunk

Proposed by Taihsiang Ho on 2015-06-22

Status:	Merged
Approved by:	Daniel Manrique on 2015-06-23
Approved revision:	3850
Merged at revision:	3853
Proposed branch:	lp://qastaging/~taihsiangho/checkbox/checkbox-150622-rollback-autostart
Merge into:	lp://qastaging/checkbox
Diff against target:	11 lines (+1/-1) 1 file modified checkbox-ng/contrib/checkbox-ci-mailer.conf (+1/-1)
To merge this branch:	bzr merge lp://qastaging/~taihsiangho/checkbox/checkbox-150622-rollback-autostart
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel Manrique (community)			Approve on 2015-06-23
Taihsiang Ho			Approve on 2015-06-22
Review via email: mp+262559@code.qastaging.launchpad.net

Description of the change

LP: #1467393 will make the MR
https://code.launchpad.net/~taihsiangho/checkbox/checkbox-150611-rm-auto-after-minici/+merge/261807
work incorrectly because
/etc/init/checkbox-ci-mailer.conf will be removed before it sends a notification email.

This MR rollback the source code and use a workaround to stop the auto testing by rm
the auto launching flag directly for desktops.

Revision history for this message

Taihsiang Ho (taihsiangho) wrote on 2015-06-22:

emergency rollback because I want mini-ci back to work as early as possible.
self-approved.

review: Approve

Revision history for this message

Daniel Manrique (roadmr) wrote on 2015-06-22:

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message

Daniel Manrique (roadmr) wrote on 2015-06-23:

Oh, that happened because you approved and *then* pushed some more revisions, so tarmac got confused (this "There are additional revisions" message comes from tarmac, which runs under my account).

I'll reapprove and see if it merges OK this time.

review: Approve