From d7130f48b03280e61ec02dc2b8c9fcc9a80ed4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 15 Aug 2023 16:21:12 +0200 Subject: [PATCH] gha: k8s: Stop running kata-deploy tests as part of the k8s suite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In a follow-up series, we'll add a whole suite for the kata-deploy tests. With this in mind, let's already get rid of this one and avoid more kata-deploy tests to land here. Fixes: #7642 Signed-off-by: Fabiano FidĂȘncio (cherry picked from commit cfc29c11a3077ddbfff18f064cbe5797fa03f7b8) --- ...eploy-ensure-runtimec-classes-created.bats | 38 ------------------- .../kubernetes/run_kubernetes_tests.sh | 1 - 2 files changed, 39 deletions(-) delete mode 100644 tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats diff --git a/tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats b/tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats deleted file mode 100644 index b2ec3c330b..0000000000 --- a/tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bats -# -# Copyright (c) 2023 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 -# - -load "${BATS_TEST_DIRNAME}/../../common.bash" -load "${BATS_TEST_DIRNAME}/tests_common.sh" - -setup() { - # We expect 2 runtime classes because: - # * `kata` is the default runtimeclass created, basically an alias for `kata-${KATA_HYPERVISOR}`. - # * `kata-${KATA_HYPERVISOR}` is the other one - # * As part of the tests we're only deploying the specific runtimeclass that will be used, instead of all of them. - expected_runtime_classes=2 - - # We expect both runtime classes to have the same handler: kata-${KATA_HYPERVISOR} - expected_handlers_re=( \ - "kata\s+kata-${KATA_HYPERVISOR}" \ - "kata-${KATA_HYPERVISOR}\s+kata-${KATA_HYPERVISOR}" \ - ) -} - -@test "Test runtimeclasses are being properly created" { - # We filter `kata-mshv-vm-isolation` out as that's present on AKS clusters, but that's not coming from kata-deploy - current_runtime_classes=$(kubectl get runtimeclasses | grep -v "kata-mshv-vm-isolation" | grep "kata" | wc -l) - [[ ${current_runtime_classes} -eq ${expected_runtime_classes} ]] - - for handler_re in ${expected_handlers_re[@]} - do - [[ $(kubectl get runtimeclass | grep -E "${handler_re}") ]] - done -} - -teardown() { - kubectl get runtimeclasses -} diff --git a/tests/integration/kubernetes/run_kubernetes_tests.sh b/tests/integration/kubernetes/run_kubernetes_tests.sh index e46cbc9fe0..f8b635d220 100644 --- a/tests/integration/kubernetes/run_kubernetes_tests.sh +++ b/tests/integration/kubernetes/run_kubernetes_tests.sh @@ -18,7 +18,6 @@ if [ -n "${K8S_TEST_UNION:-}" ]; then K8S_TEST_UNION=($K8S_TEST_UNION) else K8S_TEST_UNION=( \ - "kata-deploy-ensure-runtimec-classes-created.bats" \ "k8s-attach-handlers.bats" \ "k8s-caps.bats" \ "k8s-configmap.bats" \