Add script to run system tests (#234)

Author: e-pettersson-ericsson

.travis.yml

@@ -7,10 +7,15 @@ language: java
 services:
   - docker
 
+# No output from git clone command
+git:
+  quiet: true
+
 # All environment variables must be in one line to trigger a single build.
 env:
   - EI_BACKEND_PORT=8099 JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
 
+
 # Using default 'test' stage for our tests, and only running deploy stage
 # (after merge) on master branch
 stages:
@@ -26,10 +31,14 @@ before_install:
   - export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
   - export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
   - java -version
-  - source src/main/docker/env.bash
-  - docker-compose -f src/main/docker/docker-compose.yml up -d eiffel-er mongodb rabbitmq jenkins mail-server ldap ldap-seed
+  - |
+    if [[ $TRAVIS_JOB_NAME = integrationTests ]]; then
+      source src/main/docker/env.bash
+      docker-compose -f src/main/docker/docker-compose.yml up -d eiffel-er mongodb rabbitmq jenkins mail-server ldap ldap-seed
+    fi
 
 
+# Only used before integrationTests
 install:
   - git clone --depth=50 --branch=master https://github.com/eiffel-community/eiffel-intelligence.git
   - cd eiffel-intelligence
@@ -40,8 +49,11 @@ install:
   - cd ..
 
 after_script:
-  - docker-compose -f src/main/docker/docker-compose.yml down
-  - fuser -k ${EI_BACKEND_PORT}/tcp
+  - |
+    if [[ $TRAVIS_JOB_NAME = integrationTests ]]; then
+      docker-compose -f src/main/docker/docker-compose.yml down
+      fuser -k ${EI_BACKEND_PORT}/tcp
+    fi
 
 
 # Generate site documentation using mvn site plugin
@@ -61,7 +73,7 @@ jobs:
         - sudo apt-get update
         - sudo apt-get install -y openjdk-8-jdk
         - export PATH=$(echo "$PATH" | sed -e 's/:\/usr\/local\/lib\/jvm\/openjdk11\/bin//')
-        - export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH 
+        - export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
         - echo $PATH
         - export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
         - java -version

src/main/docker/Dockerfile-Jenkins

@@ -0,0 +1,4 @@
+ARG JENKINS_IMAGE
+FROM ${JENKINS_IMAGE}
+
+RUN /install-plugins.sh groovy:2.1

src/main/docker/README.md

@@ -19,15 +19,29 @@ docker build -t eiffel-intelligence-frontend --build-arg URL=./${EIFFEL_WAR} -f
 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.
+add the '--build' flag and docker-compose will build Eiffel Intelligence 
+and Jenkins images based on the instructions in docker-compose.yml file.
 
-To set up the environment for running system tests (from root directory):
+**To set up environment with latest code changes of Eiffel Intelligence (from root directory):**
+The --build flag ensures the Docker images will be rebuilt if you have other 
+Docker images with the same name:tag lying around. Eiffel Intelligence back-ends
+and front-end and Jenkins containers will be built before starting up the environment. 
 
     source src/main/docker/env.bash
-    docker-compose -f src/main/docker/docker-compose.yml up -d
+    docker-compose -f src/main/docker/docker-compose.yml up -d --build
+
+**To run with older (specific) versions of Eiffel Intelligence pulled from DockerHub:**
+To avoid building any Eiffel Intelligence images that don't exist locally,
+run the command 'docker-compose pull serviceName' on the images you want.
+This will pull the image with the version specified in the docker-compose.yml
+from DockerHub, so that when up command is run this image will be used, and 
+it will not be rebuilt.
 
+    source src/main/docker/env.bash
+    docker-compose -f src/main/docker/docker-compose.uml pull <serviceName>
+    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:
+**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
 

src/main/docker/docker-compose.yml

@@ -206,6 +206,12 @@ services:
   jenkins:
     restart: always
     image: ${JENKINS_IMAGE}
+    build:
+      # The Docker image will be built using the specified image tag above
+      context: ../../../
+      dockerfile: ./src/main/docker/Dockerfile-Jenkins
+      args:
+        JENKINS_IMAGE: ${JENKINS_IMAGE}
     expose:
       - "8080"
     ports:
@@ -228,6 +234,12 @@ services:
   ei-backend-artifact:
     restart: always
     image: ${EI_BACKEND_IMAGE}
+    build:
+      # The Docker image will be built using the specified image tag above
+      context: ../../../
+      dockerfile: ./src/main/docker/Dockerfile
+      args:
+        URL: ./eiffel-intelligence/${EI_BACKEND_WAR_FILE}
     expose:
       - "8080"
     ports:
@@ -273,6 +285,12 @@ services:
   ei-backend-sourcechange:
     restart: always
     image: ${EI_BACKEND_IMAGE}
+    build:
+      # The Docker image will be built using the specified image tag above
+      context: ../../../
+      dockerfile: ./src/main/docker/Dockerfile
+      args:
+        URL: ./eiffel-intelligence/${EI_BACKEND_WAR_FILE}
     expose:
       - "8080"
     ports:
@@ -318,6 +336,12 @@ services:
   ei-backend-testexecution:
     restart: always
     image: ${EI_BACKEND_IMAGE}
+    build:
+      # The Docker image will be built using the specified image tag above
+      context: ../../../
+      dockerfile: ./src/main/docker/Dockerfile
+      args:
+        URL: ./eiffel-intelligence/${EI_BACKEND_WAR_FILE}
     expose:
       - "8080"
     ports:
@@ -365,6 +389,12 @@ services:
   ei-frontend:
     restart: always
     image: ${EI_FRONTEND_IMAGE}
+    build:
+      # The Docker image will be built using the specified image tag above
+      context: ../../../
+      dockerfile: ./src/main/docker/Dockerfile
+      args:
+        URL: ${EI_FRONTEND_WAR_FILE}
     expose:
       - "8080"
     ports:

src/systemtest/java/com/ericsson/ei/systemtest/artifactflow/ArtifactFlowSteps.java

@@ -31,6 +31,8 @@ public void configurations_are_provided() throws Throwable {
         config.initEIFrontend();
         config.initEIBackend("artifact");
         config.initJenkinsConfig();
+        StepsUtils.installGroovy(config.getJenkinsExternalBaseUrl(),
+                                 config.getJenkinsUsername(), config.getJenkinsPassword());
         config.initRemRemConfig();
     }
 

src/systemtest/java/com/ericsson/ei/systemtest/sourcechangeflow/SourceChangeFlowSteps.java

@@ -32,6 +32,8 @@ public void configurations_are_provided() throws Throwable {
         config.initEIFrontend();
         config.initEIBackend("sourcechange");
         config.initJenkinsConfig();
+        StepsUtils.installGroovy(config.getJenkinsExternalBaseUrl(),
+                                 config.getJenkinsUsername(), config.getJenkinsPassword());
         config.initRemRemConfig();
     }
 

src/systemtest/java/com/ericsson/ei/systemtest/testexecutionflow/TestExecutionFlowSteps.java

@@ -31,6 +31,8 @@ public void configurations_are_provided() throws Throwable {
         config.initEIFrontend();
         config.initEIBackend("testexecution");
         config.initJenkinsConfig();
+        StepsUtils.installGroovy(config.getJenkinsExternalBaseUrl(),
+                                 config.getJenkinsUsername(), config.getJenkinsPassword());
         config.initRemRemConfig();
     }
 

src/systemtest/java/com/ericsson/ei/systemtest/utils/StepsUtils.java

@@ -37,7 +37,7 @@ public class StepsUtils {
     * @param jenkinsJobName - Name of the jenkins job
     * @param scriptFileName - FileName of the script which is to be executed when the job is triggered
     * @param jenkinsBaseUrl - Base url to jenkins e.g http://localhost:8070
-    * @param jenkinsUserName - Username to the jenkins machine
+    * @param jenkinsUsername - Username to the jenkins machine
     * @param jenkinsPassword - Password to the jenkins machine
     * @param jenkinsToken - Token to the jenkins job.
     *
@@ -61,12 +61,26 @@ public static boolean createJenkinsJob(String jenkinsJobName, String scriptFileN
 
         jenkinsManager = new JenkinsManager(jenkinsBaseUrl, jenkinsUsername, jenkinsPassword);
 
+        return jenkinsManager.forceCreateJob(jenkinsJobName, jenkinsXmlAsString);
+    }
+
+    /**
+     * This method installs Groovy script in Jenkins
+     * @param jenkinsBaseUrl - Base url to jenkins e.g http://localhost:8070
+     * @param jenkinsUsername - Username to the jenkins machine
+     * @param jenkinsPassword - Password to the jenkins machine
+     *
+     * @throws Exception
+     */
+    public static void installGroovy(String jenkinsBaseUrl,
+                                     String jenkinsUsername,
+                                     String jenkinsPassword) throws Exception {
+        jenkinsManager = new JenkinsManager(jenkinsBaseUrl, jenkinsUsername, jenkinsPassword);
+
         if(!jenkinsManager.pluginExists("Groovy")) {
             jenkinsManager.installPlugin("Groovy", "2.1");
             jenkinsManager.restartJenkins();
         }
-
-        return jenkinsManager.forceCreateJob(jenkinsJobName, jenkinsXmlAsString);
     }
 
     /**
@@ -93,23 +107,24 @@ public static void deleteJenkinsJobs(ArrayList<String> jenkinsJobNames) throws E
      *
      * @param subscriptionName
      * @param nameOfJobToBeTriggered
-     * @param jenkinsUserame
+     * @param jenkinsUsername
      * @param jenkinsPassword
      * @param jenkinsBaseUrl
      * @throws IOException
      * @throws JSONException
      */
-    public static void createSubscription(String subscriptionName, String nameOfJobToBeTriggered, String jenkinsUserame, String jenkinsPassword, String jenkinsBaseUrl, boolean hasParameters) throws IOException, JSONException {
+    public static void createSubscription(String subscriptionName, String nameOfJobToBeTriggered, String jenkinsUsername, String jenkinsPassword, String jenkinsBaseUrl, boolean hasParameters) throws IOException, JSONException {
         RestPostSubscriptionObject subscription = new RestPostSubscriptionObject(subscriptionName);
         subscription.setRestPostBodyMediaType("application/x-www-form-urlencoded");
-        subscription.setBasicAuth(jenkinsUserame, jenkinsPassword);
+        subscription.setBasicAuth(jenkinsUsername, jenkinsPassword);
         String notificationMeta = jenkinsBaseUrl + "/job/" + nameOfJobToBeTriggered;
         if(hasParameters) {
             notificationMeta += "/buildWithParameters";
         } else {
             notificationMeta += "/build";
         }
         subscription.setNotificationMeta(notificationMeta);
+        subscription.setAuthenticationType("BASIC_AUTH_JENKINS_CSRF");
         subscriptions.put(subscriptionName, subscription);
     }