Skip to content

Commit 40786d7

Browse files
committed
Prepare for spring3 vs spring4
- Update `config.springboot.version` to `config.springboot3.version`. - Rename related native build options and CLI parameters to emphasize Spring Boot 3.x usage. - Adjust scripts to reflect the updated naming structure across perf-lab workflow.
1 parent 433200f commit 40786d7

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

scripts/perf-lab/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ states:
88
config.jvm.graalvm.version: 25.0.1-graalce
99

1010
config.quarkus.version: #3.28.3
11-
config.springboot.version: #3.5.6
11+
config.springboot3.version: #3.5.6
1212

1313
config.jvm.memory: #-Xmx128m
1414
config.jvm.args: #-XX:+UseNUMA
1515

1616
config.quarkus.native_build_options: #-Dquarkus.native.native-image-xmx=<maximum_memory>
17-
config.springboot.native_build_options:
17+
config.springboot3.native_build_options:
1818

1919
config.resources.cpu.app: 0-3
2020
config.resources.cpu.db: 4-6
@@ -64,22 +64,22 @@ states:
6464
type: jvm
6565
dir: ${{SPRING3_BOOT_DIR}}
6666
updateScript: update-spring-boot-version
67-
updateVersion: ${{config.springboot.version}}
67+
updateVersion: ${{config.springboot3.version}}
6868
buildCmd: "./mvnw clean package -DskipTests"
6969
runCmd: "${{BASE_JAVA_CMD}} -jar ${{SPRING3_BOOT_DIR}}/target/springboot3.jar"
7070
- name: spring3-jvm-aot
7171
type: jvm
7272
dir: ${{SPRING3_BOOT_DIR}}
7373
updateScript: update-spring-boot-version
74-
updateVersion: ${{config.springboot.version}}
74+
updateVersion: ${{config.springboot3.version}}
7575
buildCmd: "./mvnw clean compile spring-boot:process-aot package -DskipTests"
7676
runCmd: "${{BASE_JAVA_CMD}} -Dspring.aot.enabled=true -jar ${{SPRING3_BOOT_DIR}}/target/springboot3.jar"
7777
- name: spring3-native
7878
type: native
7979
dir: ${{SPRING3_BOOT_DIR}}
8080
updateScript: update-spring-boot-version
81-
updateVersion: ${{config.springboot.version}}
82-
buildCmd: "./mvnw clean -Pnative -DskipTests native:compile package ${{config.springboot.native_build_options}}"
81+
updateVersion: ${{config.springboot3.version}}
82+
buildCmd: "./mvnw clean -Pnative -DskipTests native:compile package ${{config.springboot3.native_build_options}}"
8383
runCmd: "${{APP_CMD_PREFIX}} ${{SPRING3_BOOT_DIR}}/target/springboot3 ${{config.jvm.memory}}"
8484

8585
scripts:

scripts/perf-lab/run-benchmarks.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ help() {
3131
echo " -l <SCM_REPO_URL> The SCM repo url"
3232
echo " Default: '${SCM_REPO_URL}'"
3333
echo " -n <NATIVE_QUARKUS_BUILD_OPTIONS> Native build options to be passed to Quarkus native build process"
34-
echo " -o <NATIVE_SPRING_BUILD_OPTIONS> Native build options to be passed to Spring native build process"
34+
echo " -o <NATIVE_SPRING3_BUILD_OPTIONS> Native build options to be passed to Spring 3.x native build process"
3535
echo " -p <PROFILER> Enable profiling with async profiler"
3636
echo " Accepted values: none, jfr, flamegraph"
3737
echo " Default: ${PROFILER}"
@@ -41,8 +41,8 @@ help() {
4141
echo " -r <RUNTIMES> The runtimes to test, separated by commas"
4242
echo " Accepted values (1 or more of): quarkus3-jvm, quarkus3-native, spring3-jvm, spring3-jvm-aot, spring3-native"
4343
echo " Default: 'quarkus3-jvm,quarkus3-native,spring3-jvm,spring3-jvm-aot,spring3-native'"
44-
echo " -s <SPRING_BOOT_VERSION> The Spring Boot version to use"
45-
echo " Default: Whatever version is set in pom.xml of the Spring Boot app"
44+
echo " -s <SPRING_BOOT3_VERSION> The Spring Boot 3.c version to use"
45+
echo " Default: Whatever version is set in pom.xml of the Spring Boot 3 app"
4646
echo " NOTE: Its a good practice to set this manually to ensure proper version"
4747
echo " -t <TESTS_TO_RUN> The tests to run, separated by commas"
4848
echo " Accepted values (1 or more of): test-build, measure-build-times, measure-time-to-first-request, measure-rss, run-load-test"
@@ -70,8 +70,8 @@ validate_values() {
7070
exit_abnormal
7171
fi
7272

73-
if [ -z "$SPRING_BOOT_VERSION" ]; then
74-
echo "!! [ERROR] Please set the SPRING_BOOT_VERSION!!"
73+
if [ -z "$SPRING_BOOT3_VERSION" ]; then
74+
echo "!! [ERROR] Please set the SPRING_BOOT3_VERSION!!"
7575
exit_abnormal
7676
fi
7777

@@ -100,11 +100,11 @@ print_values() {
100100
echo " ITERATIONS: $ITERATIONS"
101101
echo " JAVA_VERSION: $JAVA_VERSION"
102102
echo " NATIVE_QUARKUS_BUILD_OPTIONS: $NATIVE_QUARKUS_BUILD_OPTIONS"
103-
echo " NATIVE_SPRING_BUILD_OPTIONS: $NATIVE_SPRING_BUILD_OPTIONS"
103+
echo " NATIVE_SPRING3_BUILD_OPTIONS: $NATIVE_SPRING3_BUILD_OPTIONS"
104104
echo " PROFILER: $PROFILER"
105105
echo " QUARKUS_VERSION: $QUARKUS_VERSION"
106106
echo " RUNTIMES: ${RUNTIMES[@]}"
107-
echo " SPRING_BOOT_VERSION: $SPRING_BOOT_VERSION"
107+
echo " SPRING_BOOT3_VERSION: $SPRING_BOOT3_VERSION"
108108
echo " TESTS_TO_RUN: ${TESTS_TO_RUN[@]}"
109109
echo " USER: $USER"
110110
echo " JVM_MEMORY: $JVM_MEMORY"
@@ -190,10 +190,10 @@ ${JBANG_CMD} qDup@hyperfoil \
190190
-S config.resources.cpu.app="${app_cpus}" \
191191
-S config.resources.cpu.db="${db_cpus}" \
192192
-S config.resources.cpu.load_generator="${load_gen_cpus}" \
193-
-S config.springboot.version=${SPRING_BOOT_VERSION} \
193+
-S config.springboot3.version=${SPRING_BOOT3_VERSION} \
194194
-S config.jvm.memory="${JVM_MEMORY}" \
195195
-S config.quarkus.version=${QUARKUS_VERSION} \
196-
-S config.springboot.native_build_options="${NATIVE_SPRING_BUILD_OPTIONS}" \
196+
-S config.springboot3.native_build_options="${NATIVE_SPRING3_BUILD_OPTIONS}" \
197197
-S config.profiler.events=cpu \
198198
-S config.repo.branch=${SCM_REPO_BRANCH} \
199199
-S config.repo.url=${SCM_REPO_URL} \
@@ -217,12 +217,12 @@ HOST="LOCAL"
217217
ITERATIONS="3"
218218
JAVA_VERSION="25.0.1-tem"
219219
NATIVE_QUARKUS_BUILD_OPTIONS=""
220-
NATIVE_SPRING_BUILD_OPTIONS=""
220+
NATIVE_SPRING3_BUILD_OPTIONS=""
221221
PROFILER="none"
222222
QUARKUS_VERSION=""
223223
ALLOWED_RUNTIMES=("quarkus3-jvm" "quarkus3-native" "spring3-jvm" "spring3-jvm-aot" "spring3-native")
224224
RUNTIMES=${ALLOWED_RUNTIMES[@]}
225-
SPRING_BOOT_VERSION=""
225+
SPRING_BOOT3_VERSION=""
226226
ALLOWED_TESTS_TO_RUN=("test-build" "measure-build-times" "measure-time-to-first-request" "measure-rss" "run-load-test")
227227
TESTS_TO_RUN=${ALLOWED_TESTS_TO_RUN[@]}
228228
USER=""
@@ -272,7 +272,7 @@ while getopts "a:b:c:de:f:g:h:i:j:l:n:o:p:q:r:s:t:u:v:w:" option; do
272272
n) NATIVE_QUARKUS_BUILD_OPTIONS=$OPTARG
273273
;;
274274

275-
o) NATIVE_SPRING_BUILD_OPTIONS=$OPTARG
275+
o) NATIVE_SPRING3_BUILD_OPTIONS=$OPTARG
276276
;;
277277

278278
p) if [[ "$OPTARG" =~ ^(none|jfr|flamegraph)$ ]]; then
@@ -298,7 +298,7 @@ while getopts "a:b:c:de:f:g:h:i:j:l:n:o:p:q:r:s:t:u:v:w:" option; do
298298
RUNTIMES=${rt[@]}
299299
;;
300300

301-
s) SPRING_BOOT_VERSION=$OPTARG
301+
s) SPRING_BOOT3_VERSION=$OPTARG
302302
;;
303303

304304
t) ttr=($(IFS=','; echo $OPTARG))

0 commit comments

Comments
 (0)