Skip to content

Commit 7be445d

Browse files
authored
Merge pull request rook#16119 from puskunalis/ci-refactor-cluster-teardown-logic
ci: refactor cluster teardown logic
2 parents 56febf6 + 1a4d8e2 commit 7be445d

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

.github/workflows/canary-integration-test.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -754,12 +754,7 @@ jobs:
754754

755755
- name: teardown cluster with cleanup policy
756756
run: |
757-
kubectl -n rook-ceph patch cephcluster rook-ceph --type merge -p '{"spec":{"cleanupPolicy":{"confirmation":"yes-really-destroy-data"}}}'
758-
kubectl -n rook-ceph delete cephcluster rook-ceph
759-
kubectl -n rook-ceph logs deploy/rook-ceph-operator
760-
tests/scripts/github-action-helper.sh wait_for_cleanup_pod
761-
kubectl -n rook-ceph delete --ignore-not-found=true -f deploy/examples/operator.yaml
762-
tests/scripts/github-action-helper.sh remove_cluster_prerequisites
757+
tests/scripts/github-action-helper.sh delete_cluster
763758
lsblk
764759
export BLOCK="/dev/$(tests/scripts/github-action-helper.sh find_extra_block_dev)"
765760
sudo head --bytes=60 ${BLOCK}1
@@ -790,10 +785,7 @@ jobs:
790785

791786
- name: teardown cluster with cleanup policy
792787
run: |
793-
kubectl -n rook-ceph patch cephcluster rook-ceph --type merge -p '{"spec":{"cleanupPolicy":{"confirmation":"yes-really-destroy-data"}}}'
794-
kubectl -n rook-ceph delete cephcluster rook-ceph
795-
kubectl -n rook-ceph logs deploy/rook-ceph-operator
796-
tests/scripts/github-action-helper.sh wait_for_cleanup_pod
788+
tests/scripts/github-action-helper.sh delete_cluster
797789
lsblk
798790
export BLOCK="/dev/$(tests/scripts/github-action-helper.sh find_extra_block_dev)"
799791
sudo head --bytes=60 ${BLOCK}1

0 commit comments

Comments
 (0)