diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index 45765cee9..302eaeb17 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -23,7 +23,7 @@ jobs: matrix: containerd_version: ['lts', 'active'] vmm: ['clh', 'dragonball', 'qemu', 'stratovirt'] - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINERD_VERSION: ${{ matrix.containerd_version }} GOPATH: ${{ github.workspace }} @@ -62,7 +62,7 @@ jobs: 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 }} @@ -104,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 }} @@ -138,7 +138,7 @@ jobs: run: bash tests/integration/nydus/gha-run.sh run run-runk: - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINERD_VERSION: lts steps: @@ -176,7 +176,7 @@ jobs: vmm: - clh # cloud-hypervisor - qemu - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: KATA_HYPERVISOR: ${{ matrix.vmm }} steps: diff --git a/.github/workflows/run-k8s-tests-on-garm.yaml b/.github/workflows/run-k8s-tests-on-garm.yaml index 7853cffd8..0a2b6dfc0 100644 --- a/.github/workflows/run-k8s-tests-on-garm.yaml +++ b/.github/workflows/run-k8s-tests-on-garm.yaml @@ -38,13 +38,7 @@ jobs: k8s: - k3s instance: - - garm-ubuntu-2004 - - garm-ubuntu-2004-smaller - include: - - instance: garm-ubuntu-2004 - instance-type: normal - - instance: garm-ubuntu-2004-smaller - instance-type: small + - ubuntu-20.04 runs-on: ${{ matrix.instance }} env: DOCKER_REGISTRY: ${{ inputs.registry }} @@ -55,7 +49,7 @@ jobs: KUBERNETES: ${{ matrix.k8s }} SNAPSHOTTER: ${{ matrix.snapshotter }} USING_NFD: "false" - K8S_TEST_HOST_TYPE: ${{ matrix.instance-type }} + K8S_TEST_HOST_TYPE: normal steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/run-k8s-tests-with-crio-on-garm.yaml b/.github/workflows/run-k8s-tests-with-crio-on-garm.yaml index 0370e1031..276dacb5a 100644 --- a/.github/workflows/run-k8s-tests-with-crio-on-garm.yaml +++ b/.github/workflows/run-k8s-tests-with-crio-on-garm.yaml @@ -32,13 +32,10 @@ jobs: k8s: - k0s instance: - - garm-ubuntu-2204 - - garm-ubuntu-2204-smaller + - ubuntu-22.04 include: - - instance: garm-ubuntu-2204 + - instance: ubuntu-22.04 instance-type: normal - - instance: garm-ubuntu-2204-smaller - instance-type: small - k8s: k0s k8s-extra-params: '--cri-socket remote:unix:///var/run/crio/crio.sock --kubelet-extra-args --cgroup-driver="systemd"' runs-on: ${{ matrix.instance }} diff --git a/.github/workflows/run-kata-monitor-tests.yaml b/.github/workflows/run-kata-monitor-tests.yaml index 98e2a2276..45df74e67 100644 --- a/.github/workflows/run-kata-monitor-tests.yaml +++ b/.github/workflows/run-kata-monitor-tests.yaml @@ -26,7 +26,7 @@ jobs: include: - container_engine: containerd containerd_version: lts - runs-on: garm-ubuntu-2204-smaller + runs-on: ubuntu-22.04 env: CONTAINER_ENGINE: ${{ matrix.container_engine }} CONTAINERD_VERSION: ${{ matrix.containerd_version }} diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml index 3a232177b..35cd1596f 100644 --- a/.github/workflows/static-checks.yaml +++ b/.github/workflows/static-checks.yaml @@ -40,7 +40,7 @@ jobs: instance: ubuntu-20.04 build-checks-depending-on-kvm: - runs-on: garm-ubuntu-2004-smaller + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: