Skip to content

Commit 01c29a3

Browse files
committed
Upgrade gatling
1 parent 64ae7c5 commit 01c29a3

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gatling/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1-
# This is modified based on the original file:
2-
# https://github.com/denvazh/gatling/tree/master/3.2.1
3-
#
41
# Gatling is a highly capable load testing tool.
5-
#
6-
# Documentation: https://gatling.io/docs/3.2/
7-
# Cheat sheet: https://gatling.io/docs/3.2/cheat-sheet/
82

9-
FROM openjdk:8-jdk-alpine
3+
FROM openjdk:17-jdk-slim
104

115
# working directory for gatling
126
WORKDIR /opt
137

148
# gating version
15-
ENV GATLING_VERSION 3.2.1
9+
ENV GATLING_VERSION 3.9.5
1610

1711
# create directory for gatling install
1812
RUN mkdir -p gatling
1913

2014
# install gatling
21-
RUN apk add --update wget bash libc6-compat && \
15+
RUN apt-get update && apt install -y wget bash libc6-dev unzip && \
2216
mkdir -p /tmp/downloads && \
2317
wget -q -O /tmp/downloads/gatling-$GATLING_VERSION.zip \
2418
https://repo1.maven.org/maven2/io/gatling/highcharts/gatling-charts-highcharts-bundle/$GATLING_VERSION/gatling-charts-highcharts-bundle-$GATLING_VERSION-bundle.zip && \

pkg/commands/commands.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fi
6666
if [ ! -d ${RESULTS_DIR_PATH} ]; then
6767
mkdir -p ${RESULTS_DIR_PATH}
6868
fi
69-
gatling.sh -sf ${SIMULATIONS_DIR_PATH} -s %s -rsf ${RESOURCES_DIR_PATH} -rf ${RESULTS_DIR_PATH} %s
69+
gatling.sh -sf ${SIMULATIONS_DIR_PATH} -s %s -rsf ${RESOURCES_DIR_PATH} -rf ${RESULTS_DIR_PATH} %s %s
7070
7171
if [ $? -ne 0 ]; then
7272
RUN_STATUS_FILE="${RESULTS_DIR_PATH}/FAILED"
@@ -79,14 +79,17 @@ touch ${RUN_STATUS_FILE}
7979
generateLocalReportOption = ""
8080
}
8181

82+
runModeOptionLocal := "-rm local"
83+
8284
return fmt.Sprintf(template,
8385
simulationsDirectoryPath,
8486
tempSimulationsDirectoryPath,
8587
resourcesDirectoryPath,
8688
resultsDirectoryPath,
8789
startTime,
8890
simulationClass,
89-
generateLocalReportOption)
91+
generateLocalReportOption,
92+
runModeOptionLocal)
9093
}
9194

9295
func GetGatlingTransferResultCommand(resultsDirectoryPath string, provider string, region string, storagePath string) string {

0 commit comments

Comments
 (0)