WIP.

ember-nexus · Nov 29, 2023 · 9ce9ef4 · 9ce9ef4
1 parent 2ed3a3b
commit 9ce9ef4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 66 deletions.
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -208,8 +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 --profile database up --quiet-pull -d --wait
-          docker compose -f ./tests/FeatureTests/docker-compose-${{ matrix.dockerCompose }}.yml --profile database --profile api up --quiet-pull -d --wait
+          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:
@@ -240,8 +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 --profile database up --quiet-pull -d --wait
-          docker compose -f ./tests/ExampleGenerationController/docker-compose.yml --profile database --profile api up --quiet-pull -d --wait
+          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"
 
 
@@ -273,6 +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 --profile database up --quiet-pull -d --wait
-          docker compose -f ./tests/ExampleGenerationCommand/docker-compose.yml --profile database --profile api up --quiet-pull -d --wait
+          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/tests/ExampleGenerationCommand/docker-compose.yml b/tests/ExampleGenerationCommand/docker-compose.yml
@@ -11,10 +11,10 @@ services:
       - ember-nexus-elasticsearch
       - ember-nexus-redis
       - ember-nexus-rabbitmq
+    healthcheck:
+      disable: true
     volumes:
       - ../../:/var/www/html
-    profiles:
-      - api
 
   ember-nexus-neo4j:
     container_name: ember-nexus-neo4j
@@ -24,8 +24,6 @@ services:
       - "7687"
     environment:
       - NEO4J_AUTH=neo4j/password
-    profiles:
-      - database
 
   ember-nexus-mongodb:
     container_name: ember-nexus-mongodb
@@ -35,8 +33,6 @@ services:
     environment:
       - MONGO_INITDB_ROOT_USERNAME=mongodb
       - MONGO_INITDB_ROOT_PASSWORD=password
-    profiles:
-      - database
 
   ember-nexus-elasticsearch:
     container_name: ember-nexus-elasticsearch
@@ -47,17 +43,13 @@ services:
       - discovery.type=single-node
       - xpack.security.enabled=false
       - xpack.security.enrollment.enabled=true
-    profiles:
-      - database
 
   ember-nexus-redis:
     container_name: ember-nexus-redis
     image: redis:7-alpine
     expose:
       - "6379"
     command: redis-server --save 20 1 --loglevel warning --requirepass redis-password
-    profiles:
-      - database
 
   ember-nexus-rabbitmq:
     container_name: ember-nexus-rabbitmq
@@ -68,5 +60,3 @@ services:
     environment:
       - RABBITMQ_DEFAULT_USER=user
       - RABBITMQ_DEFAULT_PASS=password
-    profiles:
-      - database
diff --git a/tests/ExampleGenerationController/docker-compose.yml b/tests/ExampleGenerationController/docker-compose.yml
@@ -11,10 +11,10 @@ services:
       - ember-nexus-elasticsearch
       - ember-nexus-redis
       - ember-nexus-rabbitmq
+    healthcheck:
+      disable: true
     volumes:
       - ../../:/var/www/html
-    profiles:
-      - api
 
   ember-nexus-neo4j:
     container_name: ember-nexus-neo4j
@@ -24,8 +24,6 @@ services:
       - "7687"
     environment:
       - NEO4J_AUTH=neo4j/password
-    profiles:
-      - database
 
   ember-nexus-mongodb:
     container_name: ember-nexus-mongodb
@@ -35,8 +33,6 @@ services:
     environment:
       - MONGO_INITDB_ROOT_USERNAME=mongodb
       - MONGO_INITDB_ROOT_PASSWORD=password
-    profiles:
-      - database
 
   ember-nexus-elasticsearch:
     container_name: ember-nexus-elasticsearch
@@ -47,17 +43,13 @@ services:
       - discovery.type=single-node
       - xpack.security.enabled=false
       - xpack.security.enrollment.enabled=true
-    profiles:
-      - database
 
   ember-nexus-redis:
     container_name: ember-nexus-redis
     image: redis:7-alpine
     expose:
       - "6379"
     command: redis-server --save 20 1 --loglevel warning --requirepass redis-password
-    profiles:
-      - database
 
   ember-nexus-rabbitmq:
     container_name: ember-nexus-rabbitmq
@@ -68,5 +60,3 @@ services:
     environment:
       - RABBITMQ_DEFAULT_USER=user
       - RABBITMQ_DEFAULT_PASS=password
-    profiles:
-      - database
diff --git a/tests/FeatureTests/docker-compose-neo4j-5.1.yml b/tests/FeatureTests/docker-compose-neo4j-5.1.yml
@@ -11,10 +11,10 @@ services:
       - ember-nexus-elasticsearch
       - ember-nexus-redis
       - ember-nexus-rabbitmq
+    healthcheck:
+      disable: true
     volumes:
       - ../../:/var/www/html
-    profiles:
-      - api
 
   ember-nexus-neo4j:
     container_name: ember-nexus-neo4j
@@ -24,8 +24,6 @@ services:
       - "7687"
     environment:
       - NEO4J_AUTH=neo4j/password
-    profiles:
-      - database
 
   ember-nexus-mongodb:
     container_name: ember-nexus-mongodb
@@ -35,8 +33,6 @@ services:
     environment:
       - MONGO_INITDB_ROOT_USERNAME=mongodb
       - MONGO_INITDB_ROOT_PASSWORD=password
-    profiles:
-      - database
 
   ember-nexus-elasticsearch:
     container_name: ember-nexus-elasticsearch
@@ -47,17 +43,13 @@ services:
       - discovery.type=single-node
       - xpack.security.enabled=false
       - xpack.security.enrollment.enabled=true
-    profiles:
-      - database
 
   ember-nexus-redis:
     container_name: ember-nexus-redis
     image: redis:7-alpine
     expose:
       - "6379"
     command: redis-server --save 20 1 --loglevel warning --requirepass redis-password
-    profiles:
-      - database
 
   ember-nexus-rabbitmq:
     container_name: ember-nexus-rabbitmq
@@ -68,5 +60,3 @@ services:
     environment:
       - RABBITMQ_DEFAULT_USER=user
       - RABBITMQ_DEFAULT_PASS=password
-    profiles:
-      - database
diff --git a/tests/FeatureTests/docker-compose-neo4j-5.12.yml b/tests/FeatureTests/docker-compose-neo4j-5.12.yml
@@ -11,10 +11,10 @@ services:
       - ember-nexus-elasticsearch
       - ember-nexus-redis
       - ember-nexus-rabbitmq
+    healthcheck:
+      disable: true
     volumes:
       - ../../:/var/www/html
-    profiles:
-      - api
 
   ember-nexus-neo4j:
     container_name: ember-nexus-neo4j
@@ -24,8 +24,6 @@ services:
       - "7687"
     environment:
       - NEO4J_AUTH=neo4j/password
-    profiles:
-      - database
 
   ember-nexus-mongodb:
     container_name: ember-nexus-mongodb
@@ -35,8 +33,6 @@ services:
     environment:
       - MONGO_INITDB_ROOT_USERNAME=mongodb
       - MONGO_INITDB_ROOT_PASSWORD=password
-    profiles:
-      - database
 
   ember-nexus-elasticsearch:
     container_name: ember-nexus-elasticsearch
@@ -47,17 +43,13 @@ services:
       - discovery.type=single-node
       - xpack.security.enabled=false
       - xpack.security.enrollment.enabled=true
-    profiles:
-      - database
 
   ember-nexus-redis:
     container_name: ember-nexus-redis
     image: redis:7-alpine
     expose:
       - "6379"
     command: redis-server --save 20 1 --loglevel warning --requirepass redis-password
-    profiles:
-      - database
 
   ember-nexus-rabbitmq:
     container_name: ember-nexus-rabbitmq
@@ -68,5 +60,3 @@ services:
     environment:
       - RABBITMQ_DEFAULT_USER=user
       - RABBITMQ_DEFAULT_PASS=password
-    profiles:
-      - database
diff --git a/tests/FeatureTests/docker-compose-neo4j-5.13.yml b/tests/FeatureTests/docker-compose-neo4j-5.13.yml
@@ -11,10 +11,10 @@ services:
       - ember-nexus-elasticsearch
       - ember-nexus-redis
       - ember-nexus-rabbitmq
+    healthcheck:
+      disable: true
     volumes:
       - ../../:/var/www/html
-    profiles:
-      - api
 
   ember-nexus-neo4j:
     container_name: ember-nexus-neo4j
@@ -24,8 +24,6 @@ services:
       - "7687"
     environment:
       - NEO4J_AUTH=neo4j/password
-    profiles:
-      - database
 
   ember-nexus-mongodb:
     container_name: ember-nexus-mongodb
@@ -35,8 +33,6 @@ services:
     environment:
       - MONGO_INITDB_ROOT_USERNAME=mongodb
       - MONGO_INITDB_ROOT_PASSWORD=password
-    profiles:
-      - database
 
   ember-nexus-elasticsearch:
     container_name: ember-nexus-elasticsearch
@@ -47,17 +43,13 @@ services:
       - discovery.type=single-node
       - xpack.security.enabled=false
       - xpack.security.enrollment.enabled=true
-    profiles:
-      - database
 
   ember-nexus-redis:
     container_name: ember-nexus-redis
     image: redis:7-alpine
     expose:
       - "6379"
     command: redis-server --save 20 1 --loglevel warning --requirepass redis-password
-    profiles:
-      - database
 
   ember-nexus-rabbitmq:
     container_name: ember-nexus-rabbitmq
@@ -68,5 +60,3 @@ services:
     environment:
       - RABBITMQ_DEFAULT_USER=user
       - RABBITMQ_DEFAULT_PASS=password
-    profiles:
-      - database