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
1=== modified file 'data/whitelists/opencompute-ready-local.whitelist'
2--- data/whitelists/opencompute-ready-local.whitelist 2013-09-08 03:36:19 +0000
3+++ data/whitelists/opencompute-ready-local.whitelist 2013-09-25 14:22:36 +0000
4@@ -30,6 +30,7 @@
5 efi_attachment
6 lspci_attachment
7 lshw_attachment
8+mcelog_attachment
9 meminfo_attachment
10 modprobe_attachment
11 modules_attachment
12@@ -63,6 +64,8 @@
13 disk/smart_.*
14 __memory__
15 memory/info
16+memory/stress_30min
17+memory/mcelog_check
18 __miscellanea__
19 miscellanea/ipmi_test
20 __networking__
21
22=== modified file 'debian/changelog'
23--- debian/changelog 2013-09-23 18:16:03 +0000
24+++ debian/changelog 2013-09-25 14:22:36 +0000
25@@ -1,13 +1,13 @@
26 checkbox (1.16.12~OCP) UNRELEASED; urgency=low
27
28 [ Jeff Marcom ]
29+ * Added googlestress app memory tests
30 * Updated plainbox based on version 0.4.dev in lp:checkbox (16.12)
31
32 [ Jeff Lane ]
33 * Updated OCP Checkbox to latest checkbox trunk, 0.16.11 revno 2353
34
35- -- Jeff Marcom <jeff.marcom@canonical.com> Fri, 13 Sept 2013 10:13:04 -0400
36-
37+ -- Jeff Marcom <jeff.marcom@canonical.com> Mon, 23 Sept 2013 10:13:04 -0400
38
39 checkbox (1.16.6~OCP) UNRELEASED; urgency=low
40
41
42=== modified file 'debian/control'
43--- debian/control 2013-08-21 16:16:17 +0000
44+++ debian/control 2013-09-25 14:22:36 +0000
45@@ -55,7 +55,9 @@
46 glmark2,
47 glmark2-es2,
48 hdparm,
49+ libaio1,
50 lshw,
51+ mcelog,
52 mesa-utils,
53 nmap,
54 obexd-client,
55@@ -64,6 +66,7 @@
56 smartmontools,
57 sox,
58 stress,
59+ stressapptest,
60 sysstat,
61 wmctrl,
62 wodim
63
64=== modified file 'jobs/memory.txt.in'
65--- jobs/memory.txt.in 2012-10-09 15:21:35 +0000
66+++ jobs/memory.txt.in 2013-09-25 14:22:36 +0000
67@@ -7,8 +7,22 @@
68 the size of the memory modules detected by DMI.
69
70 plugin: shell
71-name: memory/check
72-user: root
73-command: memory_test
74-_description:
75- Test and exercise memory.
76+name: memory/stress_30min
77+user: root
78+command: stressapptest -s 1800
79+_description:
80+ Test and exercise memory.
81+
82+plugin: shell
83+name: memory/stress_1hr
84+user: root
85+command: stressapptest -s 3600
86+_description:
87+ Test and exercise memory.
88+
89+plugin: shell
90+name: memory/mcelog_check
91+user: root
92+command: cat /var/log/mcelog; [ ! -s /var/log/mcelog ]
93+_description:
94+ Grabs mcelog containing memory errors.

Subscribers

People subscribed via source and target branches