Skip to content

Commit fb513e5

Browse files
committed
feat(smoketest): env vars for overriding all component image versions
1 parent 9bc91f4 commit fb513e5

File tree

1 file changed

+30
-15
lines changed

1 file changed

+30
-15
lines changed

smoketest.sh

+30-15
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,12 @@ runPostgres() {
7272
if [ ! -d "$(dirname "$0")/conf/postgres" ]; then
7373
mkdir "$(dirname "$0")/conf/postgres"
7474
fi
75-
local image; local version;
76-
image="$(getPomProperty postgres.image)"
77-
version="$(getPomProperty postgres.version)"
75+
if [ -z "${POSTGRES_IMAGE}" ]; then
76+
local image; local version;
77+
image="$(getPomProperty postgres.image)"
78+
version="$(getPomProperty postgres.version)"
79+
POSTGRES_IMAGE="${image}:${version}"
80+
fi
7881
podman run \
7982
--name postgres \
8083
--pod cryostat-pod \
@@ -85,7 +88,7 @@ runPostgres() {
8588
--mount type=bind,source="$(dirname "$0")/conf/postgres",destination=/var/lib/postgresql/data/pgdata,relabel=shared \
8689
--mount type=bind,source="$(dirname "$0")/src/test/resources/postgres",destination=/docker-entrypoint-initdb.d,relabel=shared \
8790
--env PGDATA=/var/lib/postgresql/data/pgdata \
88-
--rm -d "${image}:${version}"
91+
--rm -d "${POSTGRES_IMAGE}"
8992
}
9093

9194
runDemoApps() {
@@ -184,20 +187,27 @@ runDemoApps() {
184187
}
185188

186189
runJfrDatasource() {
187-
local stream; local tag;
188-
stream="$(getPomProperty cryostat.itest.jfr-datasource.imageStream)"
189-
tag="$(getPomProperty cryostat.itest.jfr-datasource.version)"
190+
if [ -z "${DATASOURCE_IMAGE}" ]; then
191+
local stream; local tag;
192+
stream="$(getPomProperty cryostat.itest.jfr-datasource.imageStream)"
193+
tag="$(getPomProperty cryostat.itest.jfr-datasource.version)"
194+
DATASOURCE_IMAGE="${stream}:${tag}"
195+
fi
190196
podman run \
191197
--name jfr-datasource \
192198
--pull always \
193199
--pod cryostat-pod \
194-
--rm -d "${stream}:${tag}"
200+
--rm -d "${DATASOURCE_IMAGE}"
195201
}
196202

197203
runGrafana() {
198-
local stream; local tag; local host; local port;
199-
stream="$(getPomProperty cryostat.itest.grafana.imageStream)"
200-
tag="$(getPomProperty cryostat.itest.grafana.version)"
204+
if [ -z "${GRAFANA_IMAGE}" ]; then
205+
local stream; local tag;
206+
stream="$(getPomProperty cryostat.itest.grafana.imageStream)"
207+
tag="$(getPomProperty cryostat.itest.grafana.version)"
208+
GRAFANA_IMAGE="${stream}:${tag}"
209+
fi
210+
local host; local port;
201211
host="$(getPomProperty cryostat.itest.webHost)"
202212
port="$(getPomProperty cryostat.itest.jfr-datasource.port)"
203213
podman run \
@@ -207,13 +217,18 @@ runGrafana() {
207217
--env GF_INSTALL_PLUGINS=grafana-simple-json-datasource \
208218
--env GF_AUTH_ANONYMOUS_ENABLED=true \
209219
--env JFR_DATASOURCE_URL="http://${host}:${port}" \
210-
--rm -d "${stream}:${tag}"
220+
--rm -d "${GRAFANA_IMAGE}"
211221
}
212222

213223
runReportGenerator() {
224+
if [ -z "${REPORTS_IMAGE}" ]; then
225+
local stream; local tag;
226+
stream="$(getPomProperty cryostat.itest.reports.imageStream)"
227+
tag="$(getPomProperty cryostat.itest.reports.version)"
228+
REPORTS_IMAGE="${stream}:${tag}"
229+
fi
214230
local RJMX_PORT=10000
215-
stream="$(getPomProperty cryostat.itest.reports.imageStream)"
216-
tag="$(getPomProperty cryostat.itest.reports.version)"
231+
local port;
217232
port="$(getPomProperty cryostat.itest.reports.port)"
218233
podman run \
219234
--name reports \
@@ -224,7 +239,7 @@ runReportGenerator() {
224239
--restart on-failure \
225240
--env JAVA_OPTIONS="-XX:ActiveProcessorCount=1 -XX:+UseSerialGC -Dorg.openjdk.jmc.flightrecorder.parser.singlethreaded=true -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.rmi.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
226241
--env QUARKUS_HTTP_PORT="${port}" \
227-
--rm -d "${stream}:${tag}"
242+
--rm -d "${REPORTS_IMAGE}"
228243
}
229244

230245
createPod() {

0 commit comments

Comments
 (0)