From 6a0e403acf2382d6936894cf0f1b4f8ee29d66f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 2 Jul 2024 22:55:22 +0000 Subject: [PATCH 1/6] ci: Move `run-cri-containerd` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #9940. Signed-off-by: Aurélien Bombo --- .github/workflows/basic-ci-amd64.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index 5daf5c24d..d7f337bd7 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -15,8 +15,6 @@ on: jobs: run-cri-containerd: - # TODO: Transition to free runner (see #9940). - if: false strategy: # We can set this to true whenever we're 100% sure that # the all the tests are not flaky, otherwise we'll fail @@ -25,7 +23,7 @@ jobs: matrix: containerd_version: ['lts', 'active'] vmm: ['clh', 'dragonball', 'qemu', 'stratovirt', 'cloud-hypervisor', 'qemu-runtime-rs'] - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINERD_VERSION: ${{ matrix.containerd_version }} GOPATH: ${{ github.workspace }} From 9e1b6064dc8ddff6cd0288c15adf77372b2b58b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 2 Jul 2024 22:58:41 +0000 Subject: [PATCH 2/6] ci: Move `run-containerd-stability` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes the Docker installation step as that's preinstalled on the free runner: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md#tools Signed-off-by: Aurélien Bombo --- .github/workflows/basic-ci-amd64.yaml | 4 +--- tests/stability/gha-run.sh | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index d7f337bd7..b62c072c6 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -57,14 +57,12 @@ jobs: run: bash tests/integration/cri-containerd/gha-run.sh run run-containerd-stability: - # TODO: Transition to free runner (see #9940). - if: false strategy: fail-fast: false matrix: containerd_version: ['lts', 'active'] vmm: ['clh', 'cloud-hypervisor', 'dragonball', 'qemu', 'stratovirt'] - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINERD_VERSION: ${{ matrix.containerd_version }} GOPATH: ${{ github.workspace }} diff --git a/tests/stability/gha-run.sh b/tests/stability/gha-run.sh index 14bf1fcf6..4e9872d54 100755 --- a/tests/stability/gha-run.sh +++ b/tests/stability/gha-run.sh @@ -29,7 +29,6 @@ function install_dependencies() { sudo apt-get -y install "${system_deps[@]}" ensure_yq - install_docker check_ctr_images "${IMAGE}" "${DOCKERFILE}" } From 09cce86cc7794be23a46c40267b8e03d91a9ee6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 2 Jul 2024 23:00:19 +0000 Subject: [PATCH 3/6] ci: Move `run-nydus` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #9940. Signed-off-by: Aurélien Bombo --- .github/workflows/basic-ci-amd64.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index b62c072c6..f02a4153e 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -96,8 +96,6 @@ jobs: run: bash tests/stability/gha-run.sh run run-nydus: - # TODO: Transition to free runner (see #9940). - if: false strategy: # We can set this to true whenever we're 100% sure that # the all the tests are not flaky, otherwise we'll fail @@ -106,7 +104,7 @@ jobs: matrix: containerd_version: ['lts', 'active'] vmm: ['clh', 'qemu', 'dragonball', 'stratovirt'] - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINERD_VERSION: ${{ matrix.containerd_version }} GOPATH: ${{ github.workspace }} From 743a7655259e5b3a24f6015042a7a0cf0ebd8bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 2 Jul 2024 23:02:16 +0000 Subject: [PATCH 4/6] ci: Move `run-runk` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #9940. Signed-off-by: Aurélien Bombo --- .github/workflows/basic-ci-amd64.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index f02a4153e..2e3be594a 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -138,9 +138,7 @@ jobs: run: bash tests/integration/nydus/gha-run.sh run 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 c0919d6f45bfd36f9a0fd6d412f71dbe3c7310cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 2 Jul 2024 23:09:34 +0000 Subject: [PATCH 5/6] ci: Move `run-docker-tests` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed the Docker installation step as that's preinstalled in free runners. Signed-off-by: Aurélien Bombo --- .github/workflows/basic-ci-amd64.yaml | 4 +--- tests/integration/docker/gha-run.sh | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index 2e3be594a..a024d0a21 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -251,8 +251,6 @@ jobs: run: bash tests/functional/vfio/gha-run.sh run run-docker-tests: - # TODO: Transition to free runner (see #9940). - if: false strategy: # We can set this to true whenever we're 100% sure that # all the tests are not flaky, otherwise we'll fail them @@ -262,7 +260,7 @@ jobs: vmm: - clh - qemu - runs-on: garm-ubuntu-2304-smaller + runs-on: ubuntu-22.04 env: KATA_HYPERVISOR: ${{ matrix.vmm }} steps: diff --git a/tests/integration/docker/gha-run.sh b/tests/integration/docker/gha-run.sh index 82e20ebba..6860cd108 100755 --- a/tests/integration/docker/gha-run.sh +++ b/tests/integration/docker/gha-run.sh @@ -17,8 +17,6 @@ image="${image:-instrumentisto/nmap:latest}" function install_dependencies() { info "Installing the dependencies needed for running the docker smoke test" - install_docker - sudo -E docker pull "${image}" } From f18e35014f1388e9e02c26e213df5dcedc1da439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 2 Jul 2024 23:17:33 +0000 Subject: [PATCH 6/6] ci: Move `run-nerdctl-tests` to free runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #9940. Signed-off-by: Aurélien Bombo --- .github/workflows/basic-ci-amd64.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index a024d0a21..e26467c9a 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -292,8 +292,6 @@ jobs: run: bash tests/integration/docker/gha-run.sh run run-nerdctl-tests: - # TODO: Transition to free runner (see #9940). - if: false strategy: # We can set this to true whenever we're 100% sure that # all the tests are not flaky, otherwise we'll fail them @@ -308,7 +306,7 @@ jobs: # TODO: enable with clh when https://github.com/kata-containers/kata-containers/issues/9852 is fixed exclude: - vmm: clh - runs-on: garm-ubuntu-2304-smaller + runs-on: ubuntu-22.04 env: KATA_HYPERVISOR: ${{ matrix.vmm }} steps: