WIP

mitogen-hq · Jan 19, 2025 · 7ad1174 · 7ad1174
1 parent 9fa4e3e
commit 7ad1174
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 33 deletions.
diff --git a/tests/ansible/regression/all.yml b/tests/ansible/regression/all.yml
@@ -1,17 +1,3 @@
-- import_playbook: issue_109__target_has_old_ansible_installed.yml
-- import_playbook: issue_113__duplicate_module_imports.yml
-- import_playbook: issue_118__script_not_marked_exec.yml
-- import_playbook: issue_122__environment_difference.yml
-- import_playbook: issue_140__thread_pileup.yml
-- import_playbook: issue_152__local_action_wrong_interpreter.yml
-- import_playbook: issue_152__virtualenv_python_fails.yml
-- import_playbook: issue_154__module_state_leaks.yml
-- import_playbook: issue_177__copy_module_failing.yml
-- import_playbook: issue_332_ansiblemoduleerror_first_occurrence.yml
-- import_playbook: issue_558_unarchive_failed.yml
-- import_playbook: issue_590__sys_modules_crap.yml
-- import_playbook: issue_591__setuptools_cwd_crash.yml
-- import_playbook: issue_615__streaming_transfer.yml
 - import_playbook: issue_655__wait_for_connection_error.yml
 - import_playbook: issue_766__get_with_context.yml
 - import_playbook: issue_776__load_plugins_called_twice.yml

diff --git a/tests/ansible/regression/issue_655__wait_for_connection_error.yml b/tests/ansible/regression/issue_655__wait_for_connection_error.yml
@@ -11,7 +11,8 @@
   tasks:
     - meta: end_play
       when:
-        # Podman versions available in Homebrew have dropped macOS 12 support.
+        # Podman versions available in Homebrew require macOS 13+ (Ventura).
+        # https://formulae.brew.sh/formula/podman
         - ansible_facts.system == 'Darwin'
         - ansible_facts.distribution_version is version('13.0', '<', strict=True)
 

diff --git a/tests/ansible/regression/issue_766__get_with_context.yml b/tests/ansible/regression/issue_766__get_with_context.yml
@@ -2,39 +2,52 @@
 ---
 - name: regression/issue_766__get_with_context.yml
   hosts: localhost
+  # Gather facts to use *and* to trigger any "could not recover task_vars" error
+  # https://github.com/mitogen-hq/mitogen/pull/1215#issuecomment-2596421111
   gather_facts: true
+  vars:
+    netconf_container_image: ghcr.io/mitogen-hq/sysrepo-netopeer2:latest
+    netconf_container_name: sysprep
+    netconf_container_port: 8030
+
   tasks:
+    - meta: end_play
+      when:
+        # Podman can be installed on macOS (see issue_655__wait_for_connection_error.yml)
+        # Authenticating to gchr.io is a more trouble than it's worth right now.
+        - ansible_facts.system == 'Darwin'
+
     - block:
         - name: Start container
-          delegate_to: localhost
-          vars:
-            ansible_port: 8040
-          containers.podman.podman_container:
-            name: sysprep
-            image: ghcr.io/mitogen-hq/sysrepo-netopeer2:latest
-            auto_remove: true
-            detach: true
-            recreate: true
-            published_ports:
-              - "{{ ansible_port }}:830"
+          command:
+            cmd: >-
+              podman run
+              --name "{{ netconf_container_name }}"
+              --detach
+              --rm
+              --publish "{{ netconf_container_port }}:830"
+              "{{ netconf_container_image }}"
+          changed_when: true
 
         - name: Wait for container
-          delegate_to: localhost
           # TODO robust condition. wait_for + search_regex? wait_for_connection?
           wait_for:
             timeout: 5
 
         - name: Get running configuration and state data
           vars:
-            ansible_port: 8040
             ansible_connection: netconf
             ansible_user: netconf
             ansible_password: netconf
+            ansible_port: "{{ netconf_container_port }}"
+            ansible_host_key_checking: false
+            ansible_python_interpreter: "{{ ansible_playbook_python }}"
           ansible.netcommon.netconf_get:
 
       always:
         - name: Cleanup container
-          delegate_to: localhost
-          containers.podman.podman_container:
-            name: sysprep
-            state: absent
+          command:
+            cmd: podman stop "{{ netconf_container_name }}"
+          changed_when: true
+  tags:
+    - issue_766
diff --git a/tests/ansible/requirements.txt b/tests/ansible/requirements.txt
@@ -1,4 +1,6 @@
-paramiko==2.3.2  # Last 2.6-compat version.
+paramiko==2.12.0;           python_version <= '2.7'
+paramiko==3.5.0;            python_version >= '3.6'
+
 # Incompatible with pip >= 72, due to removal of `setup.py test`:
 #   ModuleNotFoundError: No module named 'setuptools.command.test'
 # https://github.com/pypa/setuptools/issues/4519