Merge lp:~jeffmarcom/opencompute/update-memory-tests into lp:opencompute/checkbox

Proposed by Jeff Marcom
Status: Merged
Approved by: Jeff Marcom
Approved revision: 2150
Merged at revision: 2149
Proposed branch: lp:~jeffmarcom/opencompute/update-memory-tests
Merge into: lp:opencompute/checkbox
Diff against target: 94 lines (+27/-7)
4 files modified
data/whitelists/opencompute-ready-local.whitelist (+3/-0)
debian/changelog (+2/-2)
debian/control (+3/-0)
jobs/memory.txt.in (+19/-5)
To merge this branch: bzr merge lp:~jeffmarcom/opencompute/update-memory-tests
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+187124@code.launchpad.net

Commit message

Merge Jeff Marcom's new memory tests using mcelog and Google's stressapptest tool

Description of the change

This adds a few jobs in memory.txt.in to run the google stress app test and check the mcelog for memory errors.

The mcelog error check is independent of the memory stress test, in that it's possible the google app stress does not catch all errors.

The stress app even suggests looking at the log to be sure.

Also,

stressapptest and mcelog are added as package dependencies.

Tests:
* m: memory/info
* e: memory/mcelog_check
* o: memory/stress_30min
  +: Combine with character above to expand node
   : Space when finished

Output upon introducing an error in mcelog:

   memory/info [pass]
   memory/mcelog_check [fail]
   memory/stress_30min [pass]

Output when mcelog is clean:

Memory tests

   memory/info [pass]
   memory/mcelog_check [pass]
   memory/stress_30min [pass]
 : Space when finished

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

Looks good... I'd also suggest just remembering that this would be useful, I think, to include in checkbox proper as an addition or replacement for the current memory tests.

review: Approve
Revision history for this message
Jeff Marcom (jeffmarcom) wrote :

Attempt to merge into lp:opencompute/checkbox failed due to conflicts:

text conflict in data/whitelists/opencompute-ready-local.whitelist
text conflict in debian/changelog

Revision history for this message
Jeff Lane  (bladernr) wrote :

Well, I guess Tarmac didn't like your branch.

review: Needs Fixing
2149. By Jeff Marcom

Added googlestress app memory tests

Signed-off-by: Jeff Marcom <email address hidden>

2150. By Jeff Marcom

fix mcelog check job

Signed-off-by: Jeff Marcom <email address hidden>

Revision history for this message
Jeff Marcom (jeffmarcom) wrote :

Rebased on trunk, trying again

Revision history for this message
Jeff Lane  (bladernr) :
review: Approve
Revision history for this message
Jeff Lane  (bladernr) wrote :

added to change my review status from Needs Fixing to Approved

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/whitelists/opencompute-ready-local.whitelist'
--- data/whitelists/opencompute-ready-local.whitelist 2013-09-08 03:36:19 +0000
+++ data/whitelists/opencompute-ready-local.whitelist 2013-09-25 14:22:36 +0000
@@ -30,6 +30,7 @@
30efi_attachment30efi_attachment
31lspci_attachment31lspci_attachment
32lshw_attachment32lshw_attachment
33mcelog_attachment
33meminfo_attachment34meminfo_attachment
34modprobe_attachment35modprobe_attachment
35modules_attachment36modules_attachment
@@ -63,6 +64,8 @@
63disk/smart_.*64disk/smart_.*
64__memory__65__memory__
65memory/info66memory/info
67memory/stress_30min
68memory/mcelog_check
66__miscellanea__69__miscellanea__
67miscellanea/ipmi_test70miscellanea/ipmi_test
68__networking__71__networking__
6972
=== modified file 'debian/changelog'
--- debian/changelog 2013-09-23 18:16:03 +0000
+++ debian/changelog 2013-09-25 14:22:36 +0000
@@ -1,13 +1,13 @@
1checkbox (1.16.12~OCP) UNRELEASED; urgency=low1checkbox (1.16.12~OCP) UNRELEASED; urgency=low
22
3 [ Jeff Marcom ]3 [ Jeff Marcom ]
4 * Added googlestress app memory tests
4 * Updated plainbox based on version 0.4.dev in lp:checkbox (16.12)5 * Updated plainbox based on version 0.4.dev in lp:checkbox (16.12)
56
6 [ Jeff Lane ]7 [ Jeff Lane ]
7 * Updated OCP Checkbox to latest checkbox trunk, 0.16.11 revno 23538 * Updated OCP Checkbox to latest checkbox trunk, 0.16.11 revno 2353
89
9 -- Jeff Marcom <jeff.marcom@canonical.com> Fri, 13 Sept 2013 10:13:04 -040010 -- Jeff Marcom <jeff.marcom@canonical.com> Mon, 23 Sept 2013 10:13:04 -0400
10
1111
12checkbox (1.16.6~OCP) UNRELEASED; urgency=low12checkbox (1.16.6~OCP) UNRELEASED; urgency=low
1313
1414
=== modified file 'debian/control'
--- debian/control 2013-08-21 16:16:17 +0000
+++ debian/control 2013-09-25 14:22:36 +0000
@@ -55,7 +55,9 @@
55 glmark2,55 glmark2,
56 glmark2-es2,56 glmark2-es2,
57 hdparm,57 hdparm,
58 libaio1,
58 lshw,59 lshw,
60 mcelog,
59 mesa-utils,61 mesa-utils,
60 nmap,62 nmap,
61 obexd-client,63 obexd-client,
@@ -64,6 +66,7 @@
64 smartmontools,66 smartmontools,
65 sox,67 sox,
66 stress,68 stress,
69 stressapptest,
67 sysstat,70 sysstat,
68 wmctrl,71 wmctrl,
69 wodim72 wodim
7073
=== modified file 'jobs/memory.txt.in'
--- jobs/memory.txt.in 2012-10-09 15:21:35 +0000
+++ jobs/memory.txt.in 2013-09-25 14:22:36 +0000
@@ -7,8 +7,22 @@
7 the size of the memory modules detected by DMI.7 the size of the memory modules detected by DMI.
88
9plugin: shell9plugin: shell
10name: memory/check10name: memory/stress_30min
11user: root11user: root
12command: memory_test12command: stressapptest -s 1800
13_description:13_description:
14 Test and exercise memory.14 Test and exercise memory.
15
16plugin: shell
17name: memory/stress_1hr
18user: root
19command: stressapptest -s 3600
20_description:
21 Test and exercise memory.
22
23plugin: shell
24name: memory/mcelog_check
25user: root
26command: cat /var/log/mcelog; [ ! -s /var/log/mcelog ]
27_description:
28 Grabs mcelog containing memory errors.

Subscribers

People subscribed via source and target branches