From 1bf05a2f471b61dd8df4f950d097ebc3fd7eb0e0 Mon Sep 17 00:00:00 2001
From: Sander <alexander holt>
Date: Fri, 28 Feb 2020 14:00:08 +0100
Subject: [PATCH] =?UTF-8?q?Sm=C3=A5=20fikser=20her=20og=20der,=20spesielt?=
=?UTF-8?q?=20med=20tanke=20p=C3=A5=20script=20som=20setter=20opp=20milj?=
=?UTF-8?q?=C3=B8et/servere,=20for=20=C3=A5=20f=C3=A5=20til=20=C3=A5=20fun?=
=?UTF-8?q?gere=20p=C3=A5=20Ubuntu=20Server.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Jenkinsfile | 5 +++++
installGatling | 6 ++----
pom.xml | 4 ++--
runGatling | 8 +++-----
runLogging | 5 ++---
setupLogging | 1 -
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d680da7..1867851 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,6 +12,11 @@ pipeline {
sh 'mvn clean test'
}
}
+ post {
+ always {
+ junit 'target/surefire-reports/*.xml'
+ }
+ }
}
stage('Build') {
steps{
diff --git a/installGatling b/installGatling
index 22f6acc..9f11520 100644
--- a/installGatling
+++ b/installGatling
@@ -1,6 +1,4 @@
#!/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
diff --git a/pom.xml b/pom.xml
index cbb4b36..5961d8e 100644
--- a/pom.xml
+++ b/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>
diff --git a/runGatling b/runGatling
index e713b54..179f281 100644
--- a/runGatling
+++ b/runGatling
@@ -1,6 +1,4 @@
#!/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
-./gatling.sh
+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
diff --git a/runLogging b/runLogging
index 91bc954..b74b68f 100644
--- a/runLogging
+++ b/runLogging
@@ -1,7 +1,6 @@
#!/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 &
\ No newline at end of file
+sudo glances -C glances.conf --export influxdb -q &
\ No newline at end of file
diff --git a/setupLogging b/setupLogging
index 282c149..d6dfcd9 100644
--- a/setupLogging
+++ b/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
--
GitLab