Change the way how CI tasks are waiting for Elasticsearch, ideally cl…

…oses #197.
ember-nexus · Nov 29, 2023 · 3a31a66 · 3a31a66
1 parent 569099f
commit 3a31a66
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 12 deletions.
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -208,10 +208,7 @@ jobs:
         run: |
           chmod 777 test-feature-prepare
           docker load < /tmp/docker/api-dev-amd.tar.gz
-          docker compose -f ./tests/FeatureTests/docker-compose-${{ matrix.dockerCompose }}.yml up --quiet-pull -d
-          echo "waiting for containers to star tup (10s)"
-          sleep 10
-          echo "finished waiting"
+          docker compose -f ./tests/FeatureTests/docker-compose-${{ matrix.dockerCompose }}.yml up --quiet-pull -d --wait
           docker exec ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet && composer test:feature"
 
   test-example-generation-controller:
@@ -242,10 +239,7 @@ jobs:
         run: |
           chmod 777 test-feature-prepare
           docker load < /tmp/docker/api-dev-amd.tar.gz
-          docker compose -f ./tests/ExampleGenerationController/docker-compose.yml up --quiet-pull -d
-          echo "waiting for containers to star tup (10s)"
-          sleep 10
-          echo "finished waiting"
+          docker compose -f ./tests/ExampleGenerationController/docker-compose.yml up --quiet-pull -d --wait
           docker exec ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet && composer test:example-generation-controller"
 
 
@@ -277,8 +271,5 @@ jobs:
         run: |
           chmod 777 test-feature-command-prepare
           docker load < /tmp/docker/api-dev-amd.tar.gz
-          docker compose -f ./tests/ExampleGenerationCommand/docker-compose.yml up --quiet-pull -d
-          echo "waiting for containers to star tup (10s)"
-          sleep 10
-          echo "finished waiting"
+          docker compose -f ./tests/ExampleGenerationCommand/docker-compose.yml up --quiet-pull -d --wait
           docker exec ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet && BACKUP_FOLDER_CAN_BE_RESET=1 composer test:example-generation-command"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add parameters `page` and `pageSize` to documentation of collection endpoints, closes #189.
 ### Changed
 - Rename `_PartialUnifiedCollection` to `_PartialElementCollection`, closes #187.
+- Change the way how CI tasks are waiting for Elasticsearch, ideally closes #197.
 
 ## 0.0.37 - 2023-11-24
 ### Changed

diff --git a/tests/ExampleGenerationCommand/docker-compose.yml b/tests/ExampleGenerationCommand/docker-compose.yml
@@ -5,6 +5,12 @@ services:
     image: api:dev-amd
     expose:
       - "80"
+    depends_on:
+      - ember-nexus-neo4j
+      - ember-nexus-mongodb
+      - ember-nexus-elasticsearch
+      - ember-nexus-redis
+      - ember-nexus-rabbitmq
     volumes:
       - ../../:/var/www/html
 

diff --git a/tests/ExampleGenerationController/docker-compose.yml b/tests/ExampleGenerationController/docker-compose.yml
@@ -5,6 +5,12 @@ services:
     image: api:dev-amd
     expose:
       - "80"
+    depends_on:
+      - ember-nexus-neo4j
+      - ember-nexus-mongodb
+      - ember-nexus-elasticsearch
+      - ember-nexus-redis
+      - ember-nexus-rabbitmq
     volumes:
       - ../../:/var/www/html
 

diff --git a/tests/FeatureTests/docker-compose-neo4j-5.1.yml b/tests/FeatureTests/docker-compose-neo4j-5.1.yml
@@ -5,6 +5,12 @@ services:
     image: api:dev-amd
     expose:
       - "80"
+    depends_on:
+      - ember-nexus-neo4j
+      - ember-nexus-mongodb
+      - ember-nexus-elasticsearch
+      - ember-nexus-redis
+      - ember-nexus-rabbitmq
     volumes:
       - ../../:/var/www/html
 

diff --git a/tests/FeatureTests/docker-compose-neo4j-5.12.yml b/tests/FeatureTests/docker-compose-neo4j-5.12.yml
@@ -5,6 +5,12 @@ services:
     image: api:dev-amd
     expose:
       - "80"
+    depends_on:
+      - ember-nexus-neo4j
+      - ember-nexus-mongodb
+      - ember-nexus-elasticsearch
+      - ember-nexus-redis
+      - ember-nexus-rabbitmq
     volumes:
       - ../../:/var/www/html
 

diff --git a/tests/FeatureTests/docker-compose-neo4j-5.13.yml b/tests/FeatureTests/docker-compose-neo4j-5.13.yml
@@ -5,6 +5,12 @@ services:
     image: api:dev-amd
     expose:
       - "80"
+    depends_on:
+      - ember-nexus-neo4j
+      - ember-nexus-mongodb
+      - ember-nexus-elasticsearch
+      - ember-nexus-redis
+      - ember-nexus-rabbitmq
     volumes:
       - ../../:/var/www/html