diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index 5daf5c24d9..e26467c9a8 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 }} @@ -59,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 }} @@ -100,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 @@ -110,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 }} @@ -144,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: @@ -259,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 @@ -270,7 +260,7 @@ jobs: vmm: - clh - qemu - runs-on: garm-ubuntu-2304-smaller + runs-on: ubuntu-22.04 env: KATA_HYPERVISOR: ${{ matrix.vmm }} steps: @@ -302,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 @@ -318,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: diff --git a/tests/integration/docker/gha-run.sh b/tests/integration/docker/gha-run.sh index 82e20ebba6..6860cd108a 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}" } diff --git a/tests/stability/gha-run.sh b/tests/stability/gha-run.sh index 14bf1fcf6c..4e9872d54d 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}" }