mirror of
https://github.com/ansible-collections/community.docker.git
synced 2026-03-15 19:58:28 +00:00
Imporve parsing of skipped messages. (#916)
This commit is contained in:
parent
e2f93a0c66
commit
48c0cdf2c5
2
changelogs/fragments/916-compose-v2-parse.yml
Normal file
2
changelogs/fragments/916-compose-v2-parse.yml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
bugfixes:
|
||||||
|
- "docker_compose_v2* modules - fix parsing of skipped pull messages for Docker Compose 2.28.x (https://github.com/ansible-collections/community.docker/issues/911, https://github.com/ansible-collections/community.docker/pull/916)."
|
||||||
@ -202,9 +202,9 @@ _RE_SKIPPED_EVENT = re.compile(
|
|||||||
r'\s*'
|
r'\s*'
|
||||||
r'(?P<resource_id>\S+)'
|
r'(?P<resource_id>\S+)'
|
||||||
r'\s+'
|
r'\s+'
|
||||||
r'Skipped -'
|
r'Skipped(?: -'
|
||||||
r'\s*'
|
r'\s*'
|
||||||
r'(?P<msg>\S(?:|.*\S))'
|
r'(?P<msg>\S(?:|.*\S))|\s*)'
|
||||||
r'$'
|
r'$'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -217,6 +217,36 @@ EXTRA_TEST_CASES = [
|
|||||||
'dummy4: Foo bar',
|
'dummy4: Foo bar',
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
(
|
||||||
|
# https://github.com/ansible-collections/community.docker/issues/911
|
||||||
|
'2.28.1-image-pull-skipped',
|
||||||
|
'2.28.1',
|
||||||
|
False,
|
||||||
|
" bash_1 Skipped \n"
|
||||||
|
" bash_2 Pulling \n"
|
||||||
|
" bash_2 Pulled \n",
|
||||||
|
[
|
||||||
|
Event(
|
||||||
|
'unknown',
|
||||||
|
'bash_1',
|
||||||
|
'Skipped',
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
Event(
|
||||||
|
'service',
|
||||||
|
'bash_2',
|
||||||
|
'Pulling',
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
Event(
|
||||||
|
'service',
|
||||||
|
'bash_2',
|
||||||
|
'Pulled',
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
[],
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
_ALL_TEST_CASES = EVENT_TEST_CASES + EXTRA_TEST_CASES
|
_ALL_TEST_CASES = EVENT_TEST_CASES + EXTRA_TEST_CASES
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user