From 6a1a78571447941871933fa27d3ffe2881703c30 Mon Sep 17 00:00:00 2001 From: phact Date: Fri, 12 Dec 2025 16:02:50 -0500 Subject: [PATCH] fix os_clear and integration test --- .github/workflows/test-integration.yml | 6 +++++- scripts/clear_opensearch_data.py | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index a70dd24d..544b846e 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -38,8 +38,12 @@ jobs: docker builder prune -af || true docker-compose -f docker-compose.yml down -v --remove-orphans || true + - name: Cleanup OpenSearch data (root-owned files) + run: | + docker run --rm -v $(pwd):/work alpine rm -rf /work/opensearch-data || true + - run: df -h - + - name: Checkout uses: actions/checkout@v4 diff --git a/scripts/clear_opensearch_data.py b/scripts/clear_opensearch_data.py index 1fa8b9c0..3ad34dd4 100644 --- a/scripts/clear_opensearch_data.py +++ b/scripts/clear_opensearch_data.py @@ -14,10 +14,17 @@ from src.tui.managers.container_manager import ContainerManager async def main(): """Clear OpenSearch data directory.""" cm = ContainerManager() - - opensearch_data_path = Path("opensearch-data") + + # Get opensearch data path from env config (same as container_manager uses) + from src.tui.managers.env_manager import EnvManager + env_manager = EnvManager() + env_manager.load_existing_env() + opensearch_data_path = Path( + env_manager.config.opensearch_data_path.replace("$HOME", str(Path.home())) + ).expanduser() + if not opensearch_data_path.exists(): - print("opensearch-data directory does not exist") + print(f"opensearch-data directory does not exist at {opensearch_data_path}") return 0 print("Clearing OpenSearch data directory...")