From 45f9d679f8ccb252c28bd69197b7fbd618f91bbe Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Tue, 8 Apr 2025 12:49:26 -0700 Subject: [PATCH] Update remaining Ubuntu 20.04 uses to 22.04 and 24.04 Signed-off-by: Derek McGowan --- .github/workflows/.test.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 64ee5908c1..49508e0d7b 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -222,7 +222,7 @@ jobs: retention-days: 1 integration-flaky: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 120 # guardrails timeout for the whole job continue-on-error: ${{ github.event_name != 'pull_request' }} steps: @@ -267,14 +267,12 @@ jobs: with: script: | let includes = [ - { os: 'ubuntu-20.04', mode: '' }, - { os: 'ubuntu-20.04', mode: 'rootless' }, - { os: 'ubuntu-20.04', mode: 'systemd' }, - { os: 'ubuntu-24.04', mode: '' }, + { os: 'ubuntu-22.04', mode: '' }, { os: 'ubuntu-22.04', mode: 'rootless' }, + { os: 'ubuntu-22.04', mode: 'systemd' }, + { os: 'ubuntu-24.04', mode: '' }, // { os: 'ubuntu-24.04', mode: 'rootless' }, // FIXME: https://github.com/moby/moby/pull/49579#issuecomment-2698622223 { os: 'ubuntu-24.04', mode: 'systemd' }, - // { os: 'ubuntu-20.04', mode: 'rootless-systemd' }, // FIXME: https://github.com/moby/moby/issues/44084 // { os: 'ubuntu-24.04', mode: 'rootless-systemd' }, // FIXME: https://github.com/moby/moby/issues/44084 ]; if ("${{ inputs.storage }}" == "snapshotter") { @@ -488,7 +486,7 @@ jobs: echo ${{ steps.set.outputs.matrix }} integration-cli: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 120 # guardrails timeout for the whole job continue-on-error: ${{ github.event_name != 'pull_request' }} needs: