Skip to content

Commit 0b8b23b

Browse files
committed
Add repo/branch to published config
1 parent 95fddea commit 0b8b23b

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

benchmarks/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ states:
2222
config.profiler.name: none #jfr flamegraph
2323
config.profiler.events: cpu
2424

25+
config.repo.branch: main
26+
config.repo.url: https://github.com/quarkusio/spring-quarkus-perf-comparison.git
27+
2528
QUARKUS_MAVEN_OPTIONS:
2629
PAUSE_TIME: 5
2730
ITERATIONS: 3
@@ -84,8 +87,6 @@ states:
8487
TARGET_URL: http://localhost:8080/fruits/
8588
QUARKUS-PLATFORM-ARTIFACT-ID: quarkus-bom
8689
PROJ_REPO_NAME: spring-quarkus-perf-comparison
87-
PROJ_REPO_URL: https://github.com/quarkusio/${{PROJ_REPO_NAME}}.git
88-
PROJ_REPO_BRANCH: main
8990
METRICS_DIR: /tmp
9091

9192
scripts:
@@ -98,7 +99,7 @@ scripts:
9899
- sh: mkdir -p ${{REPO_DIR}}/logs
99100
- sh: cd ${{REPO_DIR}}
100101
- log: Cloning project repo
101-
- sh: git clone -b ${{PROJ_REPO_BRANCH}} ${{PROJ_REPO_URL}}
102+
- sh: git clone -b ${{config.repo.branch}} ${{config.repo.url}}
102103
- sh: cd ${{PROJ_REPO_NAME}}
103104
- log: Checked out repo
104105
- sh: git remote get-url origin

benchmarks/run-benchmarks.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,26 +119,26 @@ run_benchmarks() {
119119
-ix \
120120
./main.yml \
121121
./helpers/ \
122-
-S TESTS="$(make_json_array ${TESTS_TO_RUN})" \
123122
-S config.GRAALVM_VERSION=${GRAALVM_VERSION} \
124123
-S config.JAVA_VERSION=${JAVA_VERSION} \
125124
-S config.NATIVE_QUARKUS_BUILD_OPTIONS=${NATIVE_QUARKUS_BUILD_OPTIONS} \
126125
-S config.profiler.name=${PROFILER} \
127-
-S PAUSE_TIME=${WAIT_TIME} \
128126
-S config.cgroup.mem_max=${CGROUPS_MAX_MEMORY} \
129127
-S config.cgroup.cpu=${CGROUPS_CPUS} \
130128
-S config.SPRING_BOOT_VERSION=${SPRING_BOOT_VERSION} \
131-
-S RUNTIMES="$(make_json_array ${RUNTIMES})" \
132129
-S config.JVM_MEMORY=${JVM_MEMORY} \
133130
-S config.CMD_PREFIX=${CMD_PREFIX} \
134131
-S config.QUARKUS_VERSION=${QUARKUS_VERSION} \
135132
-S config.NATIVE_SPRING_BUILD_OPTIONS=${NATIVE_SPRING_BUILD_OPTIONS} \
136133
-S config.profiler.events=cpu \
134+
-S config.repo.branch=${SCM_REPO_BRANCH} \
135+
-S config.repo.url=${SCM_REPO_URL} \
136+
-S env.TARGET=${target} \
137137
-S ITERATIONS=${ITERATIONS} \
138-
-S PROJ_REPO_BRANCH=${SCM_REPO_BRANCH} \
139138
-S PROJ_REPO_NAME="$(basename ${SCM_REPO_URL} .git)" \
140-
-S PROJ_REPO_URL=${SCM_REPO_URL} \
141-
-S env.TARGET=${target} \
139+
-S RUNTIMES="$(make_json_array ${RUNTIMES})" \
140+
-S PAUSE_TIME=${WAIT_TIME} \
141+
-S TESTS="$(make_json_array ${TESTS_TO_RUN})" \
142142
--stream-logging
143143
}
144144

0 commit comments

Comments
 (0)