qemu-secex: reuse locally generated genprotimgvm when available

Author: nikita-dubrovskii

src/cmd-osbuild

@@ -78,26 +78,31 @@ json.dump(j, sys.stdout, indent=4)
 # VM to run genprotimg and save off the pubkey for Ignition.
 postprocess_qemu_secex() {
     if [ ! -f "${genprotimgvm}" ]; then
-        if [ ! -f "${hostkey}" ]; then
-            fatal "No hostkey and no genprotimgvm provided"
+        echo "No genprotimgvm provided"
+        genprotimgvm="${workdir}/tmp/fake-secure-vm.qcow2"
+        if [ -f "${genprotimgvm}" ]; then
+            echo "Found locally generated ${genprotimgvm}, skipping generation"
+        else
+            if [ ! -f "${hostkey}" ]; then
+                fatal "No hostkey and no genprotimgvm provided"
+            fi
+            echo "Generating ${genprotimgvm} locally"
+            local ignition_cfg=$(mktemp -p "${tmp_builddir}")
+            local butane_cfg=$(mktemp -p "${tmp_builddir}")
+
+            echo "Injecting user-provided hostkey into config"
+            local hostkey_name=$(basename "${hostkey}")
+            local hostkey_path=$(dirname "${hostkey}")
+            cp /usr/lib/coreos-assembler/secex-genprotimgvm-scripts/genprotimg.bu "${butane_cfg}"
+            sed -i 's/HOSTKEY-FILE/'"${hostkey_name}"'/g' "${butane_cfg}"
+            butane -p -d "${hostkey_path}" "${butane_cfg}" -o "${ignition_cfg}"
+
+            cp "/srv/builds/latest/${basearch}/${name}-${build}-qemu.${basearch}.${image_format}" "${genprotimgvm}"
+            chmod +w "${genprotimgvm}"
+            genvm_args=("-drive" "if=none,id=hda,file=${genprotimgvm},auto-read-only=off,cache=unsafe" \
+                        "-device" "virtio-blk,drive=hda,bootindex=1")
+            kola qemuexec -i "${ignition_cfg}" -- "${genvm_args[@]}"
         fi
-        echo "Generating genprotimgvm locally"
-        local ignition_cfg=$(mktemp -p "${tmp_builddir}")
-        local butane_cfg=$(mktemp -p "${tmp_builddir}")
-
-        echo "Injecting user-provided hostkey into config"
-        local hostkey_name=$(basename "${hostkey}")
-        local hostkey_path=$(dirname "${hostkey}")
-        cp /usr/lib/coreos-assembler/secex-genprotimgvm-scripts/genprotimg.bu "${butane_cfg}"
-        sed -i 's/HOSTKEY-FILE/'"${hostkey_name}"'/g' "${butane_cfg}"
-        butane -p -d "${hostkey_path}" "${butane_cfg}" -o "${ignition_cfg}"
-
-        genprotimgvm=/srv/fake-secure-vm.qcow2
-        cp "/srv/builds/latest/${basearch}/${name}-${build}-qemu.${basearch}.${image_format}" "${genprotimgvm}"
-        chmod +w "${genprotimgvm}"
-        genvm_args=("-drive" "if=none,id=hda,file=${genprotimgvm},auto-read-only=off,cache=unsafe" \
-                    "-device" "virtio-blk,drive=hda,bootindex=1")
-        kola qemuexec -i "${ignition_cfg}" -- "${genvm_args[@]}"
     fi
 
     # Basic qemu args: