fixed clean-slate-deployment of VMs

Author: Wulf Thimm

.werft/jobs/build/prepare.ts

@@ -19,8 +19,9 @@ export async function prepare(werft: Werft, config: JobConfig) {
         configureDocker()
         configureCoreDevAccess()
         werft.done(prepareSlices.CONFIGURE_CORE_DEV)
-
-        decideHarvesterVMCreation(werft, config)
+        if (config.withVM) {
+            prepareVM(werft, config)
+        }
     } catch (err) {
         werft.fail(phaseName, err);
     }
@@ -62,27 +63,23 @@ function configureCoreDevAccess() {
     }
 }
 
-function decideHarvesterVMCreation(werft: Werft, config: JobConfig) {
-    if (config.withVM && !VM.vmExists({ name: config.previewEnvironment.destname })) {
-        prepareVM(werft, config)
-    } else {
-        werft.currentPhaseSpan.setAttribute("werft.harvester.created_vm", false)
-    }
-    werft.done(prepareSlices.BOOT_VM)
-}
-
 function prepareVM(werft: Werft, config: JobConfig) {
-    if (config.cleanSlateDeployment) {
+    const vmExists = VM.vmExists({ name: config.previewEnvironment.destname })
+    if (!vmExists) {
+        createVM(werft, config, prepareSlices.BOOT_VM)
+    }
+    else if (config.cleanSlateDeployment && vmExists) {
         werft.log(prepareSlices.BOOT_VM, "Cleaning previously created VM")
         VM.deleteVM({ name: config.previewEnvironment.destname })
+        createVM(werft, config, prepareSlices.BOOT_VM)
     }
-    createVM(werft, config, prepareSlices.BOOT_VM)
+    werft.done(prepareSlices.BOOT_VM)
 }
 
 // createVM only triggers the VM creation.
 // Readiness is not guaranted.
 function createVM(werft: Werft, config: JobConfig, slice: string) {
-    werft.log(slice, 'Booting  VM')
+    werft.log(slice, 'Creating VM')
     VM.startVM({ name: config.previewEnvironment.destname })
     werft.currentPhaseSpan.setAttribute("werft.harvester.created_vm", true)
 }