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

[Michael Reed]

The kvm virtualization test using the uvtool has been deprecated. I have removed the remaining code. This is being submitted in conjunction with the following MP:

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

[Jeff Lane  (bladernr)]

LGTM, thanks

review: Approve

diff --git a/configs/canonical-certification.conf b/configs/canonical-certification.conf
index 4ea41ea..34e9320 100644
--- a/configs/canonical-certification.conf
+++ b/configs/canonical-certification.conf
@@ -26,59 +26,36 @@ DISK_MDADM_READ_PERF = 150
 
 # For virtualization testing:
 #
-# The KVM_IMAGE variable is now used in the lxd virtual machine test.
+# The KVM_IMAGE and LXD_TEMPLATES variables are now used in the lxd 
+# virtual machine test.
 #
-# The KVM_TIMEOUT and variable will soon be deprecated 
-# and will no longer work
+# The LXD_TEMPLATES is the tarball that contains the LXD templates and YAML
+# necessary for defining containers and virtual machines. This variable 
+# should be set to the same value that is used for lxd container testing.
 #
-# KVM_TIMEOUT sets the timeout to wait for the cloudimg to boot before exiting
-# test. It is an integer in seconds (the default is 3000 seconds)
 # KVM_IMAGE the location to find the cloud image to use for testing KVM.  This
 # will allow you to specify a variety of location options depending on your
 # needs.  
 # Options available:
-#  - http://myserver.com/imagedir/ (note the trailing / is required!!)
-#    - This will tell the script to look into /imagedir/ on the remote server
-#      for files in the standard ubuntu Cloud filename format
-#      RELEASE-server-cloudimg-ARCH-disk1.img
 #  - http://someotherserver.net/imagedir/ubuntu/mycloudimg.img
 #    - This will tell the script to download the file mycloudimg.img from the
 #      remote server.
 #  - file:///local/path/to/cloud.img
 #    - This will tell the script to look at the path specified on the local
 #      filesystem for a copy of the cloud image to use.
-#  - /local/path/to/cloud.img
-#    - This will work the same as the file:// example above and should be a
-#      full path to the cloud image.
-#
-# Note that a MAAS server set up via the MANIACS guide may optionally house
-# copies of the KVM images under http://{ip-address}/cloud/.
-#
-# UNCOMMENT EITHER OR BOTH OF THE FOLLOWING 2 LINES and set the proper
-# parameters as necessary:
-#KVM_TIMEOUT = 300
-#KVM_IMAGE = /path/to/cloudimage-filename.img
-
-# The UVT_IMAGE_OR_SOURCE will soon be deprecated
-# For virtualization testing using the uvtool:
-# UVT_IMAGE_OR_SOURCE - the location of of the cloud image or the source
-# for testing kvm using the uvtool
-# Options:
-#
-# Specify a location for uvt-simplestreams-libvirt to retrive an image
 #
 # Example:
-#  UVT_IMAGE_OR_SOURCE = http://cloud-images.ubuntu.com/daily/server/daily/server/{release}
-#
-# Specify a cloud image for uvt-kvm create to create a vm 
-#  - file:///local/path/to/cloud.img
-#    - This will tell the script to look at the path specified on the local
-#      filesystem for a copy of the cloud image to use.
+# KVM_IMAGE = http://cloud-images.ubuntu.com/daily/server/daily/server/{release}
 #
 # Example:
-# UVT_IMAGE_OR_SOURCE = file:///home/ubuntu/focal-server-cloudimg-amd64.img
+# KVM_IMAGE = file:///home/ubuntu/jammy-server-cloudimg-amd64.img
 #
-#UVT_IMAGE_OR_SOURCE =
+# Note that a MAAS server set up via the MANIACS guide may optionally house
+# copies of the KVM images under http://{ip-address}/cloud/.
+#
+# UNCOMMENT THE FOLLOWING LINE and set the proper
+# parameters as necessary:
+# KVM_IMAGE = /path/to/cloudimage-filename.img
 
 # For LXD testing:
 #
@@ -102,8 +79,8 @@ DISK_MDADM_READ_PERF = 150
 # UNCOMMENT BOTH OF THE FOLLOWING 2 LINES nad set the proper URLs as necessary
 # OR leave them commented out and the LXD test will obtain the needed images
 # from cloud-images.ubuntu.com.
-#LXD_ROOTFS = http://server_url/path/to/bionic-server-cloudimg-amd64.squashfs
-#LXD_TEMPLATE = http://server_url/path/to/bionic-server-cloudimg-amd64-lxd.tar.xz
+#LXD_ROOTFS = http://server_url/path/to/jammy-server-cloudimg-amd64.squashfs
+#LXD_TEMPLATE = http://server_url/path/to/jammy-server-cloudimg-amd64-lxd.tar.xz
 
 # The STRESS_NG_MIN_SWAP_SIZE environment variable sets the minimum swap
 # space, in gibibytes (GiB), that the memory/memory_stress_ng test requires.
diff --git a/units/packaging.pxu b/units/packaging.pxu
index 70b6430..930cc28 100644
--- a/units/packaging.pxu
+++ b/units/packaging.pxu
@@ -1,13 +1,3 @@
-# This is for 'virtualization/kvm_check_vm'
-unit: packaging meta-data
-os-id: debian
-Depends: uvtool
-
-# This is for 'virtualization/kvm_check_vm'
-unit: packaging meta-data
-os-id: debian
-Depends: uvtool-libvirt
-
 # The 'memory/memory_stress_ng' job requires numactl
 unit: packaging meta-data
 os-id: debian
diff --git a/units/server-functional-18.04.pxu b/units/server-functional-18.04.pxu
index 083a8fb..74f3df3 100644
--- a/units/server-functional-18.04.pxu
+++ b/units/server-functional-18.04.pxu
@@ -29,7 +29,7 @@ include:
     memory/info                                certification-status=blocker
     power-management/rtc                       certification-status=blocker
     virtualization/verify_lxd                  certification-status=blocker
-    virtualization/kvm_check_vm                certification-status=blocker
+    virtualization/verify_lxd_vm               certification-status=blocker
     info/kvm_output                            certification-status=non-blocker
     miscellanea/oops                           certification-status=non-blocker
     miscellanea/oops_results.log               certification-status=non-blocker
diff --git a/units/server-soc-cert-18.04.pxu b/units/server-soc-cert-18.04.pxu
index 05ef64e..b8b4bd3 100644
--- a/units/server-soc-cert-18.04.pxu
+++ b/units/server-soc-cert-18.04.pxu
@@ -29,7 +29,7 @@ include:
     power-management/rtc                       certification-status=blocker
     stress/cpu_stress_ng_test                  certification-status=blocker
     virtualization/verify_lxd                  certification-status=blocker
-    virtualization/kvm_check_vm                certification-status=blocker
+    virtualization/verify_lxd_vm               certification-status=blocker
     info/kvm_output                            certification-status=non-blocker
     miscellanea/oops                           certification-status=non-blocker
     miscellanea/oops_results.log