Merge ~rodsmith/plainbox-provider-canonical-certification:new-cpu-test into plainbox-provider-canonical-certification:master-server

Proposed by Rod Smith
Status: Merged
Approved by: Jeff Lane 
Approved revision: ca4d73bccbfb47f5f53422f79608a64fc145209f
Merged at revision: ca4d73bccbfb47f5f53422f79608a64fc145209f
Proposed branch: ~rodsmith/plainbox-provider-canonical-certification:new-cpu-test
Merge into: plainbox-provider-canonical-certification:master-server
Diff against target: 33 lines (+3/-0)
3 files modified
units/server-full-14.04.pxu (+1/-0)
units/server-soc-cert.pxu (+1/-0)
units/virtual-machine-full-14.04.pxu (+1/-0)
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+284971@code.launchpad.net

Description of the change

Added references to new stress_ng-based CPU stress test to server whitelists.

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

thanks for remembering this part :)

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

I will try to merge this branch. I will keep you posted

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

The branch has been merged as requested. Thank you for your contribution

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/server-full-14.04.pxu b/units/server-full-14.04.pxu
2index 07bf6ab..e0f0101 100644
3--- a/units/server-full-14.04.pxu
4+++ b/units/server-full-14.04.pxu
5@@ -84,6 +84,7 @@ include:
6 power-management/rtc
7 __stress__
8 stress/cpu_stress_test
9+ stress/cpu_stress_ng_test
10 __usb__
11 usb/detect
12 usb/storage-preinserted
13diff --git a/units/server-soc-cert.pxu b/units/server-soc-cert.pxu
14index 132b6d1..26bc070 100644
15--- a/units/server-soc-cert.pxu
16+++ b/units/server-soc-cert.pxu
17@@ -74,6 +74,7 @@ include:
18 power-management/rtc
19 __stress__
20 stress/cpu_stress_test
21+ stress/cpu_stress_ng_test
22 __usb__
23 usb/detect
24 usb/storage-preinserted
25diff --git a/units/virtual-machine-full-14.04.pxu b/units/virtual-machine-full-14.04.pxu
26index 37f3ca2..c6a78b8 100644
27--- a/units/virtual-machine-full-14.04.pxu
28+++ b/units/virtual-machine-full-14.04.pxu
29@@ -71,3 +71,4 @@ include:
30 power-management/rtc
31 __stress__
32 stress/cpu_stress_test
33+ stress/cpu_stress_ng_test

Subscribers

People subscribed via source and target branches

to all changes: