Skip to content

Commit 71c6001

Browse files
authored
Fix System-tests configuration for latest EI Backend changes. (#286)
1 parent 2deafa0 commit 71c6001

File tree

2 files changed

+23
-29
lines changed

2 files changed

+23
-29
lines changed

src/main/docker/docker-compose.yml

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -252,25 +252,24 @@ services:
252252
aliases:
253253
- ei-backend-artifact
254254
environment: # Overrides settings in application.properties file
255-
- SpringApplicationName=ei-backend-artifact
255+
- spring.application.name=ei-backend-artifact
256256
- server.port=8080
257257
- rules.path=/rules/ArtifactRules-Eiffel-Agen-Version.json
258258
- rabbitmq.host=rabbitmq
259259
- rabbitmq.port=${RABBITMQ_AMQP_PORT}
260-
- rabbitmq.domainId=ei-domain
261-
- rabbitmq.componentName=eiffel-intelligence-artifact
260+
- rabbitmq.domain.id=ei-domain
261+
- rabbitmq.component.name=eiffel-intelligence-artifact
262262
- rabbitmq.waitlist.queue.suffix=waitlist-artifact
263263
- rabbitmq.exchange.name=ei-exchange
264264
- rabbitmq.user=myuser
265265
- rabbitmq.password=myuser
266-
- spring.data.mongodb.host=mongodb
267-
- spring.data.mongodb.port=${MONGODB_PORT}
266+
- spring.data.mongodb.uri=mongodb://mongodb:${MONGODB_PORT}
268267
- spring.data.mongodb.database=eiffel-intelligence-artifact
269-
- missedNotificationDataBaseName=MissedNotification-artifact
270-
- aggregated.collection.name=aggregated-objects-artifact
268+
- failed.notifications.collection.name=MissedNotification-artifact
269+
- aggregations.collection.name=aggregated-objects-artifact
271270
- spring.mail.properties.mail.smtp.auth=false
272271
- spring.mail.properties.mail.smtp.starttls.enable=false
273-
- er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
272+
- event.repository.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
274273
- logging.level.root=ERROR
275274
- logging.level.org.springframework.web=ERROR
276275
- logging.level.com.ericsson.ei=DEBUG
@@ -302,25 +301,24 @@ services:
302301
aliases:
303302
- ei-backend-sourcechange
304303
environment: # Overrides settings in application.properties file
305-
- SpringApplicationName=ei-backend-sourcechange
304+
- spring.application.name=ei-backend-sourcechange
306305
- server.port=8080
307306
- rules.path=/rules/SourceChangeObjectRules-Eiffel-Agen-Version.json
308307
- rabbitmq.host=rabbitmq
309308
- rabbitmq.port=${RABBITMQ_AMQP_PORT}
310-
- rabbitmq.domainId=ei-domain
311-
- rabbitmq.componentName=eiffel-intelligence-sourcechange
309+
- rabbitmq.domain.id=ei-domain
310+
- rabbitmq.component.name=eiffel-intelligence-sourcechange
312311
- rabbitmq.waitlist.queue.suffix=waitlist-sourcechange
313312
- rabbitmq.exchange.name=ei-exchange
314313
- rabbitmq.user=myuser
315314
- rabbitmq.password=myuser
316-
- spring.data.mongodb.host=mongodb
317-
- spring.data.mongodb.port=${MONGODB_PORT}
315+
- spring.data.mongodb.uri=mongodb://mongodb:${MONGODB_PORT}
318316
- spring.data.mongodb.database=eiffel-intelligence-sourcechange
319-
- missedNotificationDataBaseName=MissedNotification-sourcechange
320-
- aggregated.collection.name=aggregated-objects-sourcechange
317+
- failed.notifications.collection.name=MissedNotification-sourcechange
318+
- aggregations.collection.name=aggregated-objects-sourcechange
321319
- spring.mail.properties.mail.smtp.auth=false
322320
- spring.mail.properties.mail.smtp.starttls.enable=false
323-
- er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
321+
- event.repository.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
324322
- logging.level.root=ERROR
325323
- logging.level.org.springframework.web=ERROR
326324
- logging.level.com.ericsson.ei=DEBUG
@@ -352,29 +350,28 @@ services:
352350
aliases:
353351
- ei-backend-testexecution
354352
environment: # Overrides settings in application.properties file
355-
- SpringApplicationName=ei-backend-testexecution
353+
- spring.application.name=ei-backend-testexecution
356354
- server.port=8080
357355
- rules.path=/rules/TestExecutionObjectRules-Eiffel-Agen-Version.json
358356
- rabbitmq.host=rabbitmq
359357
- rabbitmq.port=${RABBITMQ_AMQP_PORT}
360-
- rabbitmq.domainId=ei-domain
361-
- rabbitmq.componentName=eiffel-intelligence-testexecution
358+
- rabbitmq.domain.id=ei-domain
359+
- rabbitmq.component.name=eiffel-intelligence-testexecution
362360
- rabbitmq.waitlist.queue.suffix=waitlist-testexecution
363361
- rabbitmq.exchange.name=ei-exchange
364362
- rabbitmq.user=myuser
365363
- rabbitmq.password=myuser
366-
- spring.data.mongodb.host=mongodb
367-
- spring.data.mongodb.port=${MONGODB_PORT}
364+
- spring.data.mongodb.uri=mongodb://mongodb:${MONGODB_PORT}
368365
- spring.data.mongodb.database=eiffel-intelligence-testexecution
369-
- missedNotificationDataBaseName=MissedNotification-testexecution
370-
- aggregated.collection.name=aggregated-objects-testexecution
366+
- failed.notifications.collection.name=MissedNotification-testexecution
367+
- aggregations.collection.name=aggregated-objects-testexecution
371368
- spring.mail.host=
372369
- spring.mail.port=
373370
- spring.mail.username=
374371
- spring.mail.password=
375372
- spring.mail.properties.mail.smtp.auth=false
376373
- spring.mail.properties.mail.smtp.starttls.enable=false
377-
- er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
374+
- event.repository.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
378375
- logging.level.root=ERROR
379376
- logging.level.org.springframework.web=ERROR
380377
- logging.level.com.ericsson.ei=DEBUG
@@ -411,7 +408,6 @@ services:
411408
- ei.frontend.service.port=${EI_FRONTEND_PORT}
412409
- ei.frontend.context.path=
413410
- ei.backend.instances.list.json.content=${EI_INSTANCES_LIST}
414-
- ei.backend.instances.filepath=/tmp/eiInstancesListFile.json
415411
- logging.level.root=ERROR
416412
- logging.level.org.springframework.web=ERROR
417413
- logging.level.com.ericsson.ei=DEBUG

src/main/docker/env.bash

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ export REMREM_PUBLISH_IMAGE="eiffelericsson/eiffel-remrem-publish:2.0.2"
1616
export JENKINS_IMAGE="bitnami/jenkins:2.138.3"
1717
export LDAP_IMAGE="osixia/openldap:1.2.4"
1818

19-
# Update EI in docker-compose.yml to use spring.data.mongodb.uri when updating this image version to version 3+
20-
export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:2.0.0"
21-
# Update EI front-end in docker-compose.yml, remove ei.backend.instances.filepath= property when updating to EI-f version 3+
22-
export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:2.0.0"
19+
export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:3.0.0"
20+
export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:3.0.0"
2321

2422
export MONGODB_PORT=27017
2523
export RABBITMQ_AMQP_PORT=5672

0 commit comments

Comments
 (0)