Skip to content

Commit e5cc56e

Browse files
authored
Merge branch 'release-2025.2' into fix-advanced-camera-fields-serialization
2 parents fb77513 + a47589f commit e5cc56e

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

sample_data/docker-compose-dl-streamer-example.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,13 @@ services:
242242
restart: always
243243
pids_limit: 1000
244244

245+
retail-video-init:
246+
image: alpine:3.22.2
247+
command: sh -c "chown -R 1000:1000 /var/cache"
248+
volumes:
249+
- vol-dlstreamer-pipeline-server-pipeline-root:/var/cache/pipeline_root
250+
restart: "no"
251+
245252
retail-video:
246253
image: docker.io/intel/dlstreamer-pipeline-server:3.1.0-ubuntu24
247254
networks:
@@ -261,6 +268,8 @@ services:
261268
- "c 209:* rmw"
262269
- "a 189:* rwm"
263270
depends_on:
271+
retail-video-init:
272+
condition: service_completed_successfully
264273
broker:
265274
condition: service_started
266275
ntpserv:
@@ -298,6 +307,13 @@ services:
298307
target: certs/scenescape-ca.pem
299308
pids_limit: 1000
300309

310+
queuing-video-init:
311+
image: alpine:3.22.2
312+
command: sh -c "chown -R 1000:1000 /var/cache"
313+
volumes:
314+
- vol-dlstreamer-pipeline-server-pipeline-root:/var/cache/pipeline_root
315+
restart: "no"
316+
301317
queuing-video:
302318
image: docker.io/intel/dlstreamer-pipeline-server:3.1.0-ubuntu24
303319
networks:
@@ -317,6 +333,8 @@ services:
317333
- "c 209:* rmw"
318334
- "a 189:* rwm"
319335
depends_on:
336+
queuing-video-init:
337+
condition: service_completed_successfully
320338
broker:
321339
condition: service_started
322340
ntpserv:

tests/Makefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,11 @@ broken-tests: \
117117
scene-import \
118118
sensor-area \
119119

120-
randomly-failing-tests:
120+
# tests that randomly fail, blocking PRs
121+
randomly-failing-tests: \
122+
idc-error-metric \
123+
velocity-metric \
124+
msoce-metric \
121125

122126
# Not sorted alphabetically on purpose
123127
basic-acceptance-tests: \
@@ -132,9 +136,6 @@ basic-acceptance-tests: \
132136
# Temp K8s BAT target
133137
# Not sorted alphabetically on purpose
134138
basic-acceptance-tests-k8s: \
135-
idc-error-metric \
136-
msoce-metric \
137-
velocity-metric \
138139

139140
# FIXME: run functional tests in parallel
140141
standard-tests: \
@@ -191,9 +192,6 @@ metric-tests:
191192
$(MAKE) -Otarget -j $(NPROCS) _$@ SUPASS=$(SUPASS) -k
192193

193194
_metric-tests: \
194-
idc-error-metric \
195-
velocity-metric \
196-
msoce-metric \
197195

198196
ui-tests:
199197
$(MAKE) -Otarget _$@ SECRETSDIR=$(PWD)/manager/secrets SUPASS=$(SUPASS) -k

0 commit comments

Comments
 (0)