Skip to content

Commit 61ba548

Browse files
committed
Fix Assisted Service cleanup script
This PR fixes the script responsible for cleaning up the Assisted Service deployment. It previously relied on the variable `NODES_PLATFORM` that has a value of `libvirt` and is unrelated to how the Assisted Service is deployed. With this change the Make target `assisted_deployment_cleanup` works correctly again. This PR changes the generic `clean` target as Assisted cleanup is redundant at this point as underlying OCP cluster has already been deleted.
1 parent 2c5cb67 commit 61ba548

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ocp_run:
5050
gather:
5151
./must_gather.sh
5252

53-
clean: ocp_cleanup ironic_cleanup proxy_cleanup host_cleanup assisted_deployment_cleanup agent_cleanup registry_cleanup oc_mirror_cleanup
53+
clean: ocp_cleanup ironic_cleanup proxy_cleanup host_cleanup agent_cleanup registry_cleanup oc_mirror_cleanup
5454

5555
assisted_deployment_cleanup:
5656
./assisted_deployment.sh delete_all

assisted_deployment.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,10 +327,8 @@ function delete_hive() {
327327
}
328328

329329
function delete_all() {
330-
if [ "$NODES_PLATFORM" = "assisted" ]; then
331-
delete_assisted
332-
delete_hive
333-
fi
330+
delete_assisted
331+
delete_hive
334332

335333
# Skipping LocalVolume cleanup on purpose.
336334
}

0 commit comments

Comments
 (0)