Merge branch 'main' into chore-move-opensearch-image-version-to-env-file

open-telemetry · Oct 22, 2024 · 9c1a822 · 9c1a822
2 parents a0183f3 + db1be1d
commit 9c1a822
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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