Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: Remove kata-deploy-tdx test and ensure kata-deploy is always cleaned up before starting the tests #9082

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 0 additions & 36 deletions .github/workflows/run-kata-coco-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,42 +23,6 @@ on:
default: ""

jobs:
run-kata-deploy-tests-on-tdx:
strategy:
fail-fast: false
matrix:
vmm:
- qemu-tdx
snapshotter:
- nydus
pull-type:
- guest-pull
runs-on: tdx
env:
DOCKER_REGISTRY: ${{ inputs.registry }}
DOCKER_REPO: ${{ inputs.repo }}
DOCKER_TAG: ${{ inputs.tag }}
PR_NUMBER: ${{ inputs.pr-number }}
KATA_HYPERVISOR: ${{ matrix.vmm }}
KUBERNETES: "k3s"
USING_NFD: "true"
SNAPSHOTTER: ${{ matrix.snapshotter }}
PULL_TYPE: ${{ matrix.pull-type }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.commit-hash }}
fetch-depth: 0

- name: Rebase atop of the latest target branch
run: |
./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch"
env:
TARGET_BRANCH: ${{ inputs.target-branch }}

- name: Run tests
run: bash tests/functional/kata-deploy/gha-run.sh run-tests

run-k8s-tests-on-tdx:
strategy:
fail-fast: false
Expand Down
42 changes: 25 additions & 17 deletions tests/integration/kubernetes/gha-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ function deploy_kata() {
[ "$platform" = "kcli" ] && \
export KUBECONFIG="$HOME/.kcli/clusters/${CLUSTER_NAME:-kata-k8s}/auth/kubeconfig"

cleanup_kata_deploy || true

set_default_cluster_namespace

sed -i -e "s|quay.io/kata-containers/kata-deploy:latest|${DOCKER_REGISTRY}/${DOCKER_REPO}:${DOCKER_TAG}|g" "${tools_dir}/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml"
Expand Down Expand Up @@ -188,25 +190,9 @@ function run_tests() {
popd
}

function cleanup() {
platform="${1}"
test_type="${2:-k8s}"
function cleanup_kata_deploy() {
ensure_yq

[ "$platform" = "kcli" ] && \
export KUBECONFIG="$HOME/.kcli/clusters/${CLUSTER_NAME:-kata-k8s}/auth/kubeconfig"

echo "Gather information about the nodes and pods before cleaning up the node"
get_nodes_and_pods_info

if [ "${platform}" = "aks" ]; then
delete_cluster ${test_type}
return
fi

# Switch back to the default namespace and delete the tests one
delete_test_cluster_namespace

if [ "${KUBERNETES}" = "k3s" ]; then
deploy_spec="-k "${tools_dir}/packaging/kata-deploy/kata-deploy/overlays/k3s""
cleanup_spec="-k "${tools_dir}/packaging/kata-deploy/kata-cleanup/overlays/k3s""
Expand Down Expand Up @@ -240,6 +226,28 @@ function cleanup() {
kubectl delete -f "${tools_dir}/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml"
}

function cleanup() {
platform="${1}"
test_type="${2:-k8s}"
ensure_yq

[ "$platform" = "kcli" ] && \
export KUBECONFIG="$HOME/.kcli/clusters/${CLUSTER_NAME:-kata-k8s}/auth/kubeconfig"

echo "Gather information about the nodes and pods before cleaning up the node"
get_nodes_and_pods_info

if [ "${platform}" = "aks" ]; then
delete_cluster ${test_type}
return
fi

# Switch back to the default namespace and delete the tests one
delete_test_cluster_namespace

cleanup_kata_deploy
}

function deploy_snapshotter() {
echo "::group::Deploying ${SNAPSHOTTER}"
case ${SNAPSHOTTER} in
Expand Down