[Release-1.28] Backport E2E GHA fixes (#7177)

* Move test-suite to 24.04 and fix binary build Signed-off-by: Derek Nola <[email protected]> * Pin vagrant version to prevent E2E suite failure Signed-off-by: Derek Nola <[email protected]> --------- Signed-off-by: Derek Nola <[email protected]>
rancher · Nov 5, 2024 · 7c6a41e · 7c6a41e
1 parent 96bb2a6
commit 7c6a41e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.github/actions/vagrant-setup/action.yaml b/.github/actions/vagrant-setup/action.yaml
@@ -13,21 +13,18 @@ runs:
       shell: bash
       run: |
         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=2.4.1-1 ruby-libvirt
         sudo systemctl enable --now libvirtd
-    - name: Build vagrant dependencies
+    - name: Install vagrant dependencies
       shell: bash
       run: |
-        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
     # This is a workaround for the libvirt group not being available in the current shell
     # https://github.com/actions/runner-images/issues/7670#issuecomment-1900711711
     - name: Make the libvirt socket rw accessible to everyone
       shell: bash
       run: |
         sudo chmod a+rw /var/run/libvirt/libvirt-sock
-    
-
     - name: Install vagrant-libvirt plugin
       shell: bash
       run: vagrant plugin install vagrant-libvirt
diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   build:
     name: Build RKE2 Images and Binary
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
     - name: Install OS Packages
-      run: sudo apt-get install -y libarchive-tools g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64
+      run: sudo apt-get update && sudo apt-get install -y libarchive-tools g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64
     # Can only upload from a single path, so we need to copy the binary to the image directory
     # Additionally, we have a rke2-runtime.tar and a rke2-images.linux-amd64.tar.zst which are the same thing
     # just compressed. We remove the rke2-runtime.tar as its not used by the install script.
@@ -61,7 +61,7 @@ jobs:
   itest:
     needs: build
     name: Integration Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 45
     strategy:
       fail-fast: false
@@ -120,7 +120,7 @@ jobs:
   e2e:
     name: "E2E Tests"
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 40
     strategy:
       fail-fast: false