Merge branch 'ITEP-89467/add-jitter-metrics' of https://github.com/open-edge-platform/scenescape into ITEP-89467/add-jitter-metrics

dmytroye · dmytroye · commit 2aabc9ae3ef3 · 2026-04-10T16:47:55.000+02:00
diff --git a/.github/actions/setup-cache/action.yaml b/.github/actions/setup-cache/action.yaml
@@ -0,0 +1,29 @@
+---
+# SPDX-FileCopyrightText: (C) 2026 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+name: "Setup Cache Targets"
+description: "Setup environment variables for caching image layers"
+outputs:
+  cache_registry:
+    description: "The cache registry path"
+    value: ${{ steps.cache.outputs.CACHE_REGISTRY }}
+  cache_tag:
+    description: "The cache tag"
+    value: ${{ steps.cache.outputs.CACHE_TAG }}
+  github_actions_cache:
+    description: "Whether GitHub Actions cache is enabled"
+    value: ${{ steps.cache.outputs.GITHUB_ACTIONS_CACHE }}
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Cache Targets
+      id: cache
+      shell: bash
+      env:
+        TAG_BASE: ${{ github.head_ref || github.ref_name }}
+      run: |
+        CACHE_TAG=$(echo "$TAG_BASE" | tr '/' '_' | tr '-' '_')
+        echo "CACHE_REGISTRY=${{ github.repository }}" >> "$GITHUB_OUTPUT"
+        echo "CACHE_TAG=${CACHE_TAG}" >> "$GITHUB_OUTPUT"
+        echo "GITHUB_ACTIONS_CACHE=true" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/tests-all.yml b/.github/workflows/tests-all.yml
@@ -43,9 +43,6 @@ concurrency:
 env:
   DOCKER_BUILDKIT: 1
   SUPASS: demo
-  GITHUB_ACTIONS_CACHE: true
-  CACHE_REGISTRY: ${{ github.repository }}
-  CACHE_TAG: ${{ github.head_ref || github.ref_name }}
 
 permissions:
   contents: read
@@ -82,10 +79,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Setup Cache Targets"
+        id: setup-cache
+        uses: ./.github/actions/setup-cache
+
       - name: "Run Setup"
         uses: ./.github/actions/setup-env
 
       - name: Run Functional Tests
+        env:
+          CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+          CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
+          GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
         run: |
           make clean-all
           make run_functional_tests
@@ -129,10 +134,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Setup Cache Targets"
+        id: setup-cache
+        uses: ./.github/actions/setup-cache
+
       - name: "Run Setup"
         uses: ./.github/actions/setup-env
 
       - name: Run Non-Functional Tests
+        env:
+          CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+          CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
+          GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
         run: |
           make clean-all
           make run_non_functional_tests
@@ -176,10 +189,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Setup Cache Targets"
+        id: setup-cache
+        uses: ./.github/actions/setup-cache
+
       - name: "Run Setup"
         uses: ./.github/actions/setup-env
 
       - name: Run Metric Tests
+        env:
+          CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+          CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
+          GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
         run: |
           make clean-all
           make run_metric_tests
@@ -223,10 +244,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Setup Cache Targets"
+        id: setup-cache
+        uses: ./.github/actions/setup-cache
+
       - name: "Run Setup"
         uses: ./.github/actions/setup-env
 
       - name: Run UI Tests
+        env:
+          CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+          CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
+          GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
         run: |
           make clean-all
           make run_ui_tests
@@ -270,10 +299,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Setup Cache Targets"
+        id: setup-cache
+        uses: ./.github/actions/setup-cache
+
       - name: "Run Setup"
         uses: ./.github/actions/setup-env
 
       - name: Run Unit Tests
+        env:
+          CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+          CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
+          GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
         run: |
           make clean-all
           make run_unit_tests
diff --git a/.github/workflows/tests-bat.yml b/.github/workflows/tests-bat.yml
@@ -1,5 +1,5 @@
 ---
-# SPDX-FileCopyrightText: (C) 2025 Intel Corporation
+# SPDX-FileCopyrightText: (C) 2025-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 name: "[Tests] Basic Acceptance Tests"
@@ -44,9 +44,6 @@ concurrency:
 env:
   DOCKER_BUILDKIT: 1
   SUPASS: demo
-  GITHUB_ACTIONS_CACHE: true
-  CACHE_REGISTRY: ${{ github.repository }}
-  CACHE_TAG: ${{ github.head_ref || github.ref_name }}
 
 permissions:
   contents: read
@@ -145,9 +142,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Setup Cache Targets"
+        id: setup-cache
+        uses: ./.github/actions/setup-cache
+
       - name: "Run Basic Acceptance Tests (BAT)"
+        env:
+          CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+          CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
+          GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
         run: |
-          export CACHE_TAG=$(echo $CACHE_TAG | tr '/' '_')
           make clean-all
           git clean -fdx
           make run_basic_acceptance_tests
@@ -188,9 +192,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Setup Cache Targets"
+        id: setup-cache
+        uses: ./.github/actions/setup-cache
+
       - name: Install chart with timeout
+        env:
+          CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+          CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
+          GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
         run: |
-          export CACHE_TAG=$(echo $CACHE_TAG | tr '/' '_')
           KUBERNETES=1 DEPLOYMENT_TEST=1 ./deploy.sh
 
       - name: Stability test (2m)
diff --git a/manager/src/manager/models.py b/manager/src/manager/models.py
@@ -51,8 +51,8 @@ def sendUpdateCommand(scene_id=None, camera_data=None):
     client = PubSub(auth, cert, rootcert, broker)
     try:
       client.connect()
-    except socket.gaierror as e:
-      log.error("Unable to connect", e)
+    except (socket.gaierror, ConnectionRefusedError) as e:
+      log.error("Unable to connect: %s", e)
     else:
       if scene_id:
         client.publish(PubSub.formatTopic(PubSub.CMD_SCENE_UPDATE, scene_id = scene_id), "update")
