Merge ~mreed8855/plainbox-provider-certification-server:lxd-vm-virtualization_2 into plainbox-provider-certification-server:master

Proposed by Michael Reed
Status: Merged
Approved by: Michael Reed
Approved revision: f5c40273f514a6b426a3ef961e41e824ef04eb11
Merged at revision: ba419a54167eb76c3bbe36efda8cb6e56a441197
Proposed branch: ~mreed8855/plainbox-provider-certification-server:lxd-vm-virtualization_2
Merge into: plainbox-provider-certification-server:master
Diff against target: 140 lines (+13/-10)
10 files modified
configs/canonical-certification.conf (+4/-1)
units/server-full-20.04.pxu (+1/-1)
units/server-full-22.04.pxu (+1/-1)
units/server-functional-20.04.pxu (+1/-1)
units/server-functional-22.04.pxu (+1/-1)
units/server-regression.pxu (+1/-1)
units/server-soc-cert-20.04.pxu (+1/-1)
units/server-soc-cert-22.04.pxu (+1/-1)
units/server-ubuntucore-20.pxu (+1/-1)
units/virtualization-only.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+420291@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Reed (mreed8855) wrote :

I have updated 20.04 and 22.04 and have ignored 18.04 since it will be obsolete.

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

LGTM... approve - but before you set the overall status to Approve, please wait for the other MR to be approved first.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/configs/canonical-certification.conf b/configs/canonical-certification.conf
2index 6a9641e..4ea41ea 100644
3--- a/configs/canonical-certification.conf
4+++ b/configs/canonical-certification.conf
5@@ -26,7 +26,9 @@ DISK_MDADM_READ_PERF = 150
6
7 # For virtualization testing:
8 #
9-# The KVM_TIMEOUT and KVM_IMAGE variables will soon be deprecated
10+# The KVM_IMAGE variable is now used in the lxd virtual machine test.
11+#
12+# The KVM_TIMEOUT and variable will soon be deprecated
13 # and will no longer work
14 #
15 # KVM_TIMEOUT sets the timeout to wait for the cloudimg to boot before exiting
16@@ -57,6 +59,7 @@ DISK_MDADM_READ_PERF = 150
17 #KVM_TIMEOUT = 300
18 #KVM_IMAGE = /path/to/cloudimage-filename.img
19
20+# The UVT_IMAGE_OR_SOURCE will soon be deprecated
21 # For virtualization testing using the uvtool:
22 # UVT_IMAGE_OR_SOURCE - the location of of the cloud image or the source
23 # for testing kvm using the uvtool
24diff --git a/units/server-full-20.04.pxu b/units/server-full-20.04.pxu
25index 8b22f70..2d90f0c 100644
26--- a/units/server-full-20.04.pxu
27+++ b/units/server-full-20.04.pxu
28@@ -31,7 +31,7 @@ include:
29 power-management/rtc certification-status=blocker
30 stress/cpu_stress_ng_test certification-status=blocker
31 virtualization/verify_lxd certification-status=blocker
32- virtualization/kvm_check_vm certification-status=blocker
33+ virtualization/verify_lxd_vm certification-status=blocker
34 info/kvm_output certification-status=non-blocker
35 miscellanea/oops certification-status=blocker
36 miscellanea/oops_results.log
37diff --git a/units/server-full-22.04.pxu b/units/server-full-22.04.pxu
38index 956d80c..1946e4d 100644
39--- a/units/server-full-22.04.pxu
40+++ b/units/server-full-22.04.pxu
41@@ -24,7 +24,7 @@ include:
42 power-management/rtc certification-status=blocker
43 stress/cpu_stress_ng_test certification-status=blocker
44 virtualization/verify_lxd certification-status=blocker
45- virtualization/kvm_check_vm certification-status=blocker
46+ virtualization/verify_lxd_vm certification-status=blocker
47 info/kvm_output certification-status=non-blocker
48 miscellanea/oops certification-status=blocker
49 miscellanea/oops_results.log
50diff --git a/units/server-functional-20.04.pxu b/units/server-functional-20.04.pxu
51index da078a3..0a7067d 100644
52--- a/units/server-functional-20.04.pxu
53+++ b/units/server-functional-20.04.pxu
54@@ -29,7 +29,7 @@ include:
55 memory/info certification-status=blocker
56 power-management/rtc certification-status=blocker
57 virtualization/verify_lxd certification-status=blocker
58- virtualization/kvm_check_vm certification-status=blocker
59+ virtualization/verify_lxd_vm certification-status=blocker
60 info/kvm_output certification-status=non-blocker
61 miscellanea/oops certification-status=non-blocker
62 miscellanea/oops_results.log certification-status=non-blocker
63diff --git a/units/server-functional-22.04.pxu b/units/server-functional-22.04.pxu
64index 0ed85fc..bac5e12 100644
65--- a/units/server-functional-22.04.pxu
66+++ b/units/server-functional-22.04.pxu
67@@ -22,7 +22,7 @@ include:
68 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
69 power-management/rtc certification-status=blocker
70 virtualization/verify_lxd certification-status=blocker
71- virtualization/kvm_check_vm certification-status=blocker
72+ virtualization/verify_lxd_vm certification-status=blocker
73 info/kvm_output certification-status=non-blocker
74 miscellanea/oops certification-status=non-blocker
75 miscellanea/oops_results.log certification-status=non-blocker
76diff --git a/units/server-regression.pxu b/units/server-regression.pxu
77index ba2b85d..d78b5de 100644
78--- a/units/server-regression.pxu
79+++ b/units/server-regression.pxu
80@@ -23,7 +23,7 @@ include:
81 stress/cpu_stress_ng_test certification-status=blocker
82 usb/detect certification-status=non-blocker
83 virtualization/verify_lxd certification-status=blocker
84- virtualization/kvm_check_vm certification-status=blocker
85+ virtualization/verify_lxd_vm certification-status=blocker
86 info/kvm_output certification-status=non-blocker
87 miscellanea/oops certification-status=blocker
88 miscellanea/oops_results.log
89diff --git a/units/server-soc-cert-20.04.pxu b/units/server-soc-cert-20.04.pxu
90index fea6a07..4910e53 100644
91--- a/units/server-soc-cert-20.04.pxu
92+++ b/units/server-soc-cert-20.04.pxu
93@@ -29,7 +29,7 @@ include:
94 power-management/rtc certification-status=blocker
95 stress/cpu_stress_ng_test certification-status=blocker
96 virtualization/verify_lxd certification-status=blocker
97- virtualization/kvm_check_vm certification-status=blocker
98+ virtualization/verify_lxd_vm certification-status=blocker
99 info/kvm_output certification-status=non-blocker
100 miscellanea/oops certification-status=non-blocker
101 miscellanea/oops_results.log
102diff --git a/units/server-soc-cert-22.04.pxu b/units/server-soc-cert-22.04.pxu
103index 7031e4c..b28cead 100644
104--- a/units/server-soc-cert-22.04.pxu
105+++ b/units/server-soc-cert-22.04.pxu
106@@ -22,7 +22,7 @@ include:
107 power-management/rtc certification-status=blocker
108 stress/cpu_stress_ng_test certification-status=blocker
109 virtualization/verify_lxd certification-status=blocker
110- virtualization/kvm_check_vm certification-status=blocker
111+ virtualization/verify_lxd_vm certification-status=blocker
112 info/kvm_output certification-status=non-blocker
113 miscellanea/oops certification-status=non-blocker
114 miscellanea/oops_results.log
115diff --git a/units/server-ubuntucore-20.pxu b/units/server-ubuntucore-20.pxu
116index 7318925..4ac8e2f 100644
117--- a/units/server-ubuntucore-20.pxu
118+++ b/units/server-ubuntucore-20.pxu
119@@ -38,7 +38,7 @@ include:
120 usb/storage-preinserted certification-status=blocker
121 usb3/storage-preinserted certification-status=blocker
122 virtualization/verify_lxd certification-status=blocker
123- virtualization/kvm_check_vm certification-status=blocker
124+ virtualization/verify_lxd_vm certification-status=blocker
125 info/kvm_output certification-status=non-blocker
126 miscellanea/oops certification-status=blocker
127 miscellanea/oops_results.log
128diff --git a/units/virtualization-only.pxu b/units/virtualization-only.pxu
129index 6725d12..2d3c47e 100644
130--- a/units/virtualization-only.pxu
131+++ b/units/virtualization-only.pxu
132@@ -12,7 +12,7 @@ nested_part:
133 include:
134 info/hdparm_.*.txt certification-status=non-blocker
135 virtualization/verify_lxd certification-status=blocker
136- virtualization/kvm_check_vm certification-status=blocker
137+ virtualization/verify_lxd_vm certification-status=blocker
138 info/kvm_output certification-status=non-blocker
139 miscellanea/oops certification-status=non-blocker
140 miscellanea/oops_results.log certification-status=non-blocker

Subscribers

People subscribed via source and target branches