Skip to content

Commit befc5c0

Browse files
authored
Run Optimizer tests always (#733)
* Run Optimizer tests always * modify optimzier workflow * fix zizmor findings
1 parent 796350e commit befc5c0

File tree

2 files changed

+42
-25
lines changed

2 files changed

+42
-25
lines changed

.github/workflows/dls-pr-workflow.yaml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,13 @@ jobs:
120120
DLS_COVERITY_EMAIL: ${{ secrets.DLS_COVERITY_EMAIL }}
121121
DLS_COVERITY_PROJECT: ${{ secrets.DLS_COVERITY_PROJECT }}
122122

123-
dls-filter-docker-or-optimizer-related-changes:
123+
dls-filter-docker-related-changes:
124124
permissions:
125125
contents: read
126-
name: "DLS SCAN: detect changes in docker and optimizer dir"
126+
name: "DLS SCAN: detect changes in docker dir"
127127
runs-on: dlstreamer
128128
outputs:
129129
docker_changed: ${{ steps.check.outputs.docker_changed }}
130-
optimizer_changed: ${{ steps.check.outputs.optimizer_changed }}
131130
steps:
132131
- name: Check out dlstreamer repository
133132
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #6.0.2
@@ -141,33 +140,22 @@ jobs:
141140
cd dlstreamer-repo
142141
git fetch origin main
143142
144-
- name: Detect changes in docker or optimizer directory
143+
- name: Detect changes in docker directory
145144
id: check
146145
run: |
147-
echo "🔍 Checking for changes in 'docker/' and 'scripts/optimizer'..."
146+
echo "🔍 Checking for changes in 'docker/' dir"
148147
cd dlstreamer-repo
149148
CHANGED_FILES_DOCKER=$(git diff --name-only origin/main...HEAD -- 'docker/')
150-
CHANGED_FILES_OPTIMIZER=$(git diff --name-only origin/main...HEAD -- 'scripts/optimizer')
151149
152150
echo "docker_changed=false" >> "$GITHUB_OUTPUT"
153-
echo "optimizer_changed=false" >> "$GITHUB_OUTPUT"
154151
155152
if [ -n "${CHANGED_FILES_DOCKER}" ]; then
156153
echo "📄 Changed Docker-related files:"
157154
echo "${CHANGED_FILES_DOCKER}"
158155
echo "docker_changed=true" >> "$GITHUB_OUTPUT"
159156
echo "🟡 Docker-related changes detected."
160-
fi
161-
162-
if [ -n "${CHANGED_FILES_OPTIMIZER}" ]; then
163-
echo "📄 Changed Optimizer-related files:"
164-
echo "${CHANGED_FILES_OPTIMIZER}"
165-
echo "optimizer_changed=true" >> "$GITHUB_OUTPUT"
166-
echo "🟡 Optimizer-related changes detected."
167-
fi
168-
169-
if [ -z "${CHANGED_FILES_DOCKER}" ] && [ -z "${CHANGED_FILES_OPTIMIZER}" ]; then
170-
echo "✅ No docker or optimizer related changes."
157+
else
158+
echo "✅ No docker related changes."
171159
fi
172160
173161
- name: Clean up
@@ -177,8 +165,8 @@ jobs:
177165
dls-trivy-config-scan:
178166
permissions:
179167
contents: read
180-
needs: [dls-filter-docker-or-optimizer-related-changes]
181-
if: needs.dls-filter-docker-or-optimizer-related-changes.outputs.docker_changed == 'true'
168+
needs: [dls-filter-docker-related-changes]
169+
if: needs.dls-filter-docker-related-changes.outputs.docker_changed == 'true'
182170
name: "DLS SCAN: Trivy ${{ matrix.name }}"
183171
strategy:
184172
fail-fast: false
@@ -208,8 +196,8 @@ jobs:
208196
permissions:
209197
contents: read
210198
pull-requests: write
211-
needs: [dls-filter-docker-or-optimizer-related-changes]
212-
if: needs.dls-filter-docker-or-optimizer-related-changes.outputs.docker_changed == 'true'
199+
needs: [dls-filter-docker-related-changes]
200+
if: needs.dls-filter-docker-related-changes.outputs.docker_changed == 'true'
213201
name: "DLS SCAN: Hadolint"
214202
runs-on: dlstreamer
215203
strategy:
@@ -405,8 +393,6 @@ jobs:
405393
permissions:
406394
contents: read
407395
packages: read
408-
needs: [dls-filter-docker-or-optimizer-related-changes]
409-
if: needs.dls-filter-docker-or-optimizer-related-changes.outputs.optimizer_changed == 'true'
410396
name: "DLS TEST: Optimizer"
411397
uses: ./.github/workflows/dls-test-optimizer.yaml
412398
with:

.github/workflows/dls-test-optimizer.yaml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,15 @@ jobs:
144144
-w /workspace \
145145
${deb_final_img} \
146146
bash /workspace/optimizer_tests/scripts/run_optimizer_tests.sh --config-file "/workspace/optimizer_tests/test_config.json"
147+
147148
- name: Upload Docker test results
148149
if: always()
149150
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f #7.0.0
150151
with:
151152
name: DLS_optimizer_Docker_${{ matrix.runner_print_label }}_${{ matrix.ubuntu_version }}_results
152153
path: ${{ env.OPTIMIZER_TESTS_PATH }}/optimizer_results/docker/FINAL_TEST_REPORT.txt
153154

154-
# ======================================================== OH HOST TESTING PART ========================================================
155+
# ======================================================== ON HOST TESTING PART ========================================================
155156
- name: Link DL Streamer to home directory
156157
if: always()
157158
run: |
@@ -160,7 +161,9 @@ jobs:
160161
if: always()
161162
run: |
162163
$DLS_REL_PATH/tests/scripts/installation-on-host-entrypoint.sh $DLS_REL_PATH/deb_packages
164+
163165
- name: Run Optimizer on host
166+
id: run_optimizer_on_host
164167
if: always()
165168
run: |
166169
mkdir $OPTIMIZER_TESTS_PATH/optimizer_results/host
@@ -172,6 +175,34 @@ jobs:
172175
with:
173176
name: DLS_optimzier_host_${{ matrix.runner_print_label }}_${{ matrix.ubuntu_version }}_results
174177
path: ${{ env.OPTIMIZER_TESTS_PATH }}/optimizer_results/host/FINAL_TEST_REPORT.txt
178+
179+
# ======================================================== TEST RESULTS SUMMARY ========================================================
180+
- name: Add optimizer test results to summary
181+
env:
182+
DOCKER_OUTCOME: ${{ steps.run_optimizer_in_docker.outcome }}
183+
HOST_OUTCOME: ${{ steps.run_optimizer_on_host.outcome }}
184+
if: always()
185+
run: |
186+
echo "" >> $GITHUB_STEP_SUMMARY
187+
echo "## 🧪 Optimizer Test Results" >> $GITHUB_STEP_SUMMARY
188+
echo "" >> $GITHUB_STEP_SUMMARY
189+
echo "| Test Environment | Status |" >> $GITHUB_STEP_SUMMARY
190+
echo "|------------------|--------|" >> $GITHUB_STEP_SUMMARY
191+
192+
# Docker test status
193+
if [ "$DOCKER_OUTCOME" == "success" ]; then
194+
echo "| Optimizer in Docker | ✅ **PASSED** |" >> $GITHUB_STEP_SUMMARY
195+
else
196+
echo "| Optimizer in Docker | ❌ **FAILED** |" >> $GITHUB_STEP_SUMMARY
197+
fi
198+
199+
# Host test status
200+
if [ "$HOST_OUTCOME" == "success" ]; then
201+
echo "| Optimizer on Host | ✅ **PASSED** |" >> $GITHUB_STEP_SUMMARY
202+
else
203+
echo "| Optimizer on Host | ❌ **FAILED** |" >> $GITHUB_STEP_SUMMARY
204+
fi
205+
175206
- name: Uninstall dlstreamer
176207
if: always ()
177208
run: |

0 commit comments

Comments
 (0)