From db1be1d9523ac75871624fdfcbc83290821979c2 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Tue, 22 Oct 2024 10:07:41 +0200 Subject: [PATCH] Fix opensearch healthcheck (#1746) * Fix opensearch healthcheck * Add prune before tests * Add flag to auto approve docker prune --- .github/workflows/run-integration-tests.yml | 2 +- docker-compose.minimal.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index 46817bff90..fecf66abe7 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -17,4 +17,4 @@ jobs: uses: actions/checkout@v4 - name: run tracetesting run: | - make build && make run-tracetesting + make build && docker system prune -f && make run-tracetesting diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index afb6b12079..0eb1f96485 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -657,7 +657,7 @@ services: ports: - "9200" healthcheck: - test: curl -s http://localhost:9200/_cluster/health | grep '"status":"green"' + test: curl -s http://localhost:9200/_cluster/health | grep -E '"status":"(green|yellow)"' start_period: 10s interval: 5s timeout: 10s diff --git a/docker-compose.yml b/docker-compose.yml index 846a934ff8..cb91e09bc9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -799,7 +799,7 @@ services: ports: - "9200" healthcheck: - test: curl -s http://localhost:9200/_cluster/health | grep '"status":"green"' + test: curl -s http://localhost:9200/_cluster/health | grep -E '"status":"(green|yellow)"' start_period: 10s interval: 5s timeout: 10s