From 1a4d8e2859a0bb6d2b974b7c7b430a4c28f46215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilius=20Pu=C5=A1kunalis?= <47086537+puskunalis@users.noreply.github.com> Date: Thu, 10 Jul 2025 20:20:21 +0300 Subject: [PATCH] ci: refactor cluster teardown logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refactors cluster teardown logic in remaining jobs to use the new delete_cluster function. Signed-off-by: Vilius Puškunalis <47086537+puskunalis@users.noreply.github.com> --- .github/workflows/canary-integration-test.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index cbc13888a..6315385f0 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -754,12 +754,7 @@ jobs: - name: teardown cluster with cleanup policy run: | - kubectl -n rook-ceph patch cephcluster rook-ceph --type merge -p '{"spec":{"cleanupPolicy":{"confirmation":"yes-really-destroy-data"}}}' - kubectl -n rook-ceph delete cephcluster rook-ceph - kubectl -n rook-ceph logs deploy/rook-ceph-operator - tests/scripts/github-action-helper.sh wait_for_cleanup_pod - kubectl -n rook-ceph delete --ignore-not-found=true -f deploy/examples/operator.yaml - tests/scripts/github-action-helper.sh remove_cluster_prerequisites + tests/scripts/github-action-helper.sh delete_cluster lsblk export BLOCK="/dev/$(tests/scripts/github-action-helper.sh find_extra_block_dev)" sudo head --bytes=60 ${BLOCK}1 @@ -790,10 +785,7 @@ jobs: - name: teardown cluster with cleanup policy run: | - kubectl -n rook-ceph patch cephcluster rook-ceph --type merge -p '{"spec":{"cleanupPolicy":{"confirmation":"yes-really-destroy-data"}}}' - kubectl -n rook-ceph delete cephcluster rook-ceph - kubectl -n rook-ceph logs deploy/rook-ceph-operator - tests/scripts/github-action-helper.sh wait_for_cleanup_pod + tests/scripts/github-action-helper.sh delete_cluster lsblk export BLOCK="/dev/$(tests/scripts/github-action-helper.sh find_extra_block_dev)" sudo head --bytes=60 ${BLOCK}1