cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

collection: match skip message as per role install (#74861)

Browse source
This commit is contained in:
Abhijeet Kasurde 2021-06-01 09:44:01 +05:30 committed by GitHub
parent 35a2345809
commit b0dcf0d164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/67943_collection_skip.yml Normal file
View file

@ -0,0 +1,3 @@
---
minor_changes:
- collection - match skip message as per role installation.

4
lib/ansible/galaxy/collection/__init__.py
View file

@ -523,14 +523,14 @@ def install_collections(
for fqcn, concrete_coll_pin in dependency_map.items(): for fqcn, concrete_coll_pin in dependency_map.items():
if concrete_coll_pin.is_virtual: if concrete_coll_pin.is_virtual:
display.vvvv( display.vvvv(
"Skipping '{coll!s}' as it is virtual". "'{coll!s}' is virtual, skipping.".
format(coll=to_text(concrete_coll_pin)), format(coll=to_text(concrete_coll_pin)),
) )
continue continue
if concrete_coll_pin in preferred_collections: if concrete_coll_pin in preferred_collections:
display.display( display.display(
"Skipping '{coll!s}' as it is already installed". "'{coll!s}' is already installed, skipping.".
format(coll=to_text(concrete_coll_pin)), format(coll=to_text(concrete_coll_pin)),
) )
continue continue

6
test/integration/targets/ansible-galaxy-collection/tasks/upgrade.yml
View file

@ -124,9 +124,9 @@
that: that:
- '"parent_dep.parent_collection:1.1.0 was installed successfully" in result.stdout_lines' - '"parent_dep.parent_collection:1.1.0 was installed successfully" in result.stdout_lines'
- (metadata.results[0].content | b64decode | from_json).collection_info.version == '1.1.0' - (metadata.results[0].content | b64decode | from_json).collection_info.version == '1.1.0'
- "\"Skipping 'child_dep.child_collection:0.9.9' as it is already installed\" in result.stdout_lines" - "\"'child_dep.child_collection:0.9.9' is already installed, skipping.\" in result.stdout_lines"
- (metadata.results[1].content | b64decode | from_json).collection_info.version == '0.9.9' - (metadata.results[1].content | b64decode | from_json).collection_info.version == '0.9.9'
- "\"Skipping 'child_dep.child_dep2:1.2.2' as it is already installed\" in result.stdout_lines" - "\"'child_dep.child_dep2:1.2.2' is already installed, skipping.\" in result.stdout_lines"
- (metadata.results[2].content | b64decode | from_json).collection_info.version == '1.2.2' - (metadata.results[2].content | b64decode | from_json).collection_info.version == '1.2.2'
##### Updating collections with --upgrade ##### Updating collections with --upgrade
@ -187,7 +187,7 @@
register: result register: result
- assert: - assert:
that: "\"Skipping 'namespace1.name1:1.1.0-beta.1' as it is already installed\" in result.stdout" that: "\"'namespace1.name1:1.1.0-beta.1' is already installed, skipping.\" in result.stdout"
# With deps # With deps