test

Signed-off-by: Corey Hemminger <[email protected]>
chef · Apr 2, 2024 · b36578a · b36578a
1 parent c429861
commit b36578a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml
@@ -18,11 +18,15 @@ jobs:
       - name: Install Vagrant and VirtualBox
         run: |
           wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
-          wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor | sudo tee /usr/share/keyrings/oracle-virtualbox-2016.gpg
+          # wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor | sudo tee /usr/share/keyrings/oracle-virtualbox-2016.gpg
+          wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add -
           echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
-          echo "deb [arch=amd64 signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list
-          sudo apt-get update
-          sudo apt-get install -y vagrant virtualbox
+          # echo "deb [arch=amd64 signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list
+          echo "deb [arch=amd64] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list
+          sudo apt update
+          sudo apt install -y software-properties-common vagrant virtualbox
+          VBoxManage --version
+          Vagrant --version
       - name: Install Chef
         uses: actionshub/[email protected]
       - name: Setup Packer
@@ -38,7 +42,7 @@ jobs:
           gem install bento-*.gem
       - name: Bento build
         run: |
-          ./${{ matrix.os }}-x86_64-virtualbox.sh
+          ./${{ matrix.os }}-x86_64-virtualbox-build.sh
           ls -alh builds
       - name: Bento Test
         run: bento test

diff --git a/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl b/os_pkrvars/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl
@@ -1,8 +1,8 @@
-os_name            = "amazonlinux"
-os_version         = "2"
-os_arch            = "x86_64"
-vbox_source_path   = "https://cdn.amazonlinux.com/os-images/latest/virtualbox/amzn2-virtualbox-2.0.20240306.2-x86_64.xfs.gpt.vdi"
-vbox_checksum      = "file:https://cdn.amazonlinux.com/os-images/latest/virtualbox/SHA256SUMS"
+os_name                 = "amazonlinux"
+os_version              = "2"
+os_arch                 = "x86_64"
+vbox_source_path        = "https://cdn.amazonlinux.com/os-images/latest/virtualbox/amzn2-virtualbox-2.0.20240306.2-x86_64.xfs.gpt.vdi"
+vbox_checksum           = "file:https://cdn.amazonlinux.com/os-images/latest/virtualbox/SHA256SUMS"
 parallels_guest_os_type = "centos"
 vbox_guest_os_type      = "RedHat_64"
 vmware_guest_os_type    = "rhel9-64"