From 7c6a41ea6790d975236e55a54daa2cc17645c5ff Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 5 Nov 2024 11:35:46 -0800 Subject: [PATCH] [Release-1.28] Backport E2E GHA fixes (#7177) * Move test-suite to 24.04 and fix binary build Signed-off-by: Derek Nola * Pin vagrant version to prevent E2E suite failure Signed-off-by: Derek Nola --------- Signed-off-by: Derek Nola --- .github/actions/vagrant-setup/action.yaml | 7 ++----- .github/workflows/test-suite.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/actions/vagrant-setup/action.yaml b/.github/actions/vagrant-setup/action.yaml index 37f268809e..ebd4ac01da 100644 --- a/.github/actions/vagrant-setup/action.yaml +++ b/.github/actions/vagrant-setup/action.yaml @@ -13,12 +13,11 @@ 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 @@ -26,8 +25,6 @@ runs: 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 \ No newline at end of file diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index 58d3588f15..1478e1969a 100644 --- 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