Merge ~mreed8855/plainbox-provider-certification-server:uvt-virtualization into plainbox-provider-certification-server:master

Proposed by Michael Reed
Status: Rejected
Rejected by: Michael Reed
Proposed branch: ~mreed8855/plainbox-provider-certification-server:uvt-virtualization
Merge into: plainbox-provider-certification-server:master
Diff against target: 77 lines (+24/-26)
2 files modified
configs/canonical-certification.conf (+18/-25)
units/packaging.pxu (+6/-1)
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+395793@code.launchpad.net

Commit message

Currently the kvm test is failing due to a python traceback error. I propose replacing this test with the use of uvt to test kvm. The bug that this attempts to solve is https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1895168

Description of the change

This is related to the merge proposal for adding a test for kvm using the uvtool to checkbox.

https://code.launchpad.net/~mreed8855/plainbox-provider-checkbox/+git/plainbox-provider-checkbox/+merge/395760

To post a comment you must log in.
8b31a87... by Michael Reed

Replacing kvm test with the new uvt kvm test

Unmerged commits

8b31a87... by Michael Reed

Replacing kvm test with the new uvt kvm test

339f046... by Michael Reed

Fixed an error for comments for specifying the source for an uvt image

bdcfc58... by Michael Reed

Correcting an error in the comments for uvt

37551a7... by Michael Reed

Merge branch 'master' into uvt-virtualization

e0e52c1... by Michael Reed

Adding support to test kvm using the uvtool

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 f1d8f89..1b1b6bd 100644
3--- a/configs/canonical-certification.conf
4+++ b/configs/canonical-certification.conf
5@@ -46,36 +46,29 @@ welcome_text = Welcome to System Certification!
6 #KVM_TIMEOUT = 300
7 #KVM_IMAGE = /path/to/cloudimage-filename.img
8
9-# For LXD testing:
10+
11+# For virtualization testing using the uvtool:
12+# UVT_IMAGE_OR_SOURCE - the location of of the cloud image or the source
13+# for testing kvm using the uvtool
14+# Options:
15+#
16+# Specify a location for uvt-simplestreams-libvirt to retrive an image
17 #
18-# LXD_ROOTFS is the tarall that contains the pre-created root filesystem for
19-# LXD containers.
20-# LXD_TEMPLATES is the tarball that contains the LXD templates and YAML
21-# necessary for defining containers
22-#
23-# Note: You must provide a full URL to the files for LXD even if they're stored
24-# locally. The following examples demonstrate proper URLs for this section:
25-# - http://someotherserver.net/imagedir/ubuntu/server-cloudimg-amd64.squashfs
26-# - This will tell the script to download the file server-cloudimg-amd64.squashfs
27-# from the remote server.
28-# - file:///local/path/to/server-cloudimg-amd64-lxd.tar.xz
29+# Example:
30+# UVT_IMAGE_OR_SOURCE = http://cloud-images.ubuntu.com/daily/server/daily/server/{release}
31+#
32+# Specify a cloud image for uvt-kvm create to create a vm
33+# - file:///local/path/to/cloud.img
34 # - This will tell the script to look at the path specified on the local
35-# filesystem for server-cloudimg-amd64-lxd.tar.xz to use.
36+# filesystem for a copy of the cloud image to use.
37 #
38-# Note that a MAAS server set up via the MANIACS guide may optionally house
39-# copies of the LXD images under http://{ip-address}/cloud/.
40+# Example:
41+# UVT_IMAGE_OR_SOURCE = file:///home/ubuntu/focal-server-cloudimg-amd64.img
42 #
43-# UNCOMMENT BOTH OF THE FOLLOWING 2 LINES nad set the proper URLs as necessary
44-# OR leave them commented out and the LXD test will obtain the needed images
45-# from cloud-images.ubuntu.com.
46-#LXD_ROOTFS = http://server_url/path/to/bionic-server-cloudimg-amd64.squashfs
47-#LXD_TEMPLATE = http://server_url/path/to/bionic-server-cloudimg-amd64-lxd.tar.xz
48+#UVT_IMAGE_OR_SOURCE
49+
50+
51
52-# The STRESS_NG_MIN_SWAP_SIZE environment variable sets the minimum swap
53-# space, in gibibytes (GiB), that the memory/memory_stress_ng test requires.
54-# If less than the specified swap space is available, the script will
55-# attempt to create a swap file of the required size. If that attempt fails,
56-# the memory stress test will fail.
57 STRESS_NG_MIN_SWAP_SIZE = 16
58
59 # For network testing:
60diff --git a/units/packaging.pxu b/units/packaging.pxu
61index 347b964..70b6430 100644
62--- a/units/packaging.pxu
63+++ b/units/packaging.pxu
64@@ -1,7 +1,12 @@
65 # This is for 'virtualization/kvm_check_vm'
66 unit: packaging meta-data
67 os-id: debian
68-Depends: genisoimage
69+Depends: uvtool
70+
71+# This is for 'virtualization/kvm_check_vm'
72+unit: packaging meta-data
73+os-id: debian
74+Depends: uvtool-libvirt
75
76 # The 'memory/memory_stress_ng' job requires numactl
77 unit: packaging meta-data

Subscribers

People subscribed via source and target branches