From c25183ff1998f11a2f5ee49bf1d2b28781c7ee4c Mon Sep 17 00:00:00 2001
From: Akhil Mohan <akhilerm@gmail.com>
Date: Wed, 19 Jun 2024 02:18:11 +0530
Subject: [PATCH] use older version of OVMF package

use ovmf 2022.02-3ubuntu0.22.04.2 so that the OVMF_CODE.fd which vagrant
looks for is still available

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
---
 .github/workflows/ci.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a85f877b5..ee84cf731 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -557,19 +557,29 @@ jobs:
           curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
           echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com jammy main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
           sudo sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
-          # we use vagrant from jammy since the sources are not yet available in noble
+          # we use vagrant from jammy since the sources are not yet available in noble for vagrant
+          # TODO: once vagrant package sources are available in ubuntu-24 this can be removed
           sudo tee -a /etc/apt/sources.list.d/ubuntu.sources <<EOF
           Types: deb deb-src
-          URIs: http://in.archive.ubuntu.com/ubuntu
+          URIs: http://archive.ubuntu.com/ubuntu
           Suites: jammy
           Components: main restricted universe multiverse
           Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
           EOF
+          echo "" | sudo tee -a /etc/apt/sources.list.d/ubuntu.sources > /dev/null
+          # jammy security needs to be added so that the compatible ovmf package can be fetched
+          sudo tee -a /etc/apt/sources.list.d/ubuntu.sources <<EOF
+          Types: deb deb-src
+          URIs: http://security.archive.ubuntu.com/ubuntu
+          Suites: jammy-security
+          Components: main restricted universe multiverse
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+          EOF
           sudo apt-get update
-          sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant
+          sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant ovmf=2022.02-3ubuntu0.22.04.2
           sudo systemctl enable --now libvirtd
           sudo apt-get build-dep -y vagrant ruby-libvirt
-          sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev ovmf
+          sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev
           sudo vagrant plugin install vagrant-libvirt
       - name: Boot VM
         run: sudo BOX=$BOX vagrant up --no-tty