From 48f66663a43f3a3407278d21b7d4957ed29f1d1c Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 23 Oct 2023 21:54:47 +0200
Subject: [PATCH] copr-backend: convert all uploaded images to raw format

---
 .../templates/provision/upload-qcow2-images   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/roles/copr/backend/templates/provision/upload-qcow2-images b/roles/copr/backend/templates/provision/upload-qcow2-images
index c811451f22..d0210dd7f8 100755
--- a/roles/copr/backend/templates/provision/upload-qcow2-images
+++ b/roles/copr/backend/templates/provision/upload-qcow2-images
@@ -30,6 +30,18 @@ export VIRSH_DEFAULT_CONNECT_URI=
 test -n "$image" || die "first argument (image) required"
 test -f "$image" || die "image $image not found"
 
+# Per osuosl stack admin suggestion, ad long BUILD state (this decreases the
+# BUILD time from 3 minutes to < 20s):
+#   If you want it faster, I recommend you upload it as raw otherwise the
+#   hypervisor has to import the image into Ceph every time you build a new
+#   VM.
+# Actually, per 2023 research in https://github.com/fedora-copr/copr/issues/2869
+# converting all images to raw make our builds spawn much faster (ssh available
+# in 30s compared to 10 and more minutes with qcow2).
+qemu-img convert -O raw "$image" "$image.raw"
+cp --sparse=always "$image.raw" "$image"
+rm "$image.raw"
+
 pool=images
 for connection in $libvirt_connections; do
     virsh --connect="$connection" vol-create-as --pool "$pool" "$new_volume" 1M
@@ -41,19 +53,11 @@ ppc64le)
     # We are going to upload the same image to OpenStack
     . "{{ provision_directory }}/.rc-osuosl.sh"
 
-    # Per osuosl stack admin suggestion, ad long BUILD state:
-    #   If you want it faster, I recommend you upload it as raw otherwise the
-    #   hypervisor has to import the image into Ceph every time you build a new
-    #   VM.
-    # (this decreases the BUILD time from 3 minutes to < 20s)
-    file=/tmp/raw-image
-    rm -rf "$file"
-    qemu-img convert "$image" "$file"
     glance image-create \
         --name "$new_volume" \
         --disk-format raw \
         --container-format bare \
-        --file "$file" --progress
+        --file "$image" --progress
     ;;
 esac