From dfb92e403e33b217815c209d6c9b7966c9ace31c Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Fri, 12 Jul 2024 15:08:43 -0300 Subject: [PATCH] tests/k8s: add "deploy-kata"/"cleanup" actions to gh-run.sh These new "kata-deploy" and "cleanup" actions are equivalent to "kata-deploy-garm" "cleanup-garm", respectively, and should be used on the workflows being migrated from GARM to Github's managed runners. Eventually "kata-deploy-garm" and "cleanup-garm" won't be used anymore then we will be able to remove them. See: #9940 Signed-off-by: Wainer dos Santos Moschetta --- tests/integration/kubernetes/gha-run.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 4df75441e8..fda4d98517 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -146,7 +146,7 @@ function deploy_coco_kbs() { } function deploy_kata() { - platform="${1}" + platform="${1:-}" ensure_helm ensure_yq @@ -389,7 +389,7 @@ function cleanup_kata_deploy() { } function cleanup() { - platform="${1}" + platform="${1:-}" test_type="${2:-k8s}" ensure_yq @@ -559,6 +559,7 @@ function main() { install-kbs-client) install_kbs_client ;; install-kubectl) install_kubectl ;; get-cluster-credentials) get_cluster_credentials ;; + deploy-kata) deploy_kata ;; deploy-kata-aks) deploy_kata "aks" ;; deploy-kata-kcli) deploy_kata "kcli" ;; deploy-kata-kubeadm) deploy_kata "kubeadm" ;; @@ -571,6 +572,7 @@ function main() { run-tests) run_tests ;; run-tests-kcli) run_tests "kcli" ;; collect-artifacts) collect_artifacts ;; + cleanup) cleanup ;; cleanup-kcli) cleanup "kcli" ;; cleanup-sev) cleanup "sev" ;; cleanup-snp) cleanup "snp" ;;