get VM_NAME from hcl instead of json in builder/build-image.sh

EGI-Federation · Aug 28, 2024 · cb68e45 · cb68e45
1 parent 6f1bb24
commit cb68e45
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/builder/build-image.sh b/builder/build-image.sh
@@ -40,12 +40,12 @@ packer plugins install github.com/hashicorp/ansible
 # do the build
 if tools/build.sh "$IMAGE" >/var/log/image-build.log 2>&1; then
     # compress the resulting image
-    VM_NAME="$(jq -r ".builders[].vm_name" < "$IMAGE")"
+    QEMU_SOURCE_ID=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu | keys[]')
+    VM_NAME=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu.'"$QEMU_SOURCE_ID"'.vm_name')
     QCOW_FILE="$VM_NAME.qcow2"
     builder/refresh.sh vo.access.egi.eu "$(cat /var/tmp/egi/.refresh_token)" images
     OS_TOKEN="$(yq -r '.clouds.images.auth.token' /etc/openstack/clouds.yaml)"
-    OUTPUT_DIR=$(hcl2tojson "$IMAGE" | jq -r '.source[0].qemu | keys[]')
-    OUTPUT_DIR="$(dirname "$IMAGE")/output-$OUTPUT_DIR"
+    OUTPUT_DIR="$(dirname "$IMAGE")/output-$QEMU_SOURCE_ID"
     cd "$OUTPUT_DIR"
     qemu-img convert -O qcow2 -c "$VM_NAME" "$QCOW_FILE"
     openstack --os-cloud images --os-token "$OS_TOKEN" \

diff --git a/ubuntu/datahub-jupyter-ubuntu-22.04.pkr.hcl b/ubuntu/datahub-jupyter-ubuntu-22.04.pkr.hcl
@@ -21,7 +21,7 @@ variable "SSH_PUB_KEY" {
   default = ""
 }
 
-source "qemu" "datahub-jupyter-ubuntu-22-04" {
+source "qemu" "datahub_jupyter_ubuntu_22_04" {
   boot_command              = [
     "c<wait>",
     "linux /casper/vmlinuz --- autoinstall ds=\"nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/\"",

diff --git a/ubuntu/docker-ubuntu-22.04.pkr.hcl b/ubuntu/docker-ubuntu-22.04.pkr.hcl
@@ -21,7 +21,7 @@ variable "SSH_PUB_KEY" {
   default = ""
 }
 
-source "qemu" "docker-ubuntu-22-04" {
+source "qemu" "docker_ubuntu_22_04" {
   boot_command              = [
     "c<wait>",
     "linux /casper/vmlinuz --- autoinstall ds=\"nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/\"",

diff --git a/ubuntu/small-ubuntu-20.04.pkr.hcl b/ubuntu/small-ubuntu-20.04.pkr.hcl
@@ -21,7 +21,7 @@ variable "SSH_PUB_KEY" {
   default = ""
 }
 
-source "qemu" "small-ubuntu-20-04" {
+source "qemu" "small_ubuntu_20_04" {
   boot_command              = [
     "<enter><enter><f6><esc><wait>",
     "<bs><bs><bs><bs><bs><bs><bs><bs>",

diff --git a/ubuntu/ubuntu-20.04.pkr.hcl b/ubuntu/ubuntu-20.04.pkr.hcl
@@ -21,7 +21,7 @@ variable "SSH_PUB_KEY" {
   default = ""
 }
 
-source "qemu" "ubuntu-20-04" {
+source "qemu" "ubuntu_20_04" {
   boot_command              = [
     "<enter><enter><f6><esc><wait>",
     "<bs><bs><bs><bs><bs><bs><bs><bs>",

diff --git a/ubuntu/ubuntu-22.04.pkr.hcl b/ubuntu/ubuntu-22.04.pkr.hcl
@@ -21,7 +21,7 @@ variable "SSH_PUB_KEY" {
   default = ""
 }
 
-source "qemu" "ubuntu-22-04" {
+source "qemu" "ubuntu_22_04" {
   boot_command              = [
     "c<wait>",
     "linux /casper/vmlinuz --- autoinstall ds=\"nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/\"",

diff --git a/ubuntu/ubuntu-24.04.pkr.hcl b/ubuntu/ubuntu-24.04.pkr.hcl
@@ -21,7 +21,7 @@ variable "SSH_PUB_KEY" {
   default = ""
 }
 
-source "qemu" "ubuntu-24-04" {
+source "qemu" "ubuntu_24_4" {
   boot_command              = [
     "c<wait>",
     "linux /casper/vmlinuz --- autoinstall ds=\"nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/\"",