Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Assisted Service cleanup script #1476

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ocp_run:
gather:
./must_gather.sh

clean: ocp_cleanup ironic_cleanup proxy_cleanup host_cleanup assisted_deployment_cleanup agent_cleanup registry_cleanup oc_mirror_cleanup
clean: ocp_cleanup ironic_cleanup proxy_cleanup host_cleanup agent_cleanup registry_cleanup oc_mirror_cleanup

assisted_deployment_cleanup:
./assisted_deployment.sh delete_all
Expand Down
6 changes: 2 additions & 4 deletions assisted_deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,8 @@ function delete_hive() {
}

function delete_all() {
if [ "$NODES_PLATFORM" = "assisted" ]; then
delete_assisted
delete_hive
fi
delete_assisted
delete_hive

# Skipping LocalVolume cleanup on purpose.
}
Expand Down