Merge ~bladernr/plainbox-provider-certification-server:1879390-use-cpu-nested-testplan into plainbox-provider-certification-server:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 847a37bdf2d94f4baf372f2ab819f84f5204da17
Merged at revision: 2aac327b6fe5fe9af73c081f22a721d3d1ae3637
Proposed branch: ~bladernr/plainbox-provider-certification-server:1879390-use-cpu-nested-testplan
Merge into: plainbox-provider-certification-server:master
Diff against target: 237 lines (+10/-51)
10 files modified
units/cpu-only.pxu (+1/-6)
units/server-full-18.04.pxu (+1/-5)
units/server-full-20.04.pxu (+1/-5)
units/server-functional-18.04.pxu (+1/-5)
units/server-functional-20.04.pxu (+1/-5)
units/server-regression.pxu (+1/-5)
units/server-soc-cert-18.04.pxu (+1/-5)
units/server-soc-cert-20.04.pxu (+1/-5)
units/virtual-machine-full-18.04.pxu (+1/-5)
units/virtual-machine-full-20.04.pxu (+1/-5)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+384144@code.launchpad.net

Commit message

LP:1879390 Modify all test plans to use nested CPU test plan

Description of the change

LP:1879390 Modify all test plans to use nested CPU test plan

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/units/cpu-only.pxu b/units/cpu-only.pxu
index 8bf6599..c87f02c 100644
--- a/units/cpu-only.pxu
+++ b/units/cpu-only.pxu
@@ -7,15 +7,10 @@ _description:
7 Please use this whitelist for the Ubuntu Certification self-testing7 Please use this whitelist for the Ubuntu Certification self-testing
8 programme.8 programme.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-miscellaneous12 com.canonical.certification::server-miscellaneous
12include:13include:
13 cpu/clocktest certification-status=blocker
14 cpu/scaling_test certification-status=blocker
15 cpu/scaling_test-log-attach certification-status=non-blocker
16 cpu/maxfreq_test certification-status=blocker
17 cpu/maxfreq_test-log-attach certification-status=non-blocker
18 cpu/topology certification-status=blocker
19 stress/cpu_stress_ng_test certification-status=blocker14 stress/cpu_stress_ng_test certification-status=blocker
20 miscellanea/oops certification-status=blocker15 miscellanea/oops certification-status=blocker
21 miscellanea/oops_results.log16 miscellanea/oops_results.log
diff --git a/units/server-full-18.04.pxu b/units/server-full-18.04.pxu
index e252da3..a88eec1 100644
--- a/units/server-full-18.04.pxu
+++ b/units/server-full-18.04.pxu
@@ -7,6 +7,7 @@ _description:
7 Please use this whitelist for the Ubuntu Certification self-testing7 Please use this whitelist for the Ubuntu Certification self-testing
8 programme.8 programme.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-firmware12 com.canonical.certification::server-firmware
12 com.canonical.certification::server-miscellaneous13 com.canonical.certification::server-miscellaneous
@@ -16,11 +17,6 @@ include:
16 info/hdparm_.*.txt certification-status=non-blocker17 info/hdparm_.*.txt certification-status=non-blocker
17 benchmarks/disk/hdparm-read_.* certification-status=blocker18 benchmarks/disk/hdparm-read_.* certification-status=blocker
18 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker19 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
19 cpu/clocktest certification-status=blocker
20 cpu/frequency_governors certification-status=blocker
21 cpu/maxfreq_test certification-status=blocker
22 cpu/maxfreq_test-log-attach certification-status=non-blocker
23 cpu/topology certification-status=blocker
24 disk/detect certification-status=blocker20 disk/detect certification-status=blocker
25 disk/stats_.* certification-status=blocker21 disk/stats_.* certification-status=blocker
26 disk/read_performance_.* certification-status=blocker22 disk/read_performance_.* certification-status=blocker
diff --git a/units/server-full-20.04.pxu b/units/server-full-20.04.pxu
index d5b023b..55c68ad 100644
--- a/units/server-full-20.04.pxu
+++ b/units/server-full-20.04.pxu
@@ -7,6 +7,7 @@ _description:
7 Please use this whitelist for the Ubuntu Certification self-testing7 Please use this whitelist for the Ubuntu Certification self-testing
8 programme.8 programme.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-firmware12 com.canonical.certification::server-firmware
12 com.canonical.certification::server-miscellaneous13 com.canonical.certification::server-miscellaneous
@@ -16,11 +17,6 @@ include:
16 info/hdparm_.*.txt certification-status=non-blocker17 info/hdparm_.*.txt certification-status=non-blocker
17 benchmarks/disk/hdparm-read_.* certification-status=blocker18 benchmarks/disk/hdparm-read_.* certification-status=blocker
18 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker19 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
19 cpu/clocktest certification-status=blocker
20 cpu/frequency_governors certification-status=blocker
21 cpu/maxfreq_test certification-status=blocker
22 cpu/maxfreq_test-log-attach certification-status=non-blocker
23 cpu/topology certification-status=blocker
24 disk/detect certification-status=blocker20 disk/detect certification-status=blocker
25 disk/stats_.* certification-status=blocker21 disk/stats_.* certification-status=blocker
26 disk/read_performance_.* certification-status=blocker22 disk/read_performance_.* certification-status=blocker
diff --git a/units/server-functional-18.04.pxu b/units/server-functional-18.04.pxu
index a1fe375..7fa0a87 100644
--- a/units/server-functional-18.04.pxu
+++ b/units/server-functional-18.04.pxu
@@ -7,6 +7,7 @@ _description:
7 This test plan runs all server certification tests except for the really7 This test plan runs all server certification tests except for the really
8 demanding or lengthy ones.8 demanding or lengthy ones.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-firmware12 com.canonical.certification::server-firmware
12 com.canonical.certification::server-miscellaneous13 com.canonical.certification::server-miscellaneous
@@ -16,11 +17,6 @@ include:
16 info/hdparm_.*.txt certification-status=non-blocker17 info/hdparm_.*.txt certification-status=non-blocker
17 benchmarks/disk/hdparm-read_.* certification-status=blocker18 benchmarks/disk/hdparm-read_.* certification-status=blocker
18 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker19 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
19 cpu/clocktest certification-status=blocker
20 cpu/frequency_governors certification-status=blocker
21 cpu/maxfreq_test certification-status=blocker
22 cpu/maxfreq_test-log-attach certification-status=non-blocker
23 cpu/topology certification-status=blocker
24 disk/detect certification-status=blocker20 disk/detect certification-status=blocker
25 disk/stats_.* certification-status=blocker21 disk/stats_.* certification-status=blocker
26 disk/read_performance_.* certification-status=blocker22 disk/read_performance_.* certification-status=blocker
diff --git a/units/server-functional-20.04.pxu b/units/server-functional-20.04.pxu
index 2acee83..26a56f5 100644
--- a/units/server-functional-20.04.pxu
+++ b/units/server-functional-20.04.pxu
@@ -7,6 +7,7 @@ _description:
7 This test plan runs all server certification tests except for the really7 This test plan runs all server certification tests except for the really
8 demanding or lengthy ones.8 demanding or lengthy ones.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-firmware12 com.canonical.certification::server-firmware
12 com.canonical.certification::server-miscellaneous13 com.canonical.certification::server-miscellaneous
@@ -16,11 +17,6 @@ include:
16 info/hdparm_.*.txt certification-status=non-blocker17 info/hdparm_.*.txt certification-status=non-blocker
17 benchmarks/disk/hdparm-read_.* certification-status=blocker18 benchmarks/disk/hdparm-read_.* certification-status=blocker
18 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker19 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
19 cpu/clocktest certification-status=blocker
20 cpu/frequency_governors certification-status=blocker
21 cpu/maxfreq_test certification-status=blocker
22 cpu/maxfreq_test-log-attach certification-status=non-blocker
23 cpu/topology certification-status=blocker
24 disk/detect certification-status=blocker20 disk/detect certification-status=blocker
25 disk/stats_.* certification-status=blocker21 disk/stats_.* certification-status=blocker
26 disk/read_performance_.* certification-status=blocker22 disk/read_performance_.* certification-status=blocker
diff --git a/units/server-regression.pxu b/units/server-regression.pxu
index c728a96..db6b321 100644
--- a/units/server-regression.pxu
+++ b/units/server-regression.pxu
@@ -7,6 +7,7 @@ _description:
7 Please use this whitelist for the Ubuntu Certification self-testing7 Please use this whitelist for the Ubuntu Certification self-testing
8 programme.8 programme.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-firmware12 com.canonical.certification::server-firmware
12 com.canonical.certification::server-miscellaneous13 com.canonical.certification::server-miscellaneous
@@ -14,11 +15,6 @@ include:
14 info/hdparm_.*.txt certification-status=non-blocker15 info/hdparm_.*.txt certification-status=non-blocker
15 benchmarks/disk/hdparm-read_.* certification-status=blocker16 benchmarks/disk/hdparm-read_.* certification-status=blocker
16 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker17 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
17 cpu/clocktest certification-status=blocker
18 cpu/frequency_governors certification-status=blocker
19 cpu/maxfreq_test certification-status=blocker
20 cpu/maxfreq_test-log-attach certification-status=non-blocker
21 cpu/topology certification-status=blocker
22 disk/detect certification-status=blocker18 disk/detect certification-status=blocker
23 disk/stats_.* certification-status=blocker19 disk/stats_.* certification-status=blocker
24 disk/read_performance_.* certification-status=blocker20 disk/read_performance_.* certification-status=blocker
diff --git a/units/server-soc-cert-18.04.pxu b/units/server-soc-cert-18.04.pxu
index 834f118..e924c8f 100644
--- a/units/server-soc-cert-18.04.pxu
+++ b/units/server-soc-cert-18.04.pxu
@@ -6,6 +6,7 @@ _description:
6 contained here should work in any test lab envrionement. Please use this 6 contained here should work in any test lab envrionement. Please use this
7 whitelist for the Ubuntu Certification self-testing programme.7 whitelist for the Ubuntu Certification self-testing programme.
8nested_part:8nested_part:
9 com.canonical.certification::cpu-server
9 com.canonical.certification::server-info-attachment-automated10 com.canonical.certification::server-info-attachment-automated
10 com.canonical.certification::server-firmware11 com.canonical.certification::server-firmware
11 com.canonical.certification::server-miscellaneous12 com.canonical.certification::server-miscellaneous
@@ -14,11 +15,6 @@ include:
14 info/hdparm_.*.txt certification-status=non-blocker15 info/hdparm_.*.txt certification-status=non-blocker
15 benchmarks/disk/hdparm-read_.*16 benchmarks/disk/hdparm-read_.*
16 benchmarks/disk/hdparm-cache-read_.*17 benchmarks/disk/hdparm-cache-read_.*
17 cpu/clocktest certification-status=blocker
18 cpu/frequency_governors certification-status=blocker
19 cpu/maxfreq_test certification-status=blocker
20 cpu/maxfreq_test-log-attach certification-status=non-blocker
21 cpu/topology certification-status=blocker
22 disk/detect certification-status=blocker18 disk/detect certification-status=blocker
23 disk/stats_.* certification-status=blocker19 disk/stats_.* certification-status=blocker
24 disk/read_performance_.* certification-status=blocker20 disk/read_performance_.* certification-status=blocker
diff --git a/units/server-soc-cert-20.04.pxu b/units/server-soc-cert-20.04.pxu
index 49cfbb1..3cb7b5a 100644
--- a/units/server-soc-cert-20.04.pxu
+++ b/units/server-soc-cert-20.04.pxu
@@ -6,6 +6,7 @@ _description:
6 contained here should work in any test lab envrionement. Please use this 6 contained here should work in any test lab envrionement. Please use this
7 whitelist for the Ubuntu Certification self-testing programme.7 whitelist for the Ubuntu Certification self-testing programme.
8nested_part:8nested_part:
9 com.canonical.certification::cpu-server
9 com.canonical.certification::server-info-attachment-automated10 com.canonical.certification::server-info-attachment-automated
10 com.canonical.certification::server-firmware11 com.canonical.certification::server-firmware
11 com.canonical.certification::server-miscellaneous12 com.canonical.certification::server-miscellaneous
@@ -14,11 +15,6 @@ include:
14 info/hdparm_.*.txt certification-status=non-blocker15 info/hdparm_.*.txt certification-status=non-blocker
15 benchmarks/disk/hdparm-read_.*16 benchmarks/disk/hdparm-read_.*
16 benchmarks/disk/hdparm-cache-read_.*17 benchmarks/disk/hdparm-cache-read_.*
17 cpu/clocktest certification-status=blocker
18 cpu/frequency_governors certification-status=blocker
19 cpu/maxfreq_test certification-status=blocker
20 cpu/maxfreq_test-log-attach certification-status=non-blocker
21 cpu/topology certification-status=blocker
22 disk/detect certification-status=blocker18 disk/detect certification-status=blocker
23 disk/stats_.* certification-status=blocker19 disk/stats_.* certification-status=blocker
24 disk/read_performance_.* certification-status=blocker20 disk/read_performance_.* certification-status=blocker
diff --git a/units/virtual-machine-full-18.04.pxu b/units/virtual-machine-full-18.04.pxu
index a624b7e..f54bc96 100644
--- a/units/virtual-machine-full-18.04.pxu
+++ b/units/virtual-machine-full-18.04.pxu
@@ -7,6 +7,7 @@ _description:
7 envrionement. Please use this whitelist for the Ubuntu Certification 7 envrionement. Please use this whitelist for the Ubuntu Certification
8 self-testing programme.8 self-testing programme.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-firmware12 com.canonical.certification::server-firmware
12 com.canonical.certification::server-miscellaneous13 com.canonical.certification::server-miscellaneous
@@ -15,11 +16,6 @@ include:
15 info/hdparm_.*.txt certification-status=non-blocker16 info/hdparm_.*.txt certification-status=non-blocker
16 benchmarks/disk/hdparm-read_.* certification-status=blocker17 benchmarks/disk/hdparm-read_.* certification-status=blocker
17 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker18 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
18 cpu/clocktest certification-status=blocker
19 cpu/frequency_governors certification-status=blocker
20 cpu/maxfreq_test certification-status=blocker
21 cpu/maxfreq_test-log-attach certification-status=non-blocker
22 cpu/topology certification-status=blocker
23 disk/detect certification-status=blocker19 disk/detect certification-status=blocker
24 disk/stats_.* certification-status=blocker20 disk/stats_.* certification-status=blocker
25 disk/read_performance_.* certification-status=blocker21 disk/read_performance_.* certification-status=blocker
diff --git a/units/virtual-machine-full-20.04.pxu b/units/virtual-machine-full-20.04.pxu
index fcedae9..85a1e28 100644
--- a/units/virtual-machine-full-20.04.pxu
+++ b/units/virtual-machine-full-20.04.pxu
@@ -7,6 +7,7 @@ _description:
7 envrionement. Please use this whitelist for the Ubuntu Certification 7 envrionement. Please use this whitelist for the Ubuntu Certification
8 self-testing programme.8 self-testing programme.
9nested_part:9nested_part:
10 com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated11 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-firmware12 com.canonical.certification::server-firmware
12 com.canonical.certification::server-miscellaneous13 com.canonical.certification::server-miscellaneous
@@ -15,11 +16,6 @@ include:
15 info/hdparm_.*.txt certification-status=non-blocker16 info/hdparm_.*.txt certification-status=non-blocker
16 benchmarks/disk/hdparm-read_.* certification-status=blocker17 benchmarks/disk/hdparm-read_.* certification-status=blocker
17 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker18 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
18 cpu/clocktest certification-status=blocker
19 cpu/frequency_governors certification-status=blocker
20 cpu/maxfreq_test certification-status=blocker
21 cpu/maxfreq_test-log-attach certification-status=non-blocker
22 cpu/topology certification-status=blocker
23 disk/detect certification-status=blocker19 disk/detect certification-status=blocker
24 disk/stats_.* certification-status=blocker20 disk/stats_.* certification-status=blocker
25 disk/read_performance_.* certification-status=blocker21 disk/read_performance_.* certification-status=blocker

Subscribers

People subscribed via source and target branches