Merge lp:~sylvain-pineau/checkbox-certification/kvm_test into lp:checkbox-certification

Proposed by Sylvain Pineau
Status: Merged
Merged at revision: 529
Proposed branch: lp:~sylvain-pineau/checkbox-certification/kvm_test
Merge into: lp:checkbox-certification
Diff against target: 88 lines (+16/-6)
5 files modified
data/server-cert.whitelist (+4/-1)
data/server-selftest.whitelist (+4/-1)
data/virt.whitelist (+4/-2)
debian/changelog (+2/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox-certification/kvm_test
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+120944@code.launchpad.net

Description of the change

This MR adds virtualization (KVM) tests to whitelists and the corresponding dependencies to debian/control.

WARNING:

Please merge only once the corresponding code in checkbox is approved and merged:

https://code.launchpad.net/~sylvain-pineau/checkbox/kvm_test/+merge/120799

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

The changes look good but I also notice that xawtv was removed from the checkbox-certification-client recommends line. I haven't seen xawtv used in the base checkbox package, so I'll assume that was done on purpose. I'll approve but please correct me if I'm wrong. Thanks!

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

On 12-08-23 03:41 PM, Marc Tardif wrote:
> Review: Approve
>
> The changes look good but I also notice that xawtv was removed from the checkbox-certification-client recommends line. I haven't seen xawtv used in the base checkbox package, so I'll assume that was done on purpose. I'll approve but please correct me if I'm wrong. Thanks!
>

Yes, the requirement for xawtv (which was used only for the camera/detect test)
was removed in checkbox rev 1569, to this seems OK to me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/server-cert.whitelist'
2--- data/server-cert.whitelist 2012-08-15 07:58:39 +0000
3+++ data/server-cert.whitelist 2012-08-23 09:10:47 +0000
4@@ -76,7 +76,6 @@
5 miscellanea/fwts_test
6 miscellanea/fwts_results.log
7 miscellanea/ipmi_test
8-miscellanea/virtualization-check
9 __networking__
10 networking/detect
11 networking/bandwidth
12@@ -96,3 +95,7 @@
13 __usb__
14 usb/detect
15 usb/storage-preinserted
16+__virtualization__
17+virtualization/virtualization-check
18+virtualization/kvm_ok
19+virtualization/kvm_check_vm
20
21=== modified file 'data/server-selftest.whitelist'
22--- data/server-selftest.whitelist 2012-08-15 07:58:39 +0000
23+++ data/server-selftest.whitelist 2012-08-23 09:10:47 +0000
24@@ -72,7 +72,6 @@
25 miscellanea/fwts_test
26 miscellanea/fwts_results.log
27 miscellanea/ipmi_test
28-miscellanea/virtualization-check
29 __networking__
30 networking/detect
31 networking/bandwidth
32@@ -91,3 +90,7 @@
33 __usb__
34 usb/detect
35 usb/storage-preinserted
36+__virtualization__
37+virtualization/virtualization-check
38+virtualization/kvm_ok
39+virtualization/kvm_check_vm
40
41=== modified file 'data/virt.whitelist'
42--- data/virt.whitelist 2012-07-13 21:53:42 +0000
43+++ data/virt.whitelist 2012-08-23 09:10:47 +0000
44@@ -39,5 +39,7 @@
45 info/hdparm_.*.txt
46 installer_debug.gz
47 # Actual test cases
48-__miscellanea__
49-miscellanea/virtualization-check
50+__virtualization__
51+virtualization/virtualization-check
52+virtualization/kvm_ok
53+virtualization/kvm_check_vm
54
55=== modified file 'debian/changelog'
56--- debian/changelog 2012-08-20 19:59:50 +0000
57+++ debian/changelog 2012-08-23 09:10:47 +0000
58@@ -46,6 +46,8 @@
59 * data/client-selftest.whitelist, data/client-cert.whitelist: Add USB3 read
60 performance test.
61 * Moved gtkperf from graphics to the benchmark section.
62+ * Added virtualization (KVM) tests to whitelists and the corresponding
63+ dependencies to debian/control.
64
65 -- Jeff <jeff.marcom@canonical.com> Mon, 20 Aug 2012 15:57:27 -0400
66
67
68=== modified file 'debian/control'
69--- debian/control 2012-08-16 15:46:12 +0000
70+++ debian/control 2012-08-23 09:10:47 +0000
71@@ -44,7 +44,7 @@
72 Provides: checkbox-certification-cli
73 Depends: checkbox-certification (= ${source:Version}), checkbox-cli (>= 0.14~ppa), sysv-rc
74 Conflicts: checkbox-certification-cli (<< 0.14)
75-Recommends: apache2, bind9, cups, dnsutils, ipmitool, libapache2-mod-php5, mysql-server, php5-mysql, samba, ssh, tomcat6, winbind
76+Recommends: apache2, bind9, cups, dnsutils, ipmitool, libapache2-mod-php5, mysql-server, php5-mysql, samba, ssh, tomcat6, winbind, cpu-checker, qemu-kvm, qemu-utils
77 Description: Server Certification
78 This project extends the checkbox project with server certification
79 specific data and plugins.
80@@ -58,7 +58,7 @@
81 Provides: checkbox-certification-gtk
82 Depends: checkbox-certification (= ${source:Version}), checkbox-qt (>= 0.14~ppa), xdg-user-dirs
83 Conflicts: checkbox-certification-gtk (<< 0.14)
84-Recommends: fswebcam, gtkperf, imagemagick, xawtv
85+Recommends: fswebcam, gtkperf, imagemagick
86 Description: Client Certification
87 This project extends the checkbox project with client certification
88 specific data and plugins.

Subscribers

People subscribed via source and target branches