diff --git a/.github/workflows/run-k8s-tests-on-garm.yaml b/.github/workflows/run-k8s-tests-on-garm.yaml index 4736baa07f..9b8c4c4eea 100644 --- a/.github/workflows/run-k8s-tests-on-garm.yaml +++ b/.github/workflows/run-k8s-tests-on-garm.yaml @@ -1,4 +1,4 @@ -name: CI | Run kubernetes tests on GARM +name: CI | Run kubernetes tests on: workflow_call: inputs: @@ -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-22.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: all steps: - uses: actions/checkout@v4 with: @@ -76,7 +70,7 @@ jobs: - name: Deploy Kata timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh deploy-kata-garm + run: bash tests/integration/kubernetes/gha-run.sh deploy-kata - name: Install `bats` run: bash tests/integration/kubernetes/gha-run.sh install-bats @@ -93,10 +87,10 @@ jobs: - name: Archive artifacts ${{ matrix.vmm }} uses: actions/upload-artifact@v4 with: - name: k8s-tests-garm-${{ matrix.vmm }}-${{ matrix.snapshotter }}-${{ matrix.k8s }}-${{ matrix.instance }}-${{ inputs.tag }} + name: k8s-tests-${{ matrix.vmm }}-${{ matrix.snapshotter }}-${{ matrix.k8s }}-${{ matrix.instance }}-${{ inputs.tag }} path: /tmp/artifacts retention-days: 1 - name: Delete kata-deploy if: always() - run: bash tests/integration/kubernetes/gha-run.sh cleanup-garm + run: bash tests/integration/kubernetes/gha-run.sh cleanup