Merge lp:~javier.collado/checkbox/bug931954 into lp:checkbox

Proposed by Javier Collado
Status: Merged
Merged at revision: 1244
Proposed branch: lp:~javier.collado/checkbox/bug931954
Merge into: lp:checkbox
Diff against target: 43 lines (+6/-8)
2 files modified
debian/changelog (+5/-1)
jobs/miscellanea.txt.in (+1/-7)
To merge this branch: bzr merge lp:~javier.collado/checkbox/bug931954
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+92988@code.launchpad.net

Description of the change

This change:

- removes "miscellanea/check_and_install_ipmitool" job that installs "ipmitool" package
- removes "miscellanea/check_and_install_ipmitool" dependency in "miscellanea/ipmi_test"
- adds "ipmitool" package requirement in "miscellanea/ipmi_test"

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

There seems to be a spurious line in the changelog but I'll fix that when merging. Otherwise, looks good and I'll review the corresponding merge request in checkbox-certification. Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-02-10 17:54:25 +0000
3+++ debian/changelog 2012-02-14 14:06:11 +0000
4@@ -1,5 +1,6 @@
5 checkbox (0.13.2) precise; urgency=low
6
7+ [ Daniel Manrique ]
8 [Jeff Lane]
9 * Added a Hard Disk Stats Test that was part of a much older merge request
10 for server test suite.
11@@ -25,7 +26,10 @@
12 prettified tabs and updated Launchpad email text amongst other UI tweaks
13 in qt/frontend/qtfront.ui
14
15- -- Daniel Manrique <daniel.manrique@canonical.com> Mon, 06 Feb 2012 14:55:58 -0500
16+ [ Javier Collado ]
17+ * Removed job that installed ipmitool by default (LP: #931954)
18+
19+ -- Javier Collado <javier.collado@canonical.com> Tue, 14 Feb 2012 10:26:54 +0100
20
21 checkbox (0.13.1) precise; urgency=low
22
23
24=== modified file 'jobs/miscellanea.txt.in'
25--- jobs/miscellanea.txt.in 2012-02-03 21:29:06 +0000
26+++ jobs/miscellanea.txt.in 2012-02-14 14:06:11 +0000
27@@ -23,15 +23,9 @@
28 command:
29 fwts_test -l $CHECKBOX_DATA/fwts_results.log
30
31-plugin: local
32-name: miscellanea/check_and_install_ipmitool
33-user: root
34-command: dpkg -l | grep -iq 'ipmitool' || apt-get install -y ipmitool >/dev/null 2>&1
35-_description: ipmitool is required for ipmi testing. This checks for ipmitool and installs it if not available.
36-
37 plugin: shell
38 name: miscellanea/ipmi_test
39-depends: miscellanea/check_and_install_ipmitool
40+requires: package.name == 'ipmitool'
41 user: root
42 command: ipmi_test
43 _description:

Subscribers

People subscribed via source and target branches