diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index f240775a78..314a685a6d 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -55,12 +55,8 @@ jobs: fail-fast: false matrix: include: - - runner: tdx - vmm: qemu-tdx - runner: tdx vmm: qemu-tdx-runtime-rs - - runner: sev-snp - vmm: qemu-snp - runner: sev-snp vmm: qemu-snp-runtime-rs concurrency: @@ -75,7 +71,7 @@ jobs: KATA_HYPERVISOR: ${{ matrix.vmm }} KUBERNETES: "vanilla" KBS: "true" - K8S_TEST_HOST_TYPE: ${{ inputs.tee-test-scope == 'full' && 'baremetal' || 'baremetal-small-tee' }} + K8S_TEST_HOST_TYPE: "full" KBS_INGRESS: "nodeport" SNAPSHOTTER: "nydus" PULL_TYPE: "guest-pull" @@ -83,10 +79,6 @@ jobs: AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} AUTO_GENERATE_POLICY: "yes" steps: - - name: Skip non-nightly TDX runtime-rs - if: ${{ matrix.vmm == 'qemu-tdx-runtime-rs' && inputs.pr-number != 'nightly' }} - run: echo "SKIP_JOB=true" >> "${GITHUB_ENV}" - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 if: ${{ env.SKIP_JOB != 'true' }} with: diff --git a/tests/integration/kubernetes/run_kubernetes_tests.sh b/tests/integration/kubernetes/run_kubernetes_tests.sh index 6e4f64f45b..b478cc325f 100755 --- a/tests/integration/kubernetes/run_kubernetes_tests.sh +++ b/tests/integration/kubernetes/run_kubernetes_tests.sh @@ -31,6 +31,9 @@ K8S_TEST_HOST_TYPE="${K8S_TEST_HOST_TYPE:-small}" # Setting to "yes" enables fail fast, stopping execution at the first failed test. K8S_TEST_FAIL_FAST="${K8S_TEST_FAIL_FAST:-no}" + +K8S_TEST_UNION=( "k8s-memory.bats" "k8s-qos-pods.bats" ) + if [[ -n "${K8S_TEST_UNION:-}" ]]; then # shellcheck disable=SC2206 K8S_TEST_UNION=(${K8S_TEST_UNION})