diff --git a/.github/workflows/run-k8s-tests-on-nvidia-gpu.yaml b/.github/workflows/run-k8s-tests-on-nvidia-gpu.yaml index 5a6da266b4..7c563ff3c2 100644 --- a/.github/workflows/run-k8s-tests-on-nvidia-gpu.yaml +++ b/.github/workflows/run-k8s-tests-on-nvidia-gpu.yaml @@ -37,8 +37,10 @@ jobs: fail-fast: false matrix: environment: [ - { name: nvidia-gpu, vmm: qemu-nvidia-gpu, runner: amd64-nvidia-a100 }, - { name: nvidia-gpu-snp, vmm: qemu-nvidia-gpu-snp, runner: amd64-nvidia-h100-snp }, + { name: nvidia-gpu, vmm: qemu-nvidia-gpu, runner: amd64-nvidia-a100, coco: false }, + { name: nvidia-gpu (runtime-rs), vmm: qemu-nvidia-gpu-runtime-rs, runner: amd64-nvidia-a100, coco: false }, + { name: nvidia-gpu-snp, vmm: qemu-nvidia-gpu-snp, runner: amd64-nvidia-h100-snp, coco: true }, + { name: nvidia-gpu-snp (runtime-rs), vmm: qemu-nvidia-gpu-snp-runtime-rs, runner: amd64-nvidia-h100-snp, coco: true }, ] runs-on: ${{ matrix.environment.runner }} env: @@ -48,9 +50,9 @@ jobs: GH_PR_NUMBER: ${{ inputs.pr-number }} KATA_HYPERVISOR: ${{ matrix.environment.vmm }} KUBERNETES: kubeadm - KBS: ${{ matrix.environment.name == 'nvidia-gpu-snp' && 'true' || 'false' }} - SNAPSHOTTER: ${{ matrix.environment.name == 'nvidia-gpu-snp' && 'nydus' || '' }} - USE_EXPERIMENTAL_SNAPSHOTTER_SETUP: ${{ matrix.environment.name == 'nvidia-gpu-snp' && 'true' || 'false' }} + KBS: ${{ matrix.environment.coco && 'true' || 'false' }} + SNAPSHOTTER: ${{ matrix.environment.coco && 'nydus' || '' }} + USE_EXPERIMENTAL_SNAPSHOTTER_SETUP: ${{ matrix.environment.coco && 'true' || 'false' }} K8S_TEST_HOST_TYPE: baremetal steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -75,12 +77,12 @@ jobs: run: bash tests/integration/kubernetes/gha-run.sh install-kata-tools kata-tools-artifacts - name: Uninstall previous `kbs-client` - if: matrix.environment.name != 'nvidia-gpu' + if: matrix.environment.coco timeout-minutes: 10 run: bash tests/integration/kubernetes/gha-run.sh uninstall-kbs-client - name: Deploy CoCo KBS - if: matrix.environment.name != 'nvidia-gpu' + if: matrix.environment.coco timeout-minutes: 10 run: bash tests/integration/kubernetes/gha-run.sh deploy-coco-kbs env: @@ -88,7 +90,7 @@ jobs: KBS_INGRESS: nodeport - name: Install `kbs-client` - if: matrix.environment.name != 'nvidia-gpu' + if: matrix.environment.coco timeout-minutes: 10 run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client @@ -127,7 +129,7 @@ jobs: run: bash tests/integration/kubernetes/gha-run.sh cleanup - name: Delete CoCo KBS - if: always() && matrix.environment.name != 'nvidia-gpu' + if: always() && matrix.environment.coco timeout-minutes: 10 run: | bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs diff --git a/tests/integration/kubernetes/run_kubernetes_nv_tests.sh b/tests/integration/kubernetes/run_kubernetes_nv_tests.sh index 5fe8981c28..21d79e830e 100644 --- a/tests/integration/kubernetes/run_kubernetes_nv_tests.sh +++ b/tests/integration/kubernetes/run_kubernetes_nv_tests.sh @@ -93,7 +93,7 @@ else "k8s-nvidia-nim-service.bats") fi -SUPPORTED_HYPERVISORS=("qemu-nvidia-gpu" "qemu-nvidia-gpu-snp" "qemu-nvidia-gpu-tdx") +SUPPORTED_HYPERVISORS=("qemu-nvidia-gpu" "qemu-nvidia-gpu-snp" "qemu-nvidia-gpu-tdx" "qemu-nvidia-gpu-runtime-rs" "qemu-nvidia-gpu-snp-runtime-rs" "qemu-nvidia-gpu-tdx-runtime-rs") export KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu-nvidia-gpu}" # shellcheck disable=SC2076 # intentionally use literal string matching if [[ ! " ${SUPPORTED_HYPERVISORS[*]} " =~ " ${KATA_HYPERVISOR} " ]]; then