Improve post porocessing, add retry, timeout

OpenNebula · Nov 6, 2023 · 6b1f7f9 · 6b1f7f9
1 parent d2d2eaa
commit 6b1f7f9
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 78 deletions.
diff --git a/packer/alma/alma.pkr.hcl b/packer/alma/alma.pkr.hcl
@@ -65,12 +65,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/alpine/alpine.pkr.hcl b/packer/alpine/alpine.pkr.hcl
@@ -55,12 +55,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/alt/alt.pkr.hcl b/packer/alt/alt.pkr.hcl
@@ -65,12 +65,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/amazon/amazon.pkr.hcl b/packer/amazon/amazon.pkr.hcl
@@ -65,12 +65,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/centos/centos.pkr.hcl b/packer/centos/centos.pkr.hcl
@@ -65,12 +65,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/debian/debian.pkr.hcl b/packer/debian/debian.pkr.hcl
@@ -64,12 +64,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/devuan/devuan.pkr.hcl b/packer/devuan/devuan.pkr.hcl
@@ -50,12 +50,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/fedora/fedora.pkr.hcl b/packer/fedora/fedora.pkr.hcl
@@ -64,12 +64,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/ol/ol.pkr.hcl b/packer/ol/ol.pkr.hcl
@@ -65,12 +65,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/opensuse/opensuse.pkr.hcl b/packer/opensuse/opensuse.pkr.hcl
@@ -67,12 +67,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/postprocess.sh b/packer/postprocess.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+timeout 5m virt-sysprep \
+    --add ${OUTPUT_DIR}/${APPLIANCE_NAME} \
+    --selinux-relabel \
+    --root-password disabled \
+    --hostname localhost.localdomain \
+    --run-command 'truncate -s0 -c /etc/machine-id' \
+    --delete /etc/resolv.conf
+
+# virt-sparsify was haning sometimes
+for I in 1 2 3; do
+    timeout 5m virt-sparsify \
+        --in-place ${OUTPUT_DIR}/${APPLIANCE_NAME} && break
+done
diff --git a/packer/rhel/rhel.pkr.hcl b/packer/rhel/rhel.pkr.hcl
@@ -71,12 +71,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/rocky/rocky.pkr.hcl b/packer/rocky/rocky.pkr.hcl
@@ -49,12 +49,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }
diff --git a/packer/ubuntu/ubuntu.pkr.hcl b/packer/ubuntu/ubuntu.pkr.hcl
@@ -65,12 +65,12 @@ build {
     expect_disconnect = true
   }
 
-  post-processors {
-    post-processor "shell-local" {
-      inline = [
-        "virt-sysprep --add ${var.output_dir}/${var.appliance_name} --selinux-relabel --root-password disabled --hostname localhost.localdomain --run-command 'truncate -s0 -c /etc/machine-id' --delete /etc/resolv.conf",
-        "virt-sparsify --in-place ${var.output_dir}/${var.appliance_name}"
+  post-processor "shell-local" {
+    execute_command   = ["bash", "-c", "{{.Vars}} {{.Script}}"]
+    environment_vars = [
+      "OUTPUT_DIR=${var.output_dir}",
+      "APPLIANCE_NAME=${var.appliance_name}",
       ]
-    }
+    scripts = [ "packer/postprocess.sh" ]
   }
 }