Checkbox

Merge lp:~cypressyew/checkbox/ppa-packaging-checkbox-ci-loop into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-ci-loop

  1. ppa-packaging-checkbox-ci-loop
  2. Merge into ppa-packaging-checkbox-ci-...
Proposed by Po-Hsu Lin
Status: Merged
Approved by: Po-Hsu Lin
Approved revision: 3
Merged at revision: 3
Proposed branch: lp:~cypressyew/checkbox/ppa-packaging-checkbox-ci-loop
Merge into: lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-ci-loop
Diff against target: 16 lines (+4/-0)
2 files modified
debian/checkbox-autostart-server.install (+1/-0)
debian/checkbox-ci-mailer.install (+3/-0)
To merge this branch: bzr merge lp:~cypressyew/checkbox/ppa-packaging-checkbox-ci-loop
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Po-Hsu Lin Needs Resubmitting
Review via email: mp+257853@code.launchpad.net

This proposal supersedes a proposal from 2015-04-30.

Description of the change

With new service files added for systemd compatibility and CI script moved out from the conf file, we will need to add them into the checkbox-ci-mailer.install file.

See this merge for the systemd compatibility patch:
https://code.launchpad.net/~cypressyew/checkbox/ci-systemd-compability/+merge/257851

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote : Posted in a previous version of this proposal

Hey. I'll read the rest but the copyright is bogus-ish. Please look below.

review: Needs Fixing
Revision history for this message
Po-Hsu Lin (cypressyew) wrote : Posted in a previous version of this proposal

Weird, I didn't touch any bit other than the checkbox-ci-mailer.install file

Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Ahhh, it looks like I selected a wrong target branch.

Proposal resubmitted.

review: Needs Resubmitting
Revision history for this message
Zygmunt Krynicki (zyga) wrote : Posted in a previous version of this proposal

Ah

Bad target branch?

Revision history for this message
Po-Hsu Lin (cypressyew) wrote : Posted in a previous version of this proposal

Yes, please refer to https://code.launchpad.net/~cypressyew/checkbox/ppa-packaging-checkbox-ci-loop/+merge/257853

lp:~cypressyew/checkbox/ppa-packaging-checkbox-ci-loop updated
3. By Po-Hsu Lin

add service files for systemd compatibility

Add new services files for desktop/server systemd compatibility on
Vivid, and put the CI script into /etc/default as the script is moved
out of the conf file in checkbox.

Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Including the service file for server CI testing.

review: Needs Resubmitting
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1, let's merge it

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/checkbox-autostart-server.install'
2--- debian/checkbox-autostart-server.install 2014-03-27 16:41:21 +0000
3+++ debian/checkbox-autostart-server.install 2015-04-30 09:40:40 +0000
4@@ -1,1 +1,2 @@
5 checkbox-ng/contrib/checkbox-sru.conf etc/init
6+checkbox-ng/contrib/checkbox-sru.service lib/systemd/system
7
8=== modified file 'debian/checkbox-ci-mailer.install'
9--- debian/checkbox-ci-mailer.install 2014-11-06 03:15:47 +0000
10+++ debian/checkbox-ci-mailer.install 2015-04-30 09:40:40 +0000
11@@ -1,2 +1,5 @@
12 checkbox-ng/contrib/checkbox-ci-mailer.conf etc/init
13 checkbox-ng/contrib/checkbox-ci-installed-notifier.conf etc/init
14+checkbox-ng/contrib/checkbox-ci-mailer.service lib/systemd/system
15+checkbox-ng/contrib/checkbox-ci-installed-notifier.service lib/systemd/system
16+checkbox-ng/contrib/checkbox-ci-script.sh usr/bin

Subscribers

People subscribed via source and target branches