From 645aaa6f7f1c590007e7c71d0a907e1e738b255d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Thu, 18 Jul 2024 21:12:15 +0000 Subject: [PATCH 1/4] ci: Move `run-monitor` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No change other than switching the runner - no dependency issue expected. Signed-off-by: Aurélien Bombo --- .github/workflows/run-kata-monitor-tests.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run-kata-monitor-tests.yaml b/.github/workflows/run-kata-monitor-tests.yaml index 39d7339936..575c0c7978 100644 --- a/.github/workflows/run-kata-monitor-tests.yaml +++ b/.github/workflows/run-kata-monitor-tests.yaml @@ -15,8 +15,6 @@ on: jobs: run-monitor: - # TODO: Transition to free runner (see #9940). - if: false strategy: fail-fast: false matrix: @@ -33,7 +31,7 @@ jobs: # TODO: enable with containerd when https://github.com/kata-containers/kata-containers/issues/9761 is fixed - container_engine: containerd vmm: qemu - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINER_ENGINE: ${{ matrix.container_engine }} #CONTAINERD_VERSION: ${{ matrix.containerd_version }} From b4ce84b9d202626f464633b06ce6252d956644b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Thu, 18 Jul 2024 21:17:44 +0000 Subject: [PATCH 2/4] ci: Move `run-runk` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No change other than switching the runner - no dependency issue expected. Signed-off-by: Aurélien Bombo --- .github/workflows/run-runk-tests.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run-runk-tests.yaml b/.github/workflows/run-runk-tests.yaml index 3079647e77..20b265575e 100644 --- a/.github/workflows/run-runk-tests.yaml +++ b/.github/workflows/run-runk-tests.yaml @@ -15,9 +15,7 @@ on: jobs: run-runk: - # TODO: Transition to free runner (see #9940). - if: false - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINERD_VERSION: lts steps: From ceab66b1ce4c420f17bfa423da6ce78dd772a502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Thu, 18 Jul 2024 21:21:57 +0000 Subject: [PATCH 3/4] ci: Run `build-checks-depending-on-kvm` for free MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also keeps the Rust installation step even though it's preinstalled, so that we use the version specified in versions.yaml. Signed-off-by: Aurélien Bombo --- .github/workflows/static-checks.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml index 0af8af653b..3e2a450c5d 100644 --- a/.github/workflows/static-checks.yaml +++ b/.github/workflows/static-checks.yaml @@ -40,9 +40,7 @@ jobs: instance: ubuntu-20.04 build-checks-depending-on-kvm: - # TODO: Transition to free runner (see #9940). - if: false - runs-on: garm-ubuntu-2004-smaller + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: From de98e467b4976e2f7ea59901fcdb665237af7d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Thu, 18 Jul 2024 21:24:27 +0000 Subject: [PATCH 4/4] ci: Use `ubuntu-22.04` instead of `ubuntu-latest` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 22.04 is the default today: https://github.com/actions/runner-images/blob/23da668261a3b37946cd594ef9f1d4e4bb9cd58e/README.md Being more specific will avoid unexpected errors when Github updates the default. Signed-off-by: Aurélien Bombo --- .github/workflows/PR-wip-checks.yaml | 2 +- .github/workflows/add-issues-to-project.yaml | 2 +- .github/workflows/add-pr-sizing-label.yaml | 2 +- .../workflows/build-kata-static-tarball-amd64.yaml | 4 ++-- .github/workflows/cargo-deny-runner.yaml | 2 +- .github/workflows/ci.yaml | 2 +- .github/workflows/cleanup-resources.yaml | 2 +- .github/workflows/commit-message-check.yaml | 2 +- .github/workflows/kata-runtime-classes-sync.yaml | 2 +- .github/workflows/move-issues-to-in-progress.yaml | 2 +- .github/workflows/payload-after-push.yaml | 2 +- .../publish-kata-deploy-payload-amd64.yaml | 2 +- .github/workflows/release-amd64.yaml | 2 +- .github/workflows/release.yaml | 14 +++++++------- .github/workflows/run-k8s-tests-on-aks.yaml | 2 +- .github/workflows/run-kata-coco-tests.yaml | 2 +- .../workflows/run-kata-deploy-tests-on-aks.yaml | 2 +- .github/workflows/stale.yaml | 2 +- .github/workflows/static-checks.yaml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/PR-wip-checks.yaml b/.github/workflows/PR-wip-checks.yaml index 98195b8867..7616b978ce 100644 --- a/.github/workflows/PR-wip-checks.yaml +++ b/.github/workflows/PR-wip-checks.yaml @@ -15,7 +15,7 @@ concurrency: jobs: pr_wip_check: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: WIP Check steps: - name: WIP Check diff --git a/.github/workflows/add-issues-to-project.yaml b/.github/workflows/add-issues-to-project.yaml index bed6b884f7..c7a12ccfd0 100644 --- a/.github/workflows/add-issues-to-project.yaml +++ b/.github/workflows/add-issues-to-project.yaml @@ -17,7 +17,7 @@ concurrency: jobs: add-new-issues-to-backlog: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Install hub run: | diff --git a/.github/workflows/add-pr-sizing-label.yaml b/.github/workflows/add-pr-sizing-label.yaml index 4af22cd95a..6058c2a23f 100644 --- a/.github/workflows/add-pr-sizing-label.yaml +++ b/.github/workflows/add-pr-sizing-label.yaml @@ -18,7 +18,7 @@ concurrency: jobs: add-pr-size-label: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index 8991516a4b..7b058923b9 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -23,7 +23,7 @@ on: jobs: build-asset: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: asset: @@ -108,7 +108,7 @@ jobs: if-no-files-found: error create-kata-tarball: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: build-asset steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/cargo-deny-runner.yaml b/.github/workflows/cargo-deny-runner.yaml index 608861d426..9e18198902 100644 --- a/.github/workflows/cargo-deny-runner.yaml +++ b/.github/workflows/cargo-deny-runner.yaml @@ -13,7 +13,7 @@ concurrency: jobs: cargo-deny-runner: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout Code diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 79feb3ce31..3528f86e04 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -95,7 +95,7 @@ jobs: secrets: inherit build-and-publish-tee-confidential-unencrypted-image: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/cleanup-resources.yaml b/.github/workflows/cleanup-resources.yaml index 52017a5871..d327ad55d6 100644 --- a/.github/workflows/cleanup-resources.yaml +++ b/.github/workflows/cleanup-resources.yaml @@ -6,7 +6,7 @@ on: jobs: cleanup-resources: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/commit-message-check.yaml b/.github/workflows/commit-message-check.yaml index 52ee3dcc42..bb697cbf87 100644 --- a/.github/workflows/commit-message-check.yaml +++ b/.github/workflows/commit-message-check.yaml @@ -18,7 +18,7 @@ env: jobs: commit-message-check: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: PR_AUTHOR: ${{ github.event.pull_request.user.login }} name: Commit Message Check diff --git a/.github/workflows/kata-runtime-classes-sync.yaml b/.github/workflows/kata-runtime-classes-sync.yaml index fdd671a715..ae3935872b 100644 --- a/.github/workflows/kata-runtime-classes-sync.yaml +++ b/.github/workflows/kata-runtime-classes-sync.yaml @@ -12,7 +12,7 @@ concurrency: jobs: kata-deploy-runtime-classes-check: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/move-issues-to-in-progress.yaml b/.github/workflows/move-issues-to-in-progress.yaml index 43583f9b07..b59544f8f5 100644 --- a/.github/workflows/move-issues-to-in-progress.yaml +++ b/.github/workflows/move-issues-to-in-progress.yaml @@ -13,7 +13,7 @@ on: jobs: move-linked-issues-to-in-progress: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Install hub if: ${{ !contains(github.event.pull_request.labels.*.name, 'force-skip-ci') }} diff --git a/.github/workflows/payload-after-push.yaml b/.github/workflows/payload-after-push.yaml index 588afb4a3b..a0507b3d2c 100644 --- a/.github/workflows/payload-after-push.yaml +++ b/.github/workflows/payload-after-push.yaml @@ -86,7 +86,7 @@ jobs: secrets: inherit publish-manifest: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [publish-kata-deploy-payload-amd64, publish-kata-deploy-payload-arm64, publish-kata-deploy-payload-s390x, publish-kata-deploy-payload-ppc64le] steps: - name: Checkout repository diff --git a/.github/workflows/publish-kata-deploy-payload-amd64.yaml b/.github/workflows/publish-kata-deploy-payload-amd64.yaml index 80b495d02a..c0d4f31337 100644 --- a/.github/workflows/publish-kata-deploy-payload-amd64.yaml +++ b/.github/workflows/publish-kata-deploy-payload-amd64.yaml @@ -24,7 +24,7 @@ on: jobs: kata-payload: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/release-amd64.yaml b/.github/workflows/release-amd64.yaml index a642e1782f..4ac868cdf2 100644 --- a/.github/workflows/release-amd64.yaml +++ b/.github/workflows/release-amd64.yaml @@ -16,7 +16,7 @@ jobs: kata-deploy: needs: build-kata-static-tarball-amd64 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Login to Kata Containers docker.io uses: docker/login-action@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b2ca8d04cb..128a4cbdab 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,7 +4,7 @@ on: jobs: release: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: secrets: inherit publish-multi-arch-images: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [build-and-push-assets-amd64, build-and-push-assets-arm64, build-and-push-assets-s390x, build-and-push-assets-ppc64le] steps: - name: Checkout repository @@ -78,7 +78,7 @@ jobs: upload-multi-arch-static-tarball: needs: [build-and-push-assets-amd64, build-and-push-assets-arm64, build-and-push-assets-s390x, build-and-push-assets-ppc64le] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -138,7 +138,7 @@ jobs: upload-versions-yaml: needs: release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -151,7 +151,7 @@ jobs: upload-cargo-vendored-tarball: needs: release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -164,7 +164,7 @@ jobs: upload-libseccomp-tarball: needs: release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -177,7 +177,7 @@ jobs: publish-release: needs: [ build-and-push-assets-amd64, build-and-push-assets-arm64, build-and-push-assets-s390x, build-and-push-assets-ppc64le, publish-multi-arch-images, upload-multi-arch-static-tarball, upload-versions-yaml, upload-cargo-vendored-tarball, upload-libseccomp-tarball ] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml index 0dba732f14..00cf04bc82 100644 --- a/.github/workflows/run-k8s-tests-on-aks.yaml +++ b/.github/workflows/run-k8s-tests-on-aks.yaml @@ -54,7 +54,7 @@ jobs: - host_os: cbl-mariner vmm: clh instance-type: normal - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: DOCKER_REGISTRY: ${{ inputs.registry }} DOCKER_REPO: ${{ inputs.repo }} diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index 994aacceff..17282d7654 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -240,7 +240,7 @@ jobs: - nydus pull-type: - guest-pull - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: DOCKER_REGISTRY: ${{ inputs.registry }} DOCKER_REPO: ${{ inputs.repo }} diff --git a/.github/workflows/run-kata-deploy-tests-on-aks.yaml b/.github/workflows/run-kata-deploy-tests-on-aks.yaml index c838b8d795..b397e8a871 100644 --- a/.github/workflows/run-kata-deploy-tests-on-aks.yaml +++ b/.github/workflows/run-kata-deploy-tests-on-aks.yaml @@ -37,7 +37,7 @@ jobs: include: - host_os: cbl-mariner vmm: clh - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: DOCKER_REGISTRY: ${{ inputs.registry }} DOCKER_REPO: ${{ inputs.repo }} diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index 5565543236..a54d7b924d 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -6,7 +6,7 @@ on: jobs: stale: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/stale@v9 with: diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml index 3e2a450c5d..4f0ff891be 100644 --- a/.github/workflows/static-checks.yaml +++ b/.github/workflows/static-checks.yaml @@ -13,7 +13,7 @@ concurrency: name: Static checks jobs: check-kernel-config-version: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout the code uses: actions/checkout@v4