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

[Michael Reed]

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

This replaces the previous merge proposal
https://code.launchpad.net/~mreed8855/plainbox-provider-certification-server/+git/plainbox-provider-certification-server/+merge/395793

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

This is related to the following merge proposal
https://code.launchpad.net/~mreed8855/plainbox-provider-checkbox/+git/plainbox-provider-checkbox/+merge/397524

[Jeff Lane  (bladernr)]

Needs to leave the LXD stuff intact, but ok to remove the old KVM stuff.

review: Needs Fixing

[Jeff Lane  (bladernr)]

inline comments added

[Maciej Kisielewski (kissiel)]

Looks like this MR is awaiting another patch. I'm marking it as "Work in progress".

[Jeff Lane  (bladernr)]

One last thing...
need to modify plainbox-provider-certification-server/tools/canonical-certification-precheck so that it will configure UVT_IMAGE_OR_SOURCE in the conf file.

There are examples in there for handling the LXD and KVM images so you should be able to just copy/pasta and make minor mods to one of those.

So nothing to fix, just one more thing to add.

review: Needs Fixing

[Jeff Lane  (bladernr)]

Need to fix the merge conflicts in the diff. This is likely because your branch is far enough behind the current master that you need to do a rebase on the updated master.

review: Needs Fixing

[Michael Reed (mreed8855)]

I did a hard reset on my branch to remove my changes, I merged it with an updated master branch , added my changes back in and pushed it. This required a forced merge so I am not sure if that resolved the conflict.

[Jeff Lane  (bladernr)]

still needs a bit of fixing. See below

review: Needs Fixing

[Jeff Lane  (bladernr)]

Thanks!

review: Approve

diff --git a/configs/canonical-certification.conf b/configs/canonical-certification.conf
index 99cdd28..cd53c88 100644
--- a/configs/canonical-certification.conf
+++ b/configs/canonical-certification.conf
@@ -26,6 +26,9 @@ DISK_MDADM_READ_PERF = 150
 
 # For virtualization testing:
 #
+# The KVM_TIMEOUT and KVM_IMAGE variables will soon be deprecated 
+# and will no longer work
+#
 # 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
@@ -54,6 +57,26 @@ DISK_MDADM_READ_PERF = 150
 #KVM_TIMEOUT = 300
 #KVM_IMAGE = /path/to/cloudimage-filename.img
 
+# 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.
+#
+# Example:
+# UVT_IMAGE_OR_SOURCE = file:///home/ubuntu/focal-server-cloudimg-amd64.img
+#
+#UVT_IMAGE_OR_SOURCE =
+
 # For LXD testing:
 #
 # LXD_ROOTFS is the tarall that contains the pre-created root filesystem for 
diff --git a/tools/canonical-certification-precheck b/tools/canonical-certification-precheck
index 0460ebe..b2da402 100755
--- a/tools/canonical-certification-precheck
+++ b/tools/canonical-certification-precheck
@@ -21,7 +21,7 @@ info(){
 
 
 
-steps="Ubuntu_Version Arch EFI_Mode CCS_Version SID_Check Installed_Ram Virtualization_Support NICs_enabled Jumbo_Frames IPERF Network_Subnets LVM_Check Hard_Disks USB_Disks Disk_Speed_Check KVM_Image_Check LXD_Image_Check XDG_Check CPUFreq_Check GPGPU_Check NVDIMM_Detection"
+steps="Ubuntu_Version Arch EFI_Mode CCS_Version SID_Check Installed_Ram Virtualization_Support NICs_enabled Jumbo_Frames IPERF Network_Subnets LVM_Check Hard_Disks USB_Disks Disk_Speed_Check UVT_KVM_Image_Check LXD_Image_Check XDG_Check CPUFreq_Check GPGPU_Check NVDIMM_Detection"
 
 while getopts "i" opt; do
   case $opt in
@@ -343,6 +343,44 @@ else
 fi
 }
 
+# Check local availability of UVT KVM image or source
+UVT_KVM_Image_Check(){
+name="UVT_KVM Image Check"
+echoname
+if grep "^UVT_IMAGE_OR_SOURCE =" /etc/xdg/canonical-certification.conf >/dev/null; then
+    kvmurl=$(grep ^UVT_IMAGE_OR_SOURCE /etc/xdg/canonical-certification.conf|awk '{print $3}')
+    echo $kvmurl
+    if [[ "$kvmurl" =~ .*\.img$ ]] ; then
+        /usr/bin/qemu-img check $kvmurl >/dev/null 2>&1
+        if [ $? = "0" ]; then
+            echo -e " $kvmurl is a valid image.\n Continuing to use this image"
+            pass
+            return 0
+        else
+            echo -e "$kvmurl is an invalid image. \n"
+            fail
+            return 0
+        fi
+    elif [[ "$kvmurl" =~ ^http ]] ; then
+        if curl --output /dev/null --silent --head -fail "$kvmurl"; then
+            echo -e " This is a valid source $kvmurl.\n Continuing to use this source"
+            pass
+        else
+            echo -e " This is not a valid source $kvmurl.\n Marking as failed"
+            fail
+        fi
+    else
+        echo -e " This is not a valid image or source"
+        echo -e " Leaving configuration but commenting out.\n Trying cloud image."
+        sudo sed -i '/^UVT_IMAGE_OR_SOURCE/ s/^#*/#/' /etc/xdg/canonical-certification.conf
+        fail
+    fi
+else
+    echo -e "  UVT_IMAGE_OR_SOURCE is not configured. \n uvt-simplestreams-libvirt will download images from cloud-images.ubuntu by default"
+    fail
+fi
+}
+
 # Check local availability of KVM image or pull from Internet, which tends to be slow
 KVM_Image_Check(){
 name="KVM Image Check"
diff --git a/units/packaging.pxu b/units/packaging.pxu
index 347b964..70b6430 100644
--- a/units/packaging.pxu
+++ b/units/packaging.pxu
@@ -1,7 +1,12 @@
 # This is for 'virtualization/kvm_check_vm'
 unit: packaging meta-data
 os-id: debian
-Depends: genisoimage
+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