ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-18 04:48:46 +00:00
Code Packages Projects Releases Wiki Activity

Fix CI (docker_container tests fail because of missing ipaddress) (#218) (#219)

Browse Source 
* Use stdlib ipaddress, resp. install when needed.

* Make sure facts on controller are available.

(cherry picked from commit f4b1d34357)

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
patchback[bot] 2021-10-07 13:40:50 +02:00 committed by GitHub
parent 26d8aa1c80
commit 087392847d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py
View File

@ -18,10 +18,10 @@
from __future__ import absolute_import, division, print_function from __future__ import absolute_import, division, print_function
__metaclass__ = type __metaclass__ = type
from ansible_collections.community.crypto.plugins.module_utils.compat import ipaddress
def _normalize_ipaddr(ipaddr): def _normalize_ipaddr(ipaddr):
# Import when needed, to allow installation of that module in the test setup
import ipaddress
return ipaddress.ip_address(ipaddr).compressed return ipaddress.ip_address(ipaddr).compressed

13
tests/integration/targets/docker_container/tasks/main.yml
View File

@ -4,6 +4,19 @@
# and should not be used as examples of how to write Ansible roles # # and should not be used as examples of how to write Ansible roles #
#################################################################### ####################################################################
- name: Gather facts on controller
setup:
gather_subset: '!all'
delegate_to: localhost
delegate_facts: true
run_once: true
- name: Make sure ipaddress is available on controller
pip:
name: ipaddress
delegate_to: localhost
when: hostvars['localhost'].ansible_facts.python.version.major < 3
# Create random name prefix (for containers, networks, ...) # Create random name prefix (for containers, networks, ...)
- name: Create random container name prefix - name: Create random container name prefix
set_fact: set_fact: