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

Proposed by Po-Hsu Lin
Status: Superseded
Proposed branch: lp:~cypressyew/checkbox/ppa-packaging-checkbox-ci-loop
Merge into: lp:checkbox
Diff against target: 149 lines (+103/-0)
9 files modified
debian/changelog (+11/-0)
debian/checkbox-autostart-desktop.install (+1/-0)
debian/checkbox-autostart-server.install (+1/-0)
debian/checkbox-ci-mailer.install (+5/-0)
debian/compat (+1/-0)
debian/control (+41/-0)
debian/copyright (+33/-0)
debian/rules (+9/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~cypressyew/checkbox/ppa-packaging-checkbox-ci-loop
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Needs Fixing
Review via email: mp+257852@code.launchpad.net

This proposal has been superseded by 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 :

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 :

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

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

Ah

Bad target branch?

Revision history for this message
Po-Hsu Lin (cypressyew) wrote :
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.

Unmerged revisions

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.

2. By Taihsiang Ho

"automatic merge of lp:~taihsiangho/checkbox/ppa-packaging-checkbox-ci-loop-141106/ by tarmac [r=sylvain-pineau][bug=][author=taihsiangho]"

1. By Zygmunt Krynicki

Initial import

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== added file 'debian/changelog'
3--- debian/changelog 1970-01-01 00:00:00 +0000
4+++ debian/changelog 2015-04-30 06:47:55 +0000
5@@ -0,0 +1,11 @@
6+checkbox-ci-loop (0.2) UNRELEASED; urgency=medium
7+
8+ * add checkbox-ci-installed-notifier.conf in checkbox-ci-mailer
9+
10+ -- Taihsiang Ho (tai271828) <taihsiang.ho@canonical.com> Thu, 06 Nov 2014 11:09:19 +0800
11+
12+checkbox-ci-loop (0.1) unstable; urgency=medium
13+
14+ * fork from the monolithic packaging we used to have
15+
16+ -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Thu, 27 Mar 2014 16:52:08 +0100
17
18=== added file 'debian/checkbox-autostart-desktop.install'
19--- debian/checkbox-autostart-desktop.install 1970-01-01 00:00:00 +0000
20+++ debian/checkbox-autostart-desktop.install 2015-04-30 06:47:55 +0000
21@@ -0,0 +1,1 @@
22+checkbox-ng/contrib/checkbox-sru.desktop etc/xdg/autostart
23
24=== added file 'debian/checkbox-autostart-server.install'
25--- debian/checkbox-autostart-server.install 1970-01-01 00:00:00 +0000
26+++ debian/checkbox-autostart-server.install 2015-04-30 06:47:55 +0000
27@@ -0,0 +1,1 @@
28+checkbox-ng/contrib/checkbox-sru.conf etc/init
29
30=== added file 'debian/checkbox-ci-mailer.install'
31--- debian/checkbox-ci-mailer.install 1970-01-01 00:00:00 +0000
32+++ debian/checkbox-ci-mailer.install 2015-04-30 06:47:55 +0000
33@@ -0,0 +1,5 @@
34+checkbox-ng/contrib/checkbox-ci-mailer.conf etc/init
35+checkbox-ng/contrib/checkbox-ci-installed-notifier.conf etc/init
36+checkbox-ng/contrib/checkbox-ci-mailer.service lib/systemd/system
37+checkbox-ng/contrib/checkbox-ci-installed-notifier.service lib/systemd/system
38+checkbox-ng/contrib/checkbox-ci-script.sh etc/default
39
40=== added file 'debian/compat'
41--- debian/compat 1970-01-01 00:00:00 +0000
42+++ debian/compat 2015-04-30 06:47:55 +0000
43@@ -0,0 +1,1 @@
44+9
45
46=== added file 'debian/control'
47--- debian/control 1970-01-01 00:00:00 +0000
48+++ debian/control 2015-04-30 06:47:55 +0000
49@@ -0,0 +1,41 @@
50+Source: checkbox-ci-loop
51+Section: utils
52+Priority: optional
53+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
54+Standards-Version: 3.9.3
55+Build-Depends: debhelper (>= 9.2),
56+Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/ppa-packaging-checkbox-ci-loop
57+
58+Package: checkbox-autostart-desktop
59+Architecture: all
60+Depends:
61+ checkbox-ng,
62+ plainbox-insecure-policy
63+Description: Automatic system testing for desktop systems
64+ Installing this package will automatically invoke 'checkbox sru' after the
65+ desktop session is started. This package should be only installed in automated
66+ testing environment.
67+
68+Package: checkbox-autostart-server
69+Architecture: all
70+Depends:
71+ checkbox-ng,
72+ plainbox-insecure-policy,
73+ upstart
74+Description: Automatic system testing for server systems
75+ Installing this package will automatically invoke 'checkbox sru' after a
76+ server installation finishes booting. This package should be only installed in
77+ automated testing environment.
78+
79+Package: checkbox-ci-mailer
80+Architecture: all
81+Depends:
82+ checkbox-autostart-server | checkbox-autostart-desktop,
83+ curl,
84+ upstart,
85+Description: Automatic system testing CI loop
86+ This packages submits results of system testing (performed by
87+ checkbox-autostart-server or checkbox-autostart-desktop) every time system
88+ testing is finished. The report will be POSTed to $SUBMIT_CGI which can be
89+ configured using the /etc/default/plainbox-ci-mailer configuration file. This
90+ package should be only installed in automated testing environment.
91
92=== added file 'debian/copyright'
93--- debian/copyright 1970-01-01 00:00:00 +0000
94+++ debian/copyright 2015-04-30 06:47:55 +0000
95@@ -0,0 +1,33 @@
96+This package was debianized by Marc Tardif <marc.tardif@canonical.com> Mon,
97+17 Sep 2007 17:25:54 -0300.
98+
99+It was downloaded from http://launchpad.net/checkbox
100+
101+Upstream Authors:
102+ Marc Tardif <marc.tardif@canonical.com>
103+ Christian Reis <christian.reis@canonical.com>
104+ David Murphy <david.murphy@canonical.com>
105+ Martin Pitt <martin.pitt@ubuntu.com>
106+ Gustavo Niemeyer <gustavo@niemeyer.net>
107+
108+Copyright:
109+ Copyright 2008 Canonical Ltd.
110+ Copyright 2006 Gustavo Niemeyer
111+
112+License:
113+
114+ This package is free software: you can redistribute it and/or modify
115+ it under the terms of the GNU General Public License as published by
116+ the Free Software Foundation, either version 3 of the License, or
117+ (at your option) any later version.
118+
119+ This program is distributed in the hope that it will be useful,
120+ but WITHOUT ANY WARRANTY; without even the implied warranty of
121+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
122+ GNU General Public License for more details.
123+
124+ You should have received a copy of the GNU General Public License
125+ along with this program. If not, see <http://www.gnu.org/licenses/>.
126+
127+On Debian systems, the complete text of the GNU General
128+Public License can be found in `/usr/share/common-licenses/GPL'.
129
130=== added file 'debian/rules'
131--- debian/rules 1970-01-01 00:00:00 +0000
132+++ debian/rules 2015-04-30 06:47:55 +0000
133@@ -0,0 +1,9 @@
134+#!/usr/bin/make -f
135+%:
136+ dh "$@"
137+
138+override_dh_auto_clean:
139+
140+override_dh_auto_build:
141+
142+override_dh_auto_install:
143
144=== added directory 'debian/source'
145=== added file 'debian/source/format'
146--- debian/source/format 1970-01-01 00:00:00 +0000
147+++ debian/source/format 2015-04-30 06:47:55 +0000
148@@ -0,0 +1,1 @@
149+3.0 (native)

Subscribers

People subscribed via source and target branches