diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index 2710641ed7..85dd43dded 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -86,6 +86,10 @@ jobs: timeout-minutes: 10 run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client + - name: Deploy CSI driver + timeout-minutes: 5 + run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver + - name: Run tests timeout-minutes: 100 run: bash tests/integration/kubernetes/gha-run.sh run-tests @@ -102,6 +106,10 @@ jobs: if: always() run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs + - name: Delete CSI driver + timeout-minutes: 5 + run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver + run-k8s-tests-on-sev: strategy: fail-fast: false @@ -148,10 +156,18 @@ jobs: timeout-minutes: 10 run: bash tests/integration/kubernetes/gha-run.sh deploy-kata-sev + - name: Deploy CSI driver + timeout-minutes: 5 + run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver + - name: Run tests timeout-minutes: 50 run: bash tests/integration/kubernetes/gha-run.sh run-tests + - name: Delete CSI driver + timeout-minutes: 5 + run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver + - name: Delete kata-deploy if: always() run: bash tests/integration/kubernetes/gha-run.sh cleanup-sev @@ -220,6 +236,10 @@ jobs: timeout-minutes: 10 run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client + - name: Deploy CSI driver + timeout-minutes: 5 + run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver + - name: Run tests timeout-minutes: 50 run: bash tests/integration/kubernetes/gha-run.sh run-tests @@ -236,6 +256,10 @@ jobs: if: always() run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs + - name: Delete CSI driver + timeout-minutes: 5 + run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver + # Generate jobs for testing CoCo on non-TEE environments run-k8s-tests-coco-nontee: strategy: @@ -327,6 +351,10 @@ jobs: timeout-minutes: 10 run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client + - name: Deploy CSI driver + timeout-minutes: 5 + run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver + - name: Run tests timeout-minutes: 80 run: bash tests/integration/kubernetes/gha-run.sh run-tests diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 8d2e998add..1fd5747e48 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -578,6 +578,7 @@ function main() { install-kbs-client) install_kbs_client ;; install-kubectl) install_kubectl ;; get-cluster-credentials) get_cluster_credentials ;; + deploy-csi-driver) return 0 ;; deploy-kata) deploy_kata ;; deploy-kata-aks) deploy_kata "aks" ;; deploy-kata-kcli) deploy_kata "kcli" ;; @@ -599,6 +600,7 @@ function main() { cleanup-garm) cleanup "garm" ;; cleanup-zvsi) cleanup "zvsi" ;; cleanup-snapshotter) cleanup_snapshotter ;; + delete-csi-driver) return 0 ;; delete-coco-kbs) delete_coco_kbs ;; delete-cluster) cleanup "aks" ;; delete-cluster-kcli) delete_cluster_kcli ;;