Changed Docker-Compose version to 2.3 to run tests in order to limit memory usage per service.

Added a waiting line for trim-cmd, trip-query and gmaps-adapter

Author: jusoto

src/test/java/aist/edge/edgeservice/EdgeServiceIntegrationTests.java

@@ -39,16 +39,15 @@ public class EdgeServiceIntegrationTests {
     @ClassRule
     public static DockerComposeRule docker = DockerComposeRule.builder().pullOnStartup(true)
             .file("src/test/resources/docker-compose.yml")
-            .waitingForService("userservice", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("discoveryservice", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("mysqlserver", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("mongo", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("rabbitmq", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("userservice", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("tripmanagementcmd", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("tripmanagementquery", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("gmapsadapter", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("calculationservice", HealthChecks.toHaveAllPortsOpen())
-            .waitingForService("discoveryservice", HealthChecks.toHaveAllPortsOpen())
-            .waitingForService("discoveryservice", HealthChecks.toRespondOverHttp(8761,
-                (port) -> port.inFormat("http://localhost:8761")))
             .build();
 
     //Get IP addresses and ports to run tests on
@@ -59,18 +58,30 @@ public static void initialize() {
                 .port(8080);
         tripCommandURL = String.format("http://%s:%s", tripManagementCommand.getIp(),
                 tripManagementCommand.getExternalPort());
+        while (!docker.containers().container("tripmanagementcmd").portIsListeningOnHttp(8080,
+            (port) -> port.inFormat(tripCommandURL)).succeeded()) {
+            LOG.info("Waiting for Trip Command to respond over HTTP");
+        }
         LOG.info("Trip Command url found: " + tripCommandURL);
 
         DockerPort tripManagementQuery = docker.containers().container("tripmanagementquery")
                 .port(8080);
         tripQueryURL = String.format("http://%s:%s", tripManagementQuery.getIp(),
                 tripManagementQuery.getExternalPort());
+        while (!docker.containers().container("tripmanagementquery").portIsListeningOnHttp(8080,
+            (port) -> port.inFormat(tripQueryURL)).succeeded()) {
+            LOG.info("Waiting for Trip Query to respond over HTTP");
+        }
         LOG.info("Trip Query url found: " + tripQueryURL);
 
         DockerPort gmapsAdapter = docker.containers().container("gmapsadapter")
                 .port(8080);
         gmapsAdapterURL = String.format("http://%s:%s", gmapsAdapter.getIp(),
                 gmapsAdapter.getExternalPort());
+        while (!docker.containers().container("gmapsadapter").portIsListeningOnHttp(8080,
+            (port) -> port.inFormat(gmapsAdapterURL)).succeeded()) {
+            LOG.info("Waiting for user service to respond over HTTP");
+        }
         LOG.info("Gmaps Adapter url found: " + gmapsAdapterURL);
 
         DockerPort calculationService = docker.containers().container("calculationservice")

src/test/resources/docker-compose.yml

@@ -1,14 +1,16 @@
-version: '3'
+version: '2.3'
 
 services:
 
   discoveryservice:
     image: aista/eureka
+    mem_limit: 512M
     ports:
       - "8761:8761"
 
   mysqlserver:
     image: mysql:5.7
+    mem_limit: 512M
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -23,15 +25,19 @@ services:
 
   userservice:
     image: aista/user-service
+    mem_limit: 512M
     container_name: userservice
     depends_on:
       - discoveryservice
       - mysqlserver
     ports:
       - '8080'
+    environment:
+      - JAVA_OPTS=-Xms64m -Xmx128m -XX:+UseG1GC 
 
   mongo:
     image: 'mongo:3.4.1'
+    mem_limit: 512M
     container_name: 'mongo'
     ports:
       - '27017:27017'
@@ -40,13 +46,15 @@ services:
 
   rabbitmq:
     image: rabbitmq:management
+    mem_limit: 512M
     container_name: 'rabbitmq'
     ports:
       - "5672:5672"
       - "15672:15672"
 
   tripmanagementcmd:
     image: aista/trip-management-cmd
+    mem_limit: 512M
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -56,9 +64,12 @@ services:
       - discoveryservice
       - rabbitmq
       - mongo
+    environment:
+      - JAVA_OPTS=-Xms64m -Xmx128m -XX:+UseG1GC 
 
   tripmanagementquery:
     image: aista/trip-management-query
+    mem_limit: 512M
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -68,20 +79,28 @@ services:
       - rabbitmq
       - mongo
       - discoveryservice
+    environment:
+      - JAVA_OPTS=-Xms64m -Xmx128m -XX:+UseG1GC 
 
   gmapsadapter:
     image: aista/gmaps-adapter
+    mem_limit: 512M
     environment:
       - EUREKA_SERVER=discoveryservice
+      - RABBIT_HOST=rabbitmq
     ports:
       - '8080'
     depends_on:
       - discoveryservice
+    environment:
+      - JAVA_OPTS=-Xms64m -Xmx128m -XX:+UseG1GC 
 
   calculationservice:
     image: aista/calculation-service
+    mem_limit: 512M
     environment:
       - EUREKA_SERVER=discoveryservice
+      - RABBIT_HOST=rabbitmq
     command: ["go", "run", "main.go"]
     ports:
       - '8080'