summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-01-09 19:07:05 +0100
committerGitHub <noreply@github.com>2026-01-09 19:07:05 +0100
commit014ef8bc62a241c2cd278d859dc24a0740e08099 (patch)
treeedc724f3c2322ef4659284040f33490b3004b16e
parent33f1763bf6434497ad0f7904122d5cb943d20138 (diff)
parent1009e5bc083f29790da4b36c9c83c825c5ac813c (diff)
downloadvyos-1x-014ef8bc62a241c2cd278d859dc24a0740e08099.tar.gz
vyos-1x-014ef8bc62a241c2cd278d859dc24a0740e08099.zip
Merge pull request #4937 from kumvijaya/current
T8144: fix and correct TPM and VPP test result reporting in smoke test workflow
-rw-r--r--.github/workflows/package-smoketest.yml36
1 files changed, 18 insertions, 18 deletions
diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml
index bb8b9319d..6c933f93f 100644
--- a/.github/workflows/package-smoketest.yml
+++ b/.github/workflows/package-smoketest.yml
@@ -175,11 +175,11 @@ jobs:
id: test
shell: bash
run: |
- sudo make ${{ needs.set_config.outputs.test_cli_command }} && EXIT_CODE=0 || EXIT_CODE=$?
- if [[ $EXIT_CODE == 0 ]]; then
+ if sudo make ${{ needs.set_config.outputs.test_cli_command }}; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
+ exit 1
fi
test_smoketest_cli_vpp:
@@ -209,11 +209,11 @@ jobs:
id: test
shell: bash
run: |
- sudo make test-vpp && EXIT_CODE=0 || EXIT_CODE=$?
- if [[ $EXIT_CODE == 0 ]]; then
+ if sudo make test-vpp; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
+ exit 1
fi
test_interfaces_cli:
@@ -242,11 +242,11 @@ jobs:
id: test
shell: bash
run: |
- sudo make test-interfaces && EXIT_CODE=0 || EXIT_CODE=$?
- if [[ $EXIT_CODE == 0 ]]; then
+ if sudo make test-interfaces; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
+ exit 1
fi
test_config_load:
@@ -275,11 +275,11 @@ jobs:
id: test
shell: bash
run: |
- sudo make testc && EXIT_CODE=0 || EXIT_CODE=$?
- if [[ $EXIT_CODE == 0 ]]; then
+ if sudo make testc; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
+ exit 1
fi
test_config_load_vpp:
@@ -309,11 +309,11 @@ jobs:
id: test
shell: bash
run: |
- sudo make testcvpp && EXIT_CODE=0 || EXIT_CODE=$?
- if [[ $EXIT_CODE == 0 ]]; then
+ if sudo make testcvpp; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
+ exit 1
fi
test_raid1_install:
@@ -342,11 +342,11 @@ jobs:
id: test
shell: bash
run: |
- sudo make testraid && EXIT_CODE=0 || EXIT_CODE=$?
- if [[ $EXIT_CODE == 0 ]]; then
+ if sudo make testraid; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
+ exit 1
fi
test_encrypted_config_tpm:
@@ -376,11 +376,11 @@ jobs:
id: test
shell: bash
run: |
- sudo make testtpm && EXIT_CODE=0 || EXIT_CODE=$?
- if [[ $EXIT_CODE == 0 ]]; then
+ if sudo make testtpm; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
+ exit 1
fi
result:
@@ -402,7 +402,7 @@ jobs:
uses: mshick/add-pr-comment@v2
with:
message: |
- CI integration ${{ (needs.test_smoketest_cli.outputs.exit_code == 'success' && needs.test_interfaces_cli.outputs.exit_code == 'success' && needs.test_config_load.outputs.exit_code == 'success' && needs.test_raid1_install.outputs.exit_code == 'success' && (needs.test_smoketest_cli_vpp.result != 'failure') && (needs.test_config_load_vpp.result != 'failure') && (needs.test_encrypted_config_tpm.result != 'failure')) && '👍 passed!' || '❌ failed!' }}
+ CI integration ${{ (needs.test_smoketest_cli.outputs.exit_code == 'success' && needs.test_interfaces_cli.outputs.exit_code == 'success' && needs.test_config_load.outputs.exit_code == 'success' && needs.test_raid1_install.outputs.exit_code == 'success' && (needs.test_smoketest_cli_vpp.outputs.exit_code != 'fail') && (needs.test_config_load_vpp.outputs.exit_code != 'fail') && (needs.test_encrypted_config_tpm.outputs.exit_code != 'fail')) && '👍 passed!' || '❌ failed!' }}
### Details
@@ -412,9 +412,9 @@ jobs:
* CLI Smoketests (interfaces only) ${{ needs.test_interfaces_cli.outputs.exit_code == 'success' && '👍 passed' || '❌ failed' }}
* Config tests ${{ needs.test_config_load.outputs.exit_code == 'success' && '👍 passed' || '❌ failed' }}
* RAID1 tests ${{ needs.test_raid1_install.outputs.exit_code == 'success' && '👍 passed' || '❌ failed' }}
- * CLI Smoketests VPP ${{ needs.test_smoketest_cli_vpp.result == 'success' && '👍 passed' || needs.test_smoketest_cli_vpp.result == 'failure' && '❌ failed' || needs.test_smoketest_cli_vpp.result == 'skipped' && '⏭️ skipped' || '⏭️ skipped' }}
- * Config tests VPP ${{ needs.test_config_load_vpp.result == 'success' && '👍 passed' || needs.test_config_load_vpp.result == 'failure' && '❌ failed' || needs.test_config_load_vpp.result == 'skipped' && '⏭️ skipped' || '⏭️ skipped' }}
- * TPM tests ${{ needs.test_encrypted_config_tpm.result == 'success' && '👍 passed' || needs.test_encrypted_config_tpm.result == 'failure' && '❌ failed' || needs.test_encrypted_config_tpm.result == 'skipped' && '⏭️ skipped' || '⏭️ skipped' }}
+ * CLI Smoketests VPP ${{ needs.test_smoketest_cli_vpp.outputs.exit_code == 'success' && '👍 passed' || needs.test_smoketest_cli_vpp.outputs.exit_code == 'fail' && '❌ failed' || '⏭️ skipped' }}
+ * Config tests VPP ${{ needs.test_config_load_vpp.outputs.exit_code == 'success' && '👍 passed' || needs.test_config_load_vpp.outputs.exit_code == 'fail' && '❌ failed' || '⏭️ skipped' }}
+ * TPM tests ${{ needs.test_encrypted_config_tpm.outputs.exit_code == 'success' && '👍 passed' || needs.test_encrypted_config_tpm.outputs.exit_code == 'fail' && '❌ failed' || '⏭️ skipped' }}
message-id: "SMOKETEST_RESULTS"
allow-repeats: false