Skip to content

Commit 0a6eef0

Browse files
šŸ› unit-, integration- and system- tests don't fail on cancellation (#8032)
1 parent 1fd4927 commit 0a6eef0

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

ā€Ž.github/workflows/ci-testing-deploy.ymlā€Ž

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,14 +1544,13 @@ jobs:
15441544
]
15451545
runs-on: ubuntu-latest
15461546
steps:
1547-
- name: a previous unit-test job failed
1548-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
1547+
- name: a previous unit-test job failed or was cancelled
1548+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
15491549
run: |
1550-
echo "::error title=ERROR::one of the unit-tests failed!"
1551-
echo "${{ join(needs.*.result, ',') }}"
1550+
echo "::error title=ERROR::one of the unit-tests failed or was cancelled!"
15521551
exit 1
15531552
- name: all the previous unit-tests were run successfully or skipped
1554-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
1553+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
15551554
run: echo "::notice All good!"
15561555

15571556
integration-test-webserver-01:
@@ -1876,13 +1875,13 @@ jobs:
18761875
]
18771876
runs-on: ubuntu-latest
18781877
steps:
1879-
- name: a previous integration-test job failed
1880-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
1878+
- name: a previous integration-test job failed or was cancelled
1879+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
18811880
run: |
1882-
echo "::error title=ERROR::one of the integration-tests failed!"
1881+
echo "::error title=ERROR::one of the integration-tests failed or was cancelled!"
18831882
exit 1
18841883
- name: all the previous integration-tests were run successfully or skipped
1885-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
1884+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
18861885
run: echo "::notice All good!"
18871886

18881887
system-test-public-api:
@@ -2111,13 +2110,13 @@ jobs:
21112110
]
21122111
runs-on: ubuntu-latest
21132112
steps:
2114-
- name: a previous system-test job failed
2115-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
2113+
- name: a previous system-test job failed or was cancelled
2114+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
21162115
run: |
2117-
echo "::error title=ERROR::one of the system-tests failed!"
2116+
echo "::error title=ERROR::one of the system-tests failed or was cancelled!"
21182117
exit 1
21192118
- name: all the previous system-tests were run successfully or skipped
2120-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
2119+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
21212120
run: echo "::notice All good!"
21222121

21232122
deploy:

ā€Žservices/director-v2/src/simcore_service_director_v2/_meta.pyā€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
""" Application's metadata
1+
"""Application's metadata."""
22

3-
"""
43
from typing import Final
54

65
from models_library.basic_types import VersionStr

0 commit comments

Comments
Ā (0)