Skip to content

Commit

Permalink
Merge pull request #96 from gold-kou/update_gatling
Browse files Browse the repository at this point in the history
Upgrade gatling version to 3.9.5
  • Loading branch information
gold-kou authored Oct 10, 2023
2 parents 7d28b3f + da6bc34 commit 1cde976
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions gatling/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,20 @@
# https://github.com/denvazh/gatling/tree/master/3.2.1
#
# Gatling is a highly capable load testing tool.
#
# Documentation: https://gatling.io/docs/3.2/
# Cheat sheet: https://gatling.io/docs/3.2/cheat-sheet/

FROM openjdk:8-jdk-alpine
FROM openjdk:17-jdk-slim-bullseye

# working directory for gatling
WORKDIR /opt

# gating version
ENV GATLING_VERSION 3.2.1
ENV GATLING_VERSION 3.9.5

# create directory for gatling install
RUN mkdir -p gatling

# install gatling
RUN apk add --update wget bash libc6-compat && \
RUN apt-get update && apt-get upgrade -y && apt-get install -y wget unzip && \
mkdir -p /tmp/downloads && \
wget -q -O /tmp/downloads/gatling-$GATLING_VERSION.zip \
https://repo1.maven.org/maven2/io/gatling/highcharts/gatling-charts-highcharts-bundle/$GATLING_VERSION/gatling-charts-highcharts-bundle-$GATLING_VERSION-bundle.zip && \
Expand Down
7 changes: 5 additions & 2 deletions pkg/commands/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fi
if [ ! -d ${RESULTS_DIR_PATH} ]; then
mkdir -p ${RESULTS_DIR_PATH}
fi
gatling.sh -sf ${SIMULATIONS_DIR_PATH} -s %s -rsf ${RESOURCES_DIR_PATH} -rf ${RESULTS_DIR_PATH} %s
gatling.sh -sf ${SIMULATIONS_DIR_PATH} -s %s -rsf ${RESOURCES_DIR_PATH} -rf ${RESULTS_DIR_PATH} %s %s
GATLING_EXIT_STATUS=$?
if [ $GATLING_EXIT_STATUS -ne 0 ]; then
Expand All @@ -81,14 +81,17 @@ exit $GATLING_EXIT_STATUS
generateLocalReportOption = ""
}

runModeOptionLocal := "-rm local"

return fmt.Sprintf(template,
simulationsDirectoryPath,
tempSimulationsDirectoryPath,
resourcesDirectoryPath,
resultsDirectoryPath,
startTime,
simulationClass,
generateLocalReportOption)
generateLocalReportOption,
runModeOptionLocal)
}

func GetGatlingTransferResultCommand(resultsDirectoryPath string, provider string, region string, storagePath string) string {
Expand Down

0 comments on commit 1cde976

Please sign in to comment.