Merge branch 'release-2025.2' into sbel/fix-docker-restart

Author: dpitulax

cluster_analytics/Makefile

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 IMAGE := scenescape-cluster-analytics
-RUNTIME_OS_IMAGE := ubuntu:24.04@sha256:353675e2a41babd526e2b837d7ec780c2a05bca0164f7ea5dbbd433d21d166fc
+RUNTIME_OS_IMAGE := python:3.12-slim
 TARGET = scenescape-cluster-analytics-runtime
 
 include ../common.mk

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

@@ -244,6 +244,13 @@ services:
     restart: always
     pids_limit: 1000
 
+  retail-video-init:
+    image: alpine:3.22.2
+    command: sh -c "chown -R 1000:1000 /var/cache"
+    volumes:
+      - vol-dlstreamer-pipeline-server-pipeline-root:/var/cache/pipeline_root
+    restart: "no"
+
   retail-video:
     image: docker.io/intel/dlstreamer-pipeline-server:3.1.0-ubuntu24
     networks:
@@ -263,6 +270,8 @@ services:
       - "c 209:* rmw"
       - "a 189:* rwm"
     depends_on:
+      retail-video-init:
+        condition: service_completed_successfully
       broker:
         condition: service_started
       ntpserv:
@@ -301,6 +310,13 @@ services:
     restart: always
     pids_limit: 1000
 
+  queuing-video-init:
+    image: alpine:3.22.2
+    command: sh -c "chown -R 1000:1000 /var/cache"
+    volumes:
+      - vol-dlstreamer-pipeline-server-pipeline-root:/var/cache/pipeline_root
+    restart: "no"
+
   queuing-video:
     image: docker.io/intel/dlstreamer-pipeline-server:3.1.0-ubuntu24
     networks:
@@ -320,6 +336,8 @@ services:
       - "c 209:* rmw"
       - "a 189:* rwm"
     depends_on:
+      queuing-video-init:
+        condition: service_completed_successfully
       broker:
         condition: service_started
       ntpserv:

sources.Dockerfile

@@ -14,27 +14,26 @@ RUN apt-get source --download-only \
     ca-certificates \
     cfitsio \
     fuse \
+    gdbm \
     geos \
-    libapache2-mod-qos \
+    icu \
     libapparmor1 \
+    libatomic1 \
     libdbus-1-3 \
     libde265-0 \
     libelf1 \
     libfuse2 \
     libfyba0 \
-    libgdbm-compat4 \
-    libgdbm6 \
     libgfortran5 \
     libglib2.0-0 \
     libgomp1 \
-    libgraphite2-3 \
     libgudev-1.0-0 \
     libheif1 \
     libinput-bin \
     libinput10 \
-    libio-pty-perl \
-    libpciaccess0 \
+    libjbig0 \
     libjson-c5 \
+    libmpdec3 \
     libmysqlclient21 \
     libodbc2 \
     libodbcinst2 \
@@ -50,21 +49,18 @@ RUN apt-get source --download-only \
     libvulkan1 \
     libwebp7 \
     libwebpmux3 \
-    locales \
-    make \
+    libxxhash0 \
+    libz3-4 \
     media-types \
+    mosquitto \
     mysql-common \
     netbase \
     perl \
     poppler \
-    publicsuffix \
     python-is-python3 \
     qtbase-opensource-src \
     readline-common \
-    shared-mime-info \
     spatialite \
-    ssl-cert \
-    ucf \
     unixodbc-common \
     wget
 
@@ -74,7 +70,9 @@ RUN : \
     ; git clone --depth 1 https://github.com/eclipse-paho/paho.mqtt.python \
     ; git clone --depth 1 https://github.com/psycopg/psycopg2 \
     ; git clone --depth 1 https://github.com/certifi/python-certifi \
-    ; git clone --depth 1 https://github.com/tqdm/tqdm
+    ; git clone --depth 1 https://github.com/tqdm/tqdm \
+    ; git clone --depth 1 https://github.com/jab/bidict \
+    ; git clone --depth 1 https://github.com/dranjan/python-plyfile
 
 WORKDIR /sources-other
 RUN : \

tests/Makefile

@@ -117,7 +117,11 @@ broken-tests: \
   scene-import \
   sensor-area \
 
-randomly-failing-tests:
+# tests that randomly fail, blocking PRs
+randomly-failing-tests: \
+  idc-error-metric \
+  velocity-metric \
+  msoce-metric \
 
 # Not sorted alphabetically on purpose
 basic-acceptance-tests: \
@@ -132,9 +136,6 @@ basic-acceptance-tests: \
 # Temp K8s BAT target
 # Not sorted alphabetically on purpose
 basic-acceptance-tests-k8s: \
-  idc-error-metric \
-  msoce-metric \
-  velocity-metric \
 
 # FIXME: run functional tests in parallel
 standard-tests: \
@@ -191,9 +192,6 @@ metric-tests:
 	$(MAKE) -Otarget -j $(NPROCS) _$@ SUPASS=$(SUPASS) -k
 
 _metric-tests: \
-  idc-error-metric \
-  velocity-metric \
-  msoce-metric \
 
 ui-tests:
 	$(MAKE) -Otarget _$@ SECRETSDIR=$(PWD)/manager/secrets SUPASS=$(SUPASS) -k