Add unstable podman to jobs

.github/workflows/podman_container_api.yml

@@ -31,7 +31,7 @@ on:
 jobs:
 
   test_podman_container_api:
-    name: Podman API container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }}
+    name: Podman API container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }}-${{ matrix.podman-version || 'unstable' }}
     runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
     defaults:
       run:
@@ -47,6 +47,13 @@ jobs:
           - ubuntu-22.04
         python-version:
           - "3.10"
+        podman-version:
+          - unstable
+        include:
+          - os: ubuntu-22.04
+            ansible-version: git+https://github.com/ansible/[email protected]
+            python-version: "3.10"
+            podman-version: stable
 
     steps:
 
@@ -112,7 +119,8 @@ jobs:
           -e host=localhost \
           -i localhost, \
           -e ansible_connection=local \
-          -e setup_python=false
+          -e setup_python=false \
+          -e podman_version_ubuntu=${{ matrix.podman-version }}
 
           TEST2RUN=podman_container_api ./ci/run_containers_tests.sh
         shell: bash

plugins/module_utils/podman/common.py

@@ -429,6 +429,8 @@ def diff_generic(params, info_config, module_arg, cmd_arg, boolean_type=False):
     else:
         before = ",".join(sorted(before)) if len(before) > 1 else before[0]
     return before, after
+
+
 class PodmanAPI:
     def __init__(self, module, module_params):
         if module_params.get('podman_socket') and not HAS_REQUESTS:

plugins/module_utils/podman/podman_container_lib.py

@@ -9,16 +9,11 @@
 from ansible_collections.containers.podman.plugins.module_utils.podman.common import lower_keys
 from ansible_collections.containers.podman.plugins.module_utils.podman.common import generate_systemd
 from ansible_collections.containers.podman.plugins.module_utils.podman.common import delete_systemd
-<<<<<<< HEAD
 from ansible_collections.containers.podman.plugins.module_utils.podman.common import diff_generic
 from ansible_collections.containers.podman.plugins.module_utils.podman.common import createcommand
 from ansible_collections.containers.podman.plugins.module_utils.podman.quadlet import create_quadlet_state
 from ansible_collections.containers.podman.plugins.module_utils.podman.quadlet import ContainerQuadlet
-
-=======
-from ansible_collections.containers.podman.plugins.module_utils.podman.common import normalize_signal
 from .common import PodmanAPI
->>>>>>> e7671a8 (Add option to run with podman-py API)
 
 __metaclass__ = type