Skip to content

Commit

Permalink
Release XLT 5.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jowerner committed Aug 19, 2021
2 parents bf0cbee + e434c55 commit 29ea2d7
Show file tree
Hide file tree
Showing 28 changed files with 817 additions and 127 deletions.
2 changes: 1 addition & 1 deletion bin/create_diff_report.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set CLASSPATH=%XLT_HOME%\target\classes;%XLT_HOME%\lib\*

:: setup other Java options
set JAVA_OPTIONS=
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx1g
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx4g
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dcom.xceptance.xlt.home="%XLT_HOME%"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dlog4j.configuration="file:%XLT_CONFIG_DIR%\diffreportgenerator.properties"
rem set JAVA_OPTIONS=%JAVA_OPTIONS% -agentlib:jdwp=transport=dt_socket,address=localhost:6666,server=y,suspend=n
Expand Down
2 changes: 1 addition & 1 deletion bin/create_diff_report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CLASSPATH="$XLT_HOME"/target/classes:"$XLT_HOME"/lib/*

# setup other Java options
JAVA_OPTIONS=
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx1g"
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx4g"
JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.xceptance.xlt.home=\"$XLT_HOME\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dlog4j.configuration=\"file:$XLT_CONFIG_DIR/diffreportgenerator.properties\""
JAVA_OPTIONS="$JAVA_OPTIONS -Djava.awt.headless=true"
Expand Down
3 changes: 1 addition & 2 deletions bin/create_report.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ set CLASSPATH=%XLT_HOME%\target\classes;%XLT_HOME%\lib\*

:: setup other Java options
set JAVA_OPTIONS=
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx1g
rem set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx4g
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx4g
rem set JAVA_OPTIONS=%JAVA_OPTIONS% -XX:+UseG1GC -XX:+UseStringDeduplication
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dcom.xceptance.xlt.home="%XLT_HOME%"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dlog4j.configuration="file:%XLT_CONFIG_DIR%\reportgenerator.properties"
Expand Down
3 changes: 1 addition & 2 deletions bin/create_report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ CLASSPATH="$XLT_HOME"/target/classes:"$XLT_HOME"/lib/*

# setup other Java options
JAVA_OPTIONS=
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx1g"
#JAVA_OPTIONS="$JAVA_OPTIONS -Xmx4g"
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx4g"
#JAVA_OPTIONS="$JAVA_OPTIONS -XX:+UseG1GC -XX:+UseStringDeduplication"
JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.xceptance.xlt.home=\"$XLT_HOME\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dlog4j.configuration=\"file:$XLT_CONFIG_DIR/reportgenerator.properties\""
Expand Down
2 changes: 1 addition & 1 deletion bin/create_trend_report.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set CLASSPATH=%XLT_HOME%\target\classes;%XLT_HOME%\lib\*

:: setup other Java options
set JAVA_OPTIONS=
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx1g
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx4g
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dcom.xceptance.xlt.home="%XLT_HOME%"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dlog4j.configuration="file:%XLT_CONFIG_DIR%\trendreportgenerator.properties"
rem set JAVA_OPTIONS=%JAVA_OPTIONS% -agentlib:jdwp=transport=dt_socket,address=localhost:6666,server=y,suspend=n
Expand Down
2 changes: 1 addition & 1 deletion bin/create_trend_report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CLASSPATH="$XLT_HOME"/target/classes:"$XLT_HOME"/lib/*

# setup other Java options
JAVA_OPTIONS=
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx1g"
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx4g"
JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.xceptance.xlt.home=\"$XLT_HOME\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dlog4j.configuration=\"file:$XLT_CONFIG_DIR/trendreportgenerator.properties\""
JAVA_OPTIONS="$JAVA_OPTIONS -Djava.awt.headless=true"
Expand Down
2 changes: 1 addition & 1 deletion bin/mastercontroller.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set CLASSPATH=%XLT_HOME%\target\classes;%XLT_HOME%\lib\*

:: setup other Java options
set JAVA_OPTIONS=
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx1g
set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx4g
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dcom.xceptance.xlt.home="%XLT_HOME%"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dlog4j.configuration="file:%XLT_CONFIG_DIR%\mastercontroller.properties"
rem set JAVA_OPTIONS=%JAVA_OPTIONS% -agentlib:jdwp=transport=dt_socket,address=localhost:6666,server=y,suspend=n
Expand Down
2 changes: 1 addition & 1 deletion bin/mastercontroller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CLASSPATH="$XLT_HOME"/target/classes:"$XLT_HOME"/lib/*

# setup other Java options
JAVA_OPTIONS=
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx1g"
JAVA_OPTIONS="$JAVA_OPTIONS -Xmx4g"
JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.xceptance.xlt.home=\"$XLT_HOME\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dlog4j.configuration=\"file:$XLT_CONFIG_DIR/mastercontroller.properties\""
JAVA_OPTIONS="$JAVA_OPTIONS -Djava.awt.headless=true"
Expand Down
13 changes: 8 additions & 5 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,13 @@ timerrecorder.chrome.executable = chromium-browser
# External Artifacts
#

poster-store.version = 1.1.2
jenkins-plugin.version = 1.3.3

nexus.url = https://lab.xceptance.de/nexus/content/repositories/local/com/xceptance
maven.url = https://repo1.maven.org/maven2/com/xceptance

poster-store.name = demo-poster-store
poster-store.version = 1.1.2
poster-store.url = ${nexus.url}/${poster-store.name}/${poster-store.version}/${poster-store.name}-${poster-store.version}.war

poster-store.url = ${nexus.url}/demo-poster-store/${poster-store.version}/demo-poster-store-${poster-store.version}.war
jenkins-plugin.url = ${nexus.url}/xlt-jenkins-plugin/${jenkins-plugin.version}/xlt-jenkins-plugin-${jenkins-plugin.version}.hpi
jenkins-plugin.name = xlt-jenkins-plugin
jenkins-plugin.version = 2.0.0
jenkins-plugin.url = ${maven.url}/${jenkins-plugin.name}/${jenkins-plugin.version}/${jenkins-plugin.name}-${jenkins-plugin.version}.hpi
2 changes: 1 addition & 1 deletion config/testreport/js/xlt.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
function determineTotalsFunctionBy(aColumnDescription, aMean) {
var regexForColumnsWithMinTotal = /Min\.$/;
var regexForColumnsWithMaxTotal = /Max\.$/;
var regexForColumnsWithSumTotal = /(Total|1\/(s|min|h|d)\*?)$/;
var regexForColumnsWithSumTotal = /(Total|Errors|1\/(s|min|h|d)\*?)$/;
var regexForColumnsWithAverageTotal = /\sGC\s|CPU\s\[%\]/; // matches columns in Agents table

function minimum(total, current) {
Expand Down
Loading

0 comments on commit 29ea2d7

Please sign in to comment.