Merge lp:~jeffmarcom/opencompute/ipmi_in_band_tests into lp:opencompute/checkbox

Proposed by Jeff Marcom
Status: Merged
Approved by: Jeff Lane 
Approved revision: 2162
Merged at revision: 2159
Proposed branch: lp:~jeffmarcom/opencompute/ipmi_in_band_tests
Merge into: lp:opencompute/checkbox
Diff against target: 80 lines (+10/-6)
5 files modified
data/whitelists/opencompute-ready-local.whitelist (+5/-1)
data/whitelists/opencompute-ready-remote.whitelist (+1/-1)
jobs/local.txt.in (+2/-2)
po/POTFILES.in (+1/-1)
setup.cfg (+1/-1)
To merge this branch: bzr merge lp:~jeffmarcom/opencompute/ipmi_in_band_tests
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+187974@code.launchpad.net

Commit message

Merge adds new ipmi inband tests and fixes the job file name and test names to be more appropriate. Also separates them from miscellanea as IPMI tests have grown to a full suite now.

Description of the change

This simply adds new ipmi inband tests, removes miscellanea/ipmi from the whitelists and renames the ipmi job file to be more appropriate considering in has inband and out of band jobs.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

cool, now I shall screw up my own merge request by approving this one first, which guarantees a conflict in mine ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/whitelists/opencompute-ready-local.whitelist'
2--- data/whitelists/opencompute-ready-local.whitelist 2013-09-25 23:48:44 +0000
3+++ data/whitelists/opencompute-ready-local.whitelist 2013-09-27 04:57:29 +0000
4@@ -62,12 +62,16 @@
5 disk/stats_.*
6 disk/smart
7 disk/smart_.*
8+__ipmi__
9+ipmi/in_band/admin/chassis_info
10+ipmi/in_band/admin/chassis_self_test
11+ipmi/in_band/admin/detailed_sensor_readings
12+ipmi/in_band/admin/chassis_status
13 __memory__
14 memory/info
15 memory/stress_30min
16 memory/mcelog_check
17 __miscellanea__
18-miscellanea/ipmi_test
19 miscellanea/idle_check
20 miscellanea/syslog_check
21 miscellanea/12hr_idle_verify
22
23=== modified file 'data/whitelists/opencompute-ready-remote.whitelist'
24--- data/whitelists/opencompute-ready-remote.whitelist 2013-07-26 18:19:51 +0000
25+++ data/whitelists/opencompute-ready-remote.whitelist 2013-09-27 04:57:29 +0000
26@@ -14,7 +14,7 @@
27 package
28 sleep
29 uname
30-__ipmi_out_of_band__
31+__ipmi__
32 ipmi/out_of_band/admin/chassis_info
33 ipmi/out_of_band/admin/power_off
34 ipmi/out_of_band/admin/power_on
35
36=== renamed file 'jobs/ipmi_out_of_band.txt.in' => 'jobs/ipmi.txt.in'
37=== modified file 'jobs/local.txt.in'
38--- jobs/local.txt.in 2013-08-19 20:46:26 +0000
39+++ jobs/local.txt.in 2013-09-27 04:57:29 +0000
40@@ -33,12 +33,12 @@
41 shopt -s extglob
42 cat $CHECKBOX_SHARE/jobs/info.txt?(.in)
43
44-name: __ipmi_out_of_band__
45+name: __ipmi__
46 plugin: local
47 _description: IPMI out of band tests
48 command:
49 shopt -s extglob
50- cat $CHECKBOX_SHARE/jobs/ipmi_out_of_band.txt?(.in)
51+ cat $CHECKBOX_SHARE/jobs/ipmi.txt?(.in)
52
53 name: __memory__
54 plugin: local
55
56=== modified file 'po/POTFILES.in'
57--- po/POTFILES.in 2013-08-19 17:41:35 +0000
58+++ po/POTFILES.in 2013-09-27 04:57:29 +0000
59@@ -6,7 +6,7 @@
60 [type: gettext/rfc822deb] jobs/dcmi_in_band.txt.in
61 [type: gettext/rfc822deb] jobs/disk.txt.in
62 [type: gettext/rfc822deb] jobs/info.txt.in
63-[type: gettext/rfc822deb] jobs/ipmi_out_of_band.txt.in
64+[type: gettext/rfc822deb] jobs/ipmi.txt.in
65 [type: gettext/rfc822deb] jobs/local.txt.in
66 [type: gettext/rfc822deb] jobs/memory.txt.in
67 [type: gettext/rfc822deb] jobs/miscellanea.txt.in
68
69=== modified file 'setup.cfg'
70--- setup.cfg 2013-08-19 20:46:26 +0000
71+++ setup.cfg 2013-09-27 04:57:29 +0000
72@@ -12,7 +12,7 @@
73 "jobs/disk.txt.in",
74 "jobs/dcmi_in_band.txt.in",
75 "jobs/info.txt.in",
76- "jobs/ipmi_out_of_band.txt.in",
77+ "jobs/ipmi.txt.in",
78 "jobs/local.txt.in",
79 "jobs/memory.txt.in",
80 "jobs/miscellanea.txt.in",

Subscribers

People subscribed via source and target branches