Fix ansible-test issues for CI (#241)

plugins/module_utils/podman/common.py

@@ -1,4 +1,3 @@
-#!/usr/bin/python
 # Copyright (c) 2020 Red Hat
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/module_utils/podman/podman_container_lib.py

@@ -38,10 +38,10 @@ ARGUMENTS_SPEC_CONTAINER = dict(
     debug=dict(type='bool', default=False),
     detach_keys=dict(type='str', no_log=False),
     device=dict(type='list', elements='str'),
-    device_read_bps=dict(type='list'),
-    device_read_iops=dict(type='list'),
-    device_write_bps=dict(type='list'),
-    device_write_iops=dict(type='list'),
+    device_read_bps=dict(type='list', elements='str'),
+    device_read_iops=dict(type='list', elements='str'),
+    device_write_bps=dict(type='list', elements='str'),
+    device_write_iops=dict(type='list', elements='str'),
     dns=dict(type='list', elements='str', aliases=['dns_servers']),
     dns_option=dict(type='str', aliases=['dns_opts']),
     dns_search=dict(type='str', aliases=['dns_search_domains']),
@@ -55,7 +55,7 @@ ARGUMENTS_SPEC_CONTAINER = dict(
     force_restart=dict(type='bool', default=False,
                        aliases=['restart']),
     gidmap=dict(type='list', elements='str'),
-    group_add=dict(type='list', aliases=['groups']),
+    group_add=dict(type='list', elements='str', aliases=['groups']),
     healthcheck=dict(type='str'),
     healthcheck_interval=dict(type='str'),
     healthcheck_retries=dict(type='int'),
@@ -118,7 +118,7 @@ ARGUMENTS_SPEC_CONTAINER = dict(
     tmpfs=dict(type='dict'),
     tty=dict(type='bool'),
     uidmap=dict(type='list', elements='str'),
-    ulimit=dict(type='list', aliases=['ulimits']),
+    ulimit=dict(type='list', elements='str', aliases=['ulimits']),
     user=dict(type='str'),
     userns=dict(type='str', aliases=['userns_mode']),
     uts=dict(type='str'),

plugins/modules/podman_container.py

@@ -209,21 +209,25 @@ options:
       - Limit read rate (bytes per second) from a device
         (e.g. device-read-bps /dev/sda:1mb)
     type: list
+    elements: str
   device_read_iops:
     description:
       - Limit read rate (IO per second) from a device
         (e.g. device-read-iops /dev/sda:1000)
     type: list
+    elements: str
   device_write_bps:
     description:
       - Limit write rate (bytes per second) to a device
         (e.g. device-write-bps /dev/sda:1mb)
     type: list
+    elements: str
   device_write_iops:
     description:
       - Limit write rate (IO per second) to a device
         (e.g. device-write-iops /dev/sda:1000)
     type: list
+    elements: str
   dns:
     description:
       - Set custom DNS servers
@@ -299,6 +303,7 @@ options:
     description:
       - Add additional groups to run as
     type: list
+    elements: str
     aliases:
       - groups
   healthcheck:
@@ -656,6 +661,7 @@ options:
     description:
       - Ulimit options
     type: list
+    elements: str
     aliases:
       - ulimits
   user:

plugins/modules/podman_image.py

@@ -762,8 +762,8 @@ def main():
             ['username', 'password'],
         ),
         mutually_exclusive=(
-            ['authfile', 'username'],
-            ['authfile', 'password'],
+            ['auth_file', 'username'],
+            ['auth_file', 'password'],
         ),
     )
 

tests/sanity/ignore-2.10.txt

@@ -1,5 +1,2 @@
-plugins/modules/podman_image.py validate-modules:mutually_exclusive-unknown
-plugins/modules/podman_container.py validate-modules:parameter-list-no-elements
 tests/integration/targets/connection_buildah/runme.sh shellcheck:SC2086
 tests/integration/targets/connection_podman/runme.sh shellcheck:SC2086
-plugins/module_utils/podman/common.py shebang!skip

tests/sanity/ignore-2.11.txt

@@ -1,5 +1,2 @@
-plugins/modules/podman_image.py validate-modules:mutually_exclusive-unknown
-plugins/modules/podman_container.py validate-modules:parameter-list-no-elements
 tests/integration/targets/connection_buildah/runme.sh shellcheck:SC2086
 tests/integration/targets/connection_podman/runme.sh shellcheck:SC2086
-plugins/module_utils/podman/common.py shebang!skip

tests/sanity/ignore-2.12.txt

@@ -0,0 +1,2 @@
+tests/integration/targets/connection_buildah/runme.sh shellcheck:SC2086
+tests/integration/targets/connection_podman/runme.sh shellcheck:SC2086

tests/sanity/ignore-2.9.txt

@@ -1,3 +1,2 @@
 tests/integration/targets/connection_buildah/runme.sh shellcheck:SC2086
 tests/integration/targets/connection_podman/runme.sh shellcheck:SC2086
-plugins/module_utils/podman/common.py shebang!skip