From 7d431d88c34270af426f4d402e8a49a6826ad1ed Mon Sep 17 00:00:00 2001
From: djpbessems <danny@bessems.eu>
Date: Wed, 5 Jun 2024 12:58:22 +1000
Subject: [PATCH] build: Remove redundant packer parameters

---
 .gitea/workflows/actions.yaml | 8 +++++---
 packer/source.pkr.hcl         | 5 +----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/actions.yaml b/.gitea/workflows/actions.yaml
index ccf7109..8264385 100644
--- a/.gitea/workflows/actions.yaml
+++ b/.gitea/workflows/actions.yaml
@@ -78,11 +78,10 @@ jobs:
       - name: Run `packer validate`
         id: validate
         run: |
-          echo "${{ gitea.sha }}" | cut -c 1-10
-          echo "$(openssl rand -hex 3)"
+          echo "${{ gitea.run_number }}-${BUILD_COMMIT}-${BUILD_SUFFIX}"
           packer validate \
             -only=vsphere-iso.bootstrap \
-            -var vm_name=${{ gitea.run_number }}-$(echo "${{ gitea.sha }}" | cut -c 1-10) \
+            -var vm_name=${{ gitea.run_number }}-${BUILD_COMMIT}-${$BUILD_SUFFIX} \
             -var docker_username=${{ secrets.DOCKER_USERNAME }} \
             -var docker_password=${{ secrets.DOCKER_PASSWORD }} \
             -var repo_username=${{ secrets.REPO_USERNAME }} \
@@ -92,6 +91,9 @@ jobs:
             -var k8s_version=${{ steps.get_k8sversion.outputs.result }} \
             -var appliance_version=${{ needs.semrel_dryrun.outputs.version }} \
             ./packer
+        env:
+          BUILD_COMMIT: echo "${{ gitea.sha }}" | cut -c 1-10
+          BUILD_SUFFIX: echo "$(openssl rand -hex 3)"
       - name: Run `packer build`
         run: |
           packer build \
diff --git a/packer/source.pkr.hcl b/packer/source.pkr.hcl
index dea0b0a..7b99fad 100644
--- a/packer/source.pkr.hcl
+++ b/packer/source.pkr.hcl
@@ -54,8 +54,5 @@ source "vsphere-iso" "ubuntu" {
 
   remove_cdrom            = true
 
-  export {
-    images                = false
-    output_directory      = "/scratch"
-  }
+  output_directory        = "/scratch"
 }