Update docker-compose for integration tests (#198)

* Refactored integration tests to use local docker-compose
* Updated configuration in integration tests and travis file

Author: e-pettersson-ericsson

.travis.yml

@@ -9,7 +9,7 @@ jdk:
   - oraclejdk8
 
 env:
-  - EI_BACKEND_PORT=8099 MONGODB_PORT=27017 RABBITMQ_AMQP_PORT=5672 RABBITMQ_WEB_PORT=15672 EIFFEL_ER_PORT=8084 JENKINS_PORT=8081 MAIL_SMTP_PORT=1025 MAIL_WEB_PORT=8025
+  - EI_BACKEND_PORT=8099
 
 
 # Using default 'test' stage for our tests, and only running deploy stage
@@ -21,23 +21,22 @@ stages:
 
 
 before_install:
-  - git clone --depth=50 --branch=master https://github.com/eiffel-community/eiffel-intelligence.git
-  - cd eiffel-intelligence
-  - docker-compose up -d
+  - source src/main/docker/env.bash
+  - docker-compose -f src/main/docker/docker-compose.yml up -d eiffel-er mongodb rabbitmq jenkins mail-server
 
 
 install:
+  - git clone --depth=50 --branch=master https://github.com/eiffel-community/eiffel-intelligence.git
+  - cd eiffel-intelligence
   - chmod +x pom.xml
   - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
-  - cd target
-  - export EIFFEL_WAR=$(ls *.war)
-  - java -Dspring.config.location=file:../../src/integrationtest/resources/integration-test.properties -Dserver.port=${EI_BACKEND_PORT} -jar ${EIFFEL_WAR} &
-  - cd ../..
+  - export EIFFEL_WAR=$(ls target/*.war)
+  - java -Dspring.config.location=file:../src/integrationtest/resources/integration-test.properties -Dserver.port=${EI_BACKEND_PORT} -jar ${EIFFEL_WAR} &
+  - cd ..
 
 
 after_script:
-  - cd eiffel-intelligence
-  - docker-compose down
+  - docker-compose -f src/main/docker/docker-compose.yml down
   - fuser -k ${EI_BACKEND_PORT}/tcp
 
 

src/integrationtest/resources/integration-test.properties

@@ -9,7 +9,7 @@ build.version=
 server.port: 8090
 
 # path to files with rules for aggregating objects
-rules.path: /ArtifactRules_new.json
+rules.path: /ArtifactRules.json
 
 # logging levels can be set with the flag below for the top packages
 # deactivated by default because Travis will fail due to log file size.

src/main/docker/README.md

@@ -0,0 +1,35 @@
+## A: Build Eiffel Intelligence frontend Docker image based on Eiffel Intelligence frontend from an Artifactory, e.g. Jitpack:
+cd (git root dir)
+docker build -t eiffel-intelligence-frontend --build-arg URL=https://jitpack.io/com/github/eiffel-community/eiffel-intelligence-frontend/1.0.1/eiffel-intelligence-frontend-1.0.1.war -f src/main/docker/Dockerfile .
+
+
+## B: Build Eiffel Intelligence frontend based on local source code changes
+1. Build Eiffel Intelligence frontend artifact:
+cd (git root dir)
+mvn package -DskipTests
+
+2. Build Eiffel-Intelligence frontend Docker image:
+cd (git root dir)/
+export EIFFEL_WAR=$(ls target/*.war)
+docker build -t eiffel-intelligence-frontend --build-arg URL=./${EIFFEL_WAR} -f src/main/docker/Dockerfile .
+
+
+## Use docker-compose to set up eco system for testing Eiffel Intelligence
+
+By using the docker-compose file in this directory it is possible to set up a
+complete environment to run integration tests and/or system test scenarios
+for Eiffel Intelligence. If you want to test with your latest local changes,
+change the docker images used for the Eiffel Intelligence services.
+
+To set up the environment for running system tests (from root directory):
+
+    source src/main/docker/env.bash
+    docker-compose -f src/main/docker/docker-compose.yml up -d
+
+
+Or start up specific services (only ones needed for integration tests) by listing them like so:
+
+    docker-compose -f src/main/docker/docker-compose.yml up -d eiffel-er mongodb rabbitmq jenkins mail-server
+
+NOTE: Integration tests does not need a frontend started in a docker container,
+since Spring will start up EI instances for each integration test.