Fix System-tests configuration for latest EI Backend changes. (#286)

Author: tobiasake

src/main/docker/docker-compose.yml

@@ -252,25 +252,24 @@ services:
         aliases:
           - ei-backend-artifact
     environment:       # Overrides settings in application.properties file
-      - SpringApplicationName=ei-backend-artifact
+      - spring.application.name=ei-backend-artifact
       - server.port=8080
       - rules.path=/rules/ArtifactRules-Eiffel-Agen-Version.json
       - rabbitmq.host=rabbitmq
       - rabbitmq.port=${RABBITMQ_AMQP_PORT}
-      - rabbitmq.domainId=ei-domain
-      - rabbitmq.componentName=eiffel-intelligence-artifact
+      - rabbitmq.domain.id=ei-domain
+      - rabbitmq.component.name=eiffel-intelligence-artifact
       - rabbitmq.waitlist.queue.suffix=waitlist-artifact
       - rabbitmq.exchange.name=ei-exchange
       - rabbitmq.user=myuser
       - rabbitmq.password=myuser
-      - spring.data.mongodb.host=mongodb
-      - spring.data.mongodb.port=${MONGODB_PORT}
+      - spring.data.mongodb.uri=mongodb://mongodb:${MONGODB_PORT}
       - spring.data.mongodb.database=eiffel-intelligence-artifact
-      - missedNotificationDataBaseName=MissedNotification-artifact
-      - aggregated.collection.name=aggregated-objects-artifact
+      - failed.notifications.collection.name=MissedNotification-artifact
+      - aggregations.collection.name=aggregated-objects-artifact
       - spring.mail.properties.mail.smtp.auth=false
       - spring.mail.properties.mail.smtp.starttls.enable=false
-      - er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
+      - event.repository.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
       - logging.level.root=ERROR
       - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG
@@ -302,25 +301,24 @@ services:
         aliases:
           - ei-backend-sourcechange
     environment:       # Overrides settings in application.properties file
-      - SpringApplicationName=ei-backend-sourcechange
+      - spring.application.name=ei-backend-sourcechange
       - server.port=8080
       - rules.path=/rules/SourceChangeObjectRules-Eiffel-Agen-Version.json
       - rabbitmq.host=rabbitmq
       - rabbitmq.port=${RABBITMQ_AMQP_PORT}
-      - rabbitmq.domainId=ei-domain
-      - rabbitmq.componentName=eiffel-intelligence-sourcechange
+      - rabbitmq.domain.id=ei-domain
+      - rabbitmq.component.name=eiffel-intelligence-sourcechange
       - rabbitmq.waitlist.queue.suffix=waitlist-sourcechange
       - rabbitmq.exchange.name=ei-exchange
       - rabbitmq.user=myuser
       - rabbitmq.password=myuser
-      - spring.data.mongodb.host=mongodb
-      - spring.data.mongodb.port=${MONGODB_PORT}
+      - spring.data.mongodb.uri=mongodb://mongodb:${MONGODB_PORT}
       - spring.data.mongodb.database=eiffel-intelligence-sourcechange
-      - missedNotificationDataBaseName=MissedNotification-sourcechange
-      - aggregated.collection.name=aggregated-objects-sourcechange
+      - failed.notifications.collection.name=MissedNotification-sourcechange
+      - aggregations.collection.name=aggregated-objects-sourcechange
       - spring.mail.properties.mail.smtp.auth=false
       - spring.mail.properties.mail.smtp.starttls.enable=false
-      - er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
+      - event.repository.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
       - logging.level.root=ERROR
       - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG
@@ -352,29 +350,28 @@ services:
         aliases:
           - ei-backend-testexecution
     environment:       # Overrides settings in application.properties file
-      - SpringApplicationName=ei-backend-testexecution
+      - spring.application.name=ei-backend-testexecution
       - server.port=8080
       - rules.path=/rules/TestExecutionObjectRules-Eiffel-Agen-Version.json
       - rabbitmq.host=rabbitmq
       - rabbitmq.port=${RABBITMQ_AMQP_PORT}
-      - rabbitmq.domainId=ei-domain
-      - rabbitmq.componentName=eiffel-intelligence-testexecution
+      - rabbitmq.domain.id=ei-domain
+      - rabbitmq.component.name=eiffel-intelligence-testexecution
       - rabbitmq.waitlist.queue.suffix=waitlist-testexecution
       - rabbitmq.exchange.name=ei-exchange
       - rabbitmq.user=myuser
       - rabbitmq.password=myuser
-      - spring.data.mongodb.host=mongodb
-      - spring.data.mongodb.port=${MONGODB_PORT}
+      - spring.data.mongodb.uri=mongodb://mongodb:${MONGODB_PORT}
       - spring.data.mongodb.database=eiffel-intelligence-testexecution
-      - missedNotificationDataBaseName=MissedNotification-testexecution
-      - aggregated.collection.name=aggregated-objects-testexecution
+      - failed.notifications.collection.name=MissedNotification-testexecution
+      - aggregations.collection.name=aggregated-objects-testexecution
       - spring.mail.host=
       - spring.mail.port=
       - spring.mail.username=
       - spring.mail.password=
       - spring.mail.properties.mail.smtp.auth=false
       - spring.mail.properties.mail.smtp.starttls.enable=false
-      - er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
+      - event.repository.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
       - logging.level.root=ERROR
       - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG
@@ -411,7 +408,6 @@ services:
       - ei.frontend.service.port=${EI_FRONTEND_PORT}
       - ei.frontend.context.path=
       - ei.backend.instances.list.json.content=${EI_INSTANCES_LIST}
-      - ei.backend.instances.filepath=/tmp/eiInstancesListFile.json
       - logging.level.root=ERROR
       - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG

src/main/docker/env.bash

@@ -16,10 +16,8 @@ export REMREM_PUBLISH_IMAGE="eiffelericsson/eiffel-remrem-publish:2.0.2"
 export JENKINS_IMAGE="bitnami/jenkins:2.138.3"
 export LDAP_IMAGE="osixia/openldap:1.2.4"
 
-# Update EI in docker-compose.yml to use spring.data.mongodb.uri when updating this image version to version 3+
-export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:2.0.0"
-# Update EI front-end in docker-compose.yml, remove ei.backend.instances.filepath= property when updating to EI-f version 3+
-export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:2.0.0"
+export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:3.0.0"
+export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:3.0.0"
 
 export MONGODB_PORT=27017
 export RABBITMQ_AMQP_PORT=5672