test22

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
chef · Apr 3, 2024 · d1bdd70 · d1bdd70
1 parent 1e6aef8
commit d1bdd70
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml
@@ -46,14 +46,6 @@ jobs:
           cat builds/${{ matrix.os }}*-x86_64._metadata.json
       - name: Bento Test
         run: bento test
-#      - name: Remove VM in case of canceled job
-#        if: cancelled()
-#        run: |
-#          echo Powering off and deleting any existing VMs named AmazonLinuxBento
-#          VBoxManage controlvm AmazonLinuxBento poweroff --type headless 2> /dev/null
-#          sleep 1
-#          VBoxManage unregistervm AmazonLinuxBento --delete 2> /dev/null
-#          sleep 2
       - name: Upload build artifact
         uses: actions/upload-artifact@main
         with:

diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@main
         with:
-          name: "${{ matrix.os }}-virtualbox-x86_64"
+          name: "${{ matrix.os }}-qemu-x86_64"
           path: |
             builds
             !builds/uploaded/*

diff --git a/amazonlinux-2-x86_64-virtualbox-build.sh b/amazonlinux-2-x86_64-virtualbox-build.sh
@@ -24,7 +24,16 @@ echo "Cleaning up old files"
 rm -f "$AMZDIR"/*.iso "$AMZDIR"/*.ovf "$AMZDIR"/*.vmdk
 
 echo "Creating ISO"
-hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso
+if [ -x "$(command -v genisoimage)" ]; then
+  genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz-seed_iso/meta-data
+elif [ -x "$(command -v hdiutil)" ]; then
+  hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso
+elif [ -x "$(command -v mkisofs)" ]; then
+  mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso
+else
+  echo "No tool found to create the seed.iso"
+  exit 1
+fi
 
 VM="AmazonLinuxBento"
 echo Powering off and deleting any existing VMs named $VM

diff --git a/amazonlinux-2023-aarch64-virtualbox-build.sh b/amazonlinux-2023-aarch64-virtualbox-build.sh
@@ -26,7 +26,16 @@ if [ ! -f "$AMZDIR"/amazon2023_arm64.vdi ]; then
 fi
 
 echo "Creating ISO"
-hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso
+if [ -x "$(command -v genisoimage)" ]; then
+  genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz-seed_iso/meta-data
+elif [ -x "$(command -v hdiutil)" ]; then
+  hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso
+elif [ -x "$(command -v mkisofs)" ]; then
+  mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso
+else
+  echo "No tool found to create the seed.iso"
+  exit 1
+fi
 
 VM="AmazonLinuxBento"
 echo Powering off and deleting any existing VMs named $VM

diff --git a/amazonlinux-2023-x86_64-virtualbox-build.sh b/amazonlinux-2023-x86_64-virtualbox-build.sh
@@ -26,7 +26,16 @@ if [ ! -f "$AMZDIR"/amazon2023_x86_64.vdi ]; then
 fi
 
 echo "Creating ISO"
-hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso
+if [ -x "$(command -v genisoimage)" ]; then
+  genisoimage -output "$AMZDIR"/seed.iso -volid cidata -joliet -rock "$AMZDIR"/../amz_seed_iso/user-data "$AMZDIR"/../amz-seed_iso/meta-data
+elif [ -x "$(command -v hdiutil)" ]; then
+  hdiutil makehybrid -o "$AMZDIR"/seed.iso -hfs -joliet -iso -default-volume-name cidata "$AMZDIR"/../amz_seed_iso
+elif [ -x "$(command -v mkisofs)" ]; then
+  mkfsiso9660 -o "$AMZDIR"/seed.iso "$AMZDIR"/../amz_seed_iso
+else
+  echo "No tool found to create the seed.iso"
+  exit 1
+fi
 
 VM="AmazonLinuxBento"
 echo Powering off and deleting any existing VMs named $VM