diff --git a/Jenkinsfile b/Jenkinsfile index d680da7f79fc8211cbd72a60621679faee183414..186785194eaf91a52eaa6c9e09ef01428c064a06 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 22f6acc33e2efa63b96b36309702f0915248f286..9f11520c790f7d3081572dd28ec7ae279eac2249 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 cbb4b36b16cfd4c380d28eaa4363377ad13fd155..5961d8e59a59f02464e6668678a5b08864899e77 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 e713b545b9b64aac40e34c3cbd1bb8af9b0f3960..179f2815d882290d2306ba25d37f4034c82ce20d 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 91bc95486e891b4945280f3e233d211353b001ff..b74b68f522c5d6893c3b76216e9641657403415f 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 282c149c356c27ff5547457c9506110c50c5068f..d6dfcd9f0f17126c200e27d531179f15b1c7ee3f 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