Små fikser her og der, spesielt med tanke på script som setter opp...

Små fikser her og der, spesielt med tanke på script som setter opp miljøet/servere, for å få til å fungere på Ubuntu Server.

Jenkinsfile

@@ -12,6 +12,11 @@ pipeline {
                     sh 'mvn clean test'
                 }
             }
+            post {
+                always {
+                    junit 'target/surefire-reports/*.xml'
+                }
+            }
         }
         stage('Build') {
             steps{

installGatling

 #!/bin/bash
-wget https://repo1.maven.org/maven2/io/gatling/highcharts/gatling-charts-highcharts-bundle/2.3.1/gatling-charts-highcharts-bundle-2.3.1-bundle.zip
-mv gatling-charts-highcharts-bundle-2.3.1-bundle.zip ~/Desktop
-cd ~/Desktop
-unzip gatling-charts-highcharts-bundle-2.3.1-bundle.zip
+wget https://repo1.maven.org/maven2/io/gatling/highcharts/gatling-charts-highcharts-bundle/2.3.1/gatling-charts-highcharts-bundle-2.3.1-bundle.zip -P ~
+unzip ~/gatling-charts-highcharts-bundle-2.3.1-bundle.zip -d ~
 echo Gatling Stress Tool installed

pom.xml

@@ -18,8 +18,8 @@
                 <version>2.5.1</version>
                 <inherited>true</inherited>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <plugin>

runGatling

 #!/bin/bash
-cd gatling
-cp -r chat ~/Desktop/gatling-charts-highcharts-bundle-2.3.1/user-files/simulations
-cp usernames.csv ~/Desktop/gatling-charts-highcharts-bundle-2.3.1/user-files/data
-cd ~/Desktop/gatling-charts-highcharts-bundle-2.3.1/bin
+cp -r gatling/chat ~/gatling-charts-highcharts-bundle-2.3.1/user-files/simulations
+cp gatling/usernames.csv ~/gatling-charts-highcharts-bundle-2.3.1/user-files/data
+~/gatling-charts-highcharts-bundle-2.3.1/bin/gatling.sh
\ No newline at end of file
-./gatling.sh

runLogging

 #!/bin/bash
 clear
 echo "Starting logsystem"
-cp glances.conf ~/.config/glances/glances.conf
-touch ~/Desktop/warnings.txt
+touch ~/warnings.txt
 sleep 3
-sudo glances --export influxdb -q &
+sudo glances -C glances.conf --export influxdb -q &
\ No newline at end of file

setupLogging

@@ -2,5 +2,4 @@
 clear
 echo "Setting up logsystem"
 sudo pip install influxdb
-mkdir ~/.config/glances
 sudo docker-compose -f docker-compose-logging.yaml up -d