Skip to content

Commit 4c11180

Browse files
IrakusIrakus
authored
Merge branch 'main' into feature/tests-rework-to-pytest
2 parents 99adcee + 0411ae3 commit 4c11180

File tree

70 files changed

+2889
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2889
-557
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: 🐞 Bug Report
33
about: Report a bug to help us improve the project
44
title: "[Bug] <short description>"
55
labels: bug
6+
type: "Bug"
67
assignees: ""
78
---
89

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: ✨ Feature Request
33
about: Suggest an idea or improvement for this project
44
title: "[Feature Request] <short description>"
55
labels: feature
6+
type: "Feature"
67
assignees: ""
78
---
89

‎.github/actions/setup-cache/action.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
# SPDX-FileCopyrightText: (C) 2026 Intel Corporation
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
name: "Setup Cache Targets"
6+
description: "Setup environment variables for caching image layers"
7+
outputs:
8+
cache_registry:
9+
description: "The cache registry path"
10+
value: ${{ steps.cache.outputs.CACHE_REGISTRY }}
11+
cache_tag:
12+
description: "The cache tag"
13+
value: ${{ steps.cache.outputs.CACHE_TAG }}
14+
github_actions_cache:
15+
description: "Whether GitHub Actions cache is enabled"
16+
value: ${{ steps.cache.outputs.GITHUB_ACTIONS_CACHE }}
17+
runs:
18+
using: "composite"
19+
steps:
20+
- name: Setup Cache Targets
21+
id: cache
22+
shell: bash
23+
env:
24+
TAG_BASE: ${{ github.head_ref || github.ref_name }}
25+
run: |
26+
CACHE_TAG=$(echo "$TAG_BASE" | tr '/' '_' | tr '-' '_')
27+
echo "CACHE_REGISTRY=${{ github.repository }}" >> "$GITHUB_OUTPUT"
28+
echo "CACHE_TAG=${CACHE_TAG}" >> "$GITHUB_OUTPUT"
29+
echo "GITHUB_ACTIONS_CACHE=true" >> "$GITHUB_OUTPUT"

‎.github/skills/python.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,15 @@ result = client.getScene(scene_id)
147147

148148
### Logging
149149

150+
- Use f-strings for interpolated log messages.
151+
- Do not use printf-style placeholders (for example `%s`, `%d`) in log statements.
152+
150153
```python
151154
from scene_common import log
152155

153156
log.info("Processing started")
154-
log.error("Failed to process")
155-
log.debug("Debug information")
157+
log.error(f"Failed to process scene {scene_id}")
158+
log.debug(f"Debug information: {debug_payload}")
156159
```
157160

158161
## Type Hints

‎.github/workflows/tests-all.yml‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ concurrency:
4343
env:
4444
DOCKER_BUILDKIT: 1
4545
SUPASS: demo
46-
GITHUB_ACTIONS_CACHE: true
47-
CACHE_REGISTRY: ${{ github.repository }}
48-
CACHE_TAG: ${{ github.head_ref || github.ref_name }}
4946

5047
permissions:
5148
contents: read
@@ -82,10 +79,18 @@ jobs:
8279
username: ${{ github.actor }}
8380
password: ${{ secrets.GITHUB_TOKEN }}
8481

82+
- name: "Setup Cache Targets"
83+
id: setup-cache
84+
uses: ./.github/actions/setup-cache
85+
8586
- name: "Run Setup"
8687
uses: ./.github/actions/setup-env
8788

8889
- name: Run Functional Tests
90+
env:
91+
CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
92+
CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
93+
GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
8994
run: |
9095
make clean-all
9196
make run_functional_tests
@@ -129,10 +134,18 @@ jobs:
129134
username: ${{ github.actor }}
130135
password: ${{ secrets.GITHUB_TOKEN }}
131136

137+
- name: "Setup Cache Targets"
138+
id: setup-cache
139+
uses: ./.github/actions/setup-cache
140+
132141
- name: "Run Setup"
133142
uses: ./.github/actions/setup-env
134143

135144
- name: Run Non-Functional Tests
145+
env:
146+
CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
147+
CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
148+
GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
136149
run: |
137150
make clean-all
138151
make run_non_functional_tests
@@ -176,10 +189,18 @@ jobs:
176189
username: ${{ github.actor }}
177190
password: ${{ secrets.GITHUB_TOKEN }}
178191

192+
- name: "Setup Cache Targets"
193+
id: setup-cache
194+
uses: ./.github/actions/setup-cache
195+
179196
- name: "Run Setup"
180197
uses: ./.github/actions/setup-env
181198

182199
- name: Run Metric Tests
200+
env:
201+
CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
202+
CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
203+
GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
183204
run: |
184205
make clean-all
185206
make run_metric_tests
@@ -223,10 +244,18 @@ jobs:
223244
username: ${{ github.actor }}
224245
password: ${{ secrets.GITHUB_TOKEN }}
225246

247+
- name: "Setup Cache Targets"
248+
id: setup-cache
249+
uses: ./.github/actions/setup-cache
250+
226251
- name: "Run Setup"
227252
uses: ./.github/actions/setup-env
228253

229254
- name: Run UI Tests
255+
env:
256+
CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
257+
CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
258+
GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
230259
run: |
231260
make clean-all
232261
make run_ui_tests
@@ -270,10 +299,18 @@ jobs:
270299
username: ${{ github.actor }}
271300
password: ${{ secrets.GITHUB_TOKEN }}
272301

302+
- name: "Setup Cache Targets"
303+
id: setup-cache
304+
uses: ./.github/actions/setup-cache
305+
273306
- name: "Run Setup"
274307
uses: ./.github/actions/setup-env
275308

276309
- name: Run Unit Tests
310+
env:
311+
CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
312+
CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
313+
GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
277314
run: |
278315
make clean-all
279316
make run_unit_tests

‎.github/workflows/tests-bat.yml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
# REMOVE THIS LINE BEFORE MERGING PR
3-
# SPDX-FileCopyrightText: (C) 2025 Intel Corporation
2+
# SPDX-FileCopyrightText: (C) 2025-2026 Intel Corporation
43
# SPDX-License-Identifier: Apache-2.0
54

65
name: "[Tests] Basic Acceptance Tests"
@@ -45,9 +44,6 @@ concurrency:
4544
env:
4645
DOCKER_BUILDKIT: 1
4746
SUPASS: demo
48-
GITHUB_ACTIONS_CACHE: true
49-
CACHE_REGISTRY: ${{ github.repository }}
50-
CACHE_TAG: ${{ github.head_ref || github.ref_name }}
5147

5248
permissions:
5349
contents: read
@@ -146,9 +142,16 @@ jobs:
146142
username: ${{ github.actor }}
147143
password: ${{ secrets.GITHUB_TOKEN }}
148144

145+
- name: "Setup Cache Targets"
146+
id: setup-cache
147+
uses: ./.github/actions/setup-cache
148+
149149
- name: "Run Basic Acceptance Tests (BAT)"
150+
env:
151+
CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
152+
CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
153+
GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
150154
run: |
151-
export CACHE_TAG=$(echo $CACHE_TAG | tr '/' '_')
152155
make clean-all
153156
git clean -fdx
154157
make run_basic_acceptance_tests
@@ -189,9 +192,16 @@ jobs:
189192
username: ${{ github.actor }}
190193
password: ${{ secrets.GITHUB_TOKEN }}
191194

195+
- name: "Setup Cache Targets"
196+
id: setup-cache
197+
uses: ./.github/actions/setup-cache
198+
192199
- name: Install chart with timeout
200+
env:
201+
CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
202+
CACHE_TAG: ${{ steps.setup-cache.outputs.cache_tag }}
203+
GITHUB_ACTIONS_CACHE: ${{ steps.setup-cache.outputs.github_actions_cache }}
193204
run: |
194-
export CACHE_TAG=$(echo $CACHE_TAG | tr '/' '_')
195205
KUBERNETES=1 DEPLOYMENT_TEST=1 ./deploy.sh
196206
197207
- name: Stability test (2m)

‎autocalibration/docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Camera Calibration Service
22

3-
The documentation for this microservice has been moved to [the main documentation folder](../../docs/user-guide/microservices/auto-calibration/auto-calibration.md).
3+
The documentation for this microservice is in [the main documentation folder](../../docs/user-guide/microservices/auto-calibration/auto-calibration.md).

‎cluster_analytics/docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Cluster Analytics Service
22

3-
The documentation for this microservice has been moved to [the main documentation folder](../../docs/user-guide/microservices/cluster-analytics/cluster-analytics.md).
3+
The documentation for this microservice is in [the main documentation folder](../../docs/user-guide/microservices/cluster-analytics/cluster-analytics.md).

‎controller/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Using Intel® SceneScape's Scene Controller Service
1+
# Intel® SceneScape's Scene Controller Service
22

33
## Documentation
44

‎controller/docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Scene Controller Service
22

3-
The documentation for this microservice has been moved to [the main documentation folder](../../docs/user-guide/microservices/controller/controller.md).
3+
The documentation for this microservice is in [the main documentation folder](../../docs/user-guide/microservices/controller/controller.md).

0 commit comments

Comments
 (0)