From 8c6790476bcafe402793a8ddd4e14cbbccbdf608 Mon Sep 17 00:00:00 2001 From: Clint Branham Date: Wed, 25 Mar 2026 14:38:54 -0500 Subject: [PATCH] fix: always remove Docker containers in force cleanup Force cleanup must remove pvetest-* Docker containers unconditionally, not just when cleaning all versions. Stale containers cause Terraform to fail on next provision ("container already exists") since the state was also wiped. Co-Authored-By: Claude Opus 4.6 (1M context) --- tests/infrastructure/scripts/run-integration.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/infrastructure/scripts/run-integration.sh b/tests/infrastructure/scripts/run-integration.sh index 6d6f2cb..f87159f 100755 --- a/tests/infrastructure/scripts/run-integration.sh +++ b/tests/infrastructure/scripts/run-integration.sh @@ -609,12 +609,11 @@ cmd_force_cleanup() { || true done - # Stop Docker storage and answer server containers - if [[ "$requested" == "all" ]]; then - log "Stopping storage and answer server containers..." - docker rm -f pvetest-iscsi pvetest-nfs pvetest-answer-server 2>/dev/null || true - docker volume rm pvetest-iscsi-data pvetest-nfs-data 2>/dev/null || true - fi + # Always stop Docker containers in force mode — leaving them causes + # Terraform to fail on next provision (container already exists). + log "Stopping storage and answer server containers..." + docker rm -f pvetest-iscsi pvetest-nfs pvetest-answer-server 2>/dev/null || true + docker volume rm pvetest-iscsi-data pvetest-nfs-data 2>/dev/null || true # Remove Terraform state so next provision starts clean log "Removing Terraform state..."