WIP

moreati · moreati · commit 013137cda767 · 2026-06-01T08:21:00.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,75 +15,6 @@ on:
 # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
 # https://github.com/actions/runner-images/blob/main/README.md#software-and-image-support
 jobs:
-  u2204:
-    name: u2204 ${{ matrix.tox_env }}
-    # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md
-    runs-on: ubuntu-22.04
-    timeout-minutes: 25
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - tox_env: py27-m_ans-ans2.10
-          - tox_env: py27-m_ans-ans4
-
-          - tox_env: py36-m_ans-ans2.10
-          - tox_env: py36-m_ans-ans4
-
-          - tox_env: py27-m_mtg
-          - tox_env: py36-m_mtg
-
-    steps:
-      - uses: actions/checkout@v6
-      - uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - run: .ci/show_python_versions
-      - run: .ci/setup_ssh_key_mitogen__has_sudo_pubkey
-      - run: .ci/setup_sudoers_defaults
-        if: ${{ contains(matrix.tox_env, 'm_mtg') }}
-      - name: Install deps
-        id: install-deps
-        run: |
-          set -o errexit -o nounset -o pipefail
-          source .ci/bash_functions
-          PYTHON="$(toxenv-python '${{ matrix.tox_env }}')"
-
-          sudo apt-get update
-
-          if [[ $PYTHON == "python2.7" ]]; then
-              sudo apt install -y python2-dev sshpass virtualenv
-              curl "https://bootstrap.pypa.io/pip/2.7/get-pip.py" --output "get-pip.py"
-              "$PYTHON" get-pip.py --user --no-python-version-warning
-              # Avoid Python 2.x pip masking system pip
-              rm -f ~/.local/bin/{easy_install,pip,wheel}
-          elif [[ $PYTHON == "python3.6" ]]; then
-              sudo apt install -y gcc-10 make libbz2-dev liblzma-dev libreadline-dev libsqlite3-dev libssl-dev sshpass virtualenv zlib1g-dev
-              curl --fail --silent --show-error --location https://pyenv.run | bash
-              CC=gcc-10 ~/.pyenv/bin/pyenv install --force 3.6
-              PYTHON="$HOME/.pyenv/versions/3.6.15/bin/python3.6"
-          fi
-
-          "$PYTHON" -m pip install -r "tests/requirements-tox.txt"
-          echo "python=$PYTHON" >> $GITHUB_OUTPUT
-      - name: Create environments
-        run: |
-          set -o errexit -o nounset -o pipefail
-          PYTHON="${{ steps.install-deps.outputs.python }}"
-          "$PYTHON" -m tox --notest -e "${{ matrix.tox_env }}"
-      - name: Run tests
-        env:
-          GITHUB_ACTOR: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -o errexit -o nounset -o pipefail
-          PYTHON="${{ steps.install-deps.outputs.python }}"
-
-          "$PYTHON" -m tox -e "${{ matrix.tox_env }}"
-
   u2404:
     name: u2404 ${{ matrix.tox_env }}
     # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
@@ -94,35 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tox_env: py311-m_ans-ans2.10
-            python_version: '3.11'
-          - tox_env: py311-m_ans-ans3
-            python_version: '3.11'
-          - tox_env: py311-m_ans-ans4
-            python_version: '3.11'
-          - tox_env: py311-m_ans-ans5
-            python_version: '3.11'
-          - tox_env: py313-m_ans-ans6
-            python_version: '3.13'
-          - tox_env: py313-m_ans-ans7
-            python_version: '3.13'
-          - tox_env: py313-m_ans-ans8
-            python_version: '3.13'
-          - tox_env: py314-m_ans-ans9
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans10
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans11
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans12
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans13
-            python_version: '3.14'
-
-          - tox_env: py314-m_ans-ans13-s_lin
-            python_version: '3.14'
-
-          - tox_env: py314-m_mtg
+          - tox_env: py314-m_ans-ans14-s_lin
             python_version: '3.14'
 
     steps:
@@ -179,12 +82,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tox_env: py314-m_lcl-ans13
-            python_version: '3.14'
-          - tox_env: py314-m_lcl-ans13-s_lin
-            python_version: '3.14'
-
-          - tox_env: py314-m_mtg
+          - tox_env: py314-m_lcl-ans14-s_lin
             python_version: '3.14'
 
     steps:
@@ -229,7 +127,6 @@ jobs:
   check:
     if: always()
     needs:
-      - u2204
       - u2404
       - macos
     runs-on: ubuntu-latest
diff --git a/tests/ansible/integration/async/result_shell_echo_hi.yml b/tests/ansible/integration/async/result_shell_echo_hi.yml
@@ -5,6 +5,10 @@
   tasks:
 
   - name: Async shell
+    vars:
+      # Ansible >= 14 (ansible-core >= 2.21) omits the "invocation" key by
+      # default, https://github.com/ansible/ansible/pull/86771
+      ansible_inject_invocation: true
     shell: echo hi; echo there >&2
     async: 100
     poll: 0
@@ -18,14 +22,17 @@
       src: "{{ansible_user_dir}}/.ansible_async/{{job.ansible_job_id}}"
     register: result
 
-  #- debug: msg="{{result.content|b64decode|from_json}}"
+  - debug: {var: job}
+  - debug: {var: result}
+  - debug: {msg: "{{ result.content | b64decode | from_json }}"}
 
   - assert:
       that:
         - async_out.changed == True
         - async_out.cmd == "echo hi; echo there >&2"
         - 'async_out.delta.startswith("0:00:")'
         - async_out.end.startswith("20")
+        - async_out.invocation is defined
         - async_out.invocation.module_args._raw_params == "echo hi; echo there >&2"
         - async_out.invocation.module_args._uses_shell == True
         - async_out.invocation.module_args.chdir == None
diff --git a/tests/ansible/integration/async/runner_with_polling_and_timeout.yml b/tests/ansible/integration/async/runner_with_polling_and_timeout.yml
@@ -17,10 +17,11 @@
       that:
         - job1.changed == False
         - job1.failed == True
-        - |
-          job1.msg == "async task did not complete within the requested time" or
-          job1.msg == "async task did not complete within the requested time - 1s" or
-          job1.msg == "Job reached maximum time limit of 1 seconds."
+        - job1.msg == "async task did not complete within the requested time - 1s"
+          or (
+            ansible_version_major_minor is version('2.21', '>=', strict=True)
+            and job1.msg == "async task produced unparsable results"
+          )
       fail_msg: |
         job1={{ job1 }}
   tags:
diff --git a/tests/ansible/integration/interpreter_discovery/all.yml b/tests/ansible/integration/interpreter_discovery/all.yml
@@ -1,2 +1,4 @@
 - import_playbook: complex_args.yml
-- import_playbook: ansible_2_8_tests.yml
+- import_playbook: auto.yml
+- import_playbook: auto_legacy.yml
+- import_playbook: auto_legacy_silent.yml
diff --git a/tests/ansible/integration/interpreter_discovery/auto.yml b/tests/ansible/integration/interpreter_discovery/auto.yml
@@ -1,6 +1,5 @@
 # ripped and ported from https://github.com/ansible/ansible/pull/50163/files, when interpreter discovery was added to ansible
----
-- name: integration/interpreter_discovery/ansible_2_8_tests.yml, baseline
+- name: integration/interpreter_discovery/auto.yml, linear
   hosts: test-targets
   strategy: linear
   tasks:
@@ -12,7 +11,7 @@
       register: linear_auto_result
 
 
-- name: integration/interpreter_discovery/ansible_2_8_tests.yml
+- name: integration/interpreter_discovery/auto.yml
   hosts: test-targets
   gather_facts: true
   tasks:
@@ -69,48 +68,6 @@
                 or not (echoout.running_python.sys.platform == "darwin"
                         and echoout.running_python.platform.release.major == 20)
 
-
-        - name: test that auto_legacy gives a dep warning when /usr/bin/python present but != auto result
-          block:
-          - name: clear facts to force interpreter discovery to run
-            meta: clear_facts
-
-          - name: trigger discovery with auto_legacy
-            vars:
-              ansible_python_interpreter: auto_legacy
-            ping:
-            register: legacy
-
-          - name: check for dep warning (only on platforms where auto result is not /usr/bin/python and legacy is) for ansible 2.8-2.11
-            # from ansible 2.12 on this changed
-            #  - https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_5.html#python-interpreter-discovery
-            #  - https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html
-            # default discovery method is now auto and will default to python3
-            # and the message changed from a deprecation warning to a real warning that can not be suppressed by
-            # using deprecation_warnings=False
-            assert:
-              that:
-              - legacy.deprecations | default([]) | length > 0
-              fail_msg: |
-                legacy={{ legacy }}
-            # only check for a dep warning if legacy returned /usr/bin/python and auto didn't
-            when:
-              - legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python'
-              - auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python'
-              - ansible_version_major_minor is version('2.12', '<', strict=True)
-
-          - name: check for warning (only on platforms where auto result is not /usr/bin/python and legacy is) from ansible 2.12 on
-            assert:
-              that:
-              - legacy.warnings | default([]) | length > 0
-              fail_msg: |
-                legacy={{ legacy }}
-            # only check for a warning if legacy returned /usr/bin/python and auto didn't
-            when:
-              - legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python'
-              -  auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python'
-              -  ansible_version_major_minor is version('2.12', '>=', strict=True)
-
         - name: test that auto_silent never warns and got the same answer as auto
           block:
           - name: clear facts to force interpreter discovery to run
@@ -129,25 +86,6 @@
               fail_msg: |
                 auto_silent_out={{ auto_silent_out }}
 
-
-        - name: test that auto_legacy_silent never warns and got the same answer as auto_legacy
-          block:
-          - name: clear facts to force interpreter discovery to run
-            meta: clear_facts
-
-          - name: trigger discovery with auto_legacy_silent
-            vars:
-              ansible_python_interpreter: auto_legacy_silent
-            ping:
-            register: legacy_silent
-
-          - assert:
-              that:
-                - legacy_silent.warnings is not defined
-                - legacy_silent.ansible_facts.discovered_interpreter_python == legacy.ansible_facts.discovered_interpreter_python
-              fail_msg: |
-                legacy_silent={{ legacy_silent }}
-
         - name: ensure modules can't set discovered_interpreter_X or ansible_X_interpreter
           block:
           - test_echo_module:
@@ -180,5 +118,3 @@
           - meta: clear_facts
       when:
         - ansible_version_major_minor is version('2.8', '>=', strict=True)
-  tags:
-    - ansible_2_8_tests
diff --git a/tests/ansible/integration/interpreter_discovery/auto_legacy.yml b/tests/ansible/integration/interpreter_discovery/auto_legacy.yml
@@ -0,0 +1,52 @@
+- name: integration/interpreter_discovery/auto_legacy.yml
+  hosts: test-targets
+  gather_facts: true
+  tasks:
+    - meta: end_play
+      when:
+        - ansible_version_major_minor is version('2.7', '<=', strict=True)
+          or ansible_version_major_minor is version('2.21', '>=', strict=True)
+
+    - meta: clear_facts
+    - name: Discover with auto
+      vars:
+        ansible_python_interpreter: auto
+      ping:
+      register: auto_discovered
+
+    - meta: clear_facts
+    - name: Discover with auto_legacy
+      vars:
+        ansible_python_interpreter: auto_legacy
+      ping:
+      register: auto_legacy_discovered
+
+    - name: check for dep warning (only on platforms where auto result is not /usr/bin/python and legacy is) for ansible 2.8-2.11
+      # from ansible 2.12 on this changed
+      #  - https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_5.html#python-interpreter-discovery
+      #  - https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html
+      # default discovery method is now auto and will default to python3
+      # and the message changed from a deprecation warning to a real warning that can not be suppressed by
+      # using deprecation_warnings=False
+      assert:
+        that:
+        - auto_legacy_discovered.deprecations | default([]) | length > 0
+        fail_msg: |
+          auto_legacy_discovered={{ auto_legacy_discovered }}
+      # only check for a dep warning if auto_legacy returned /usr/bin/python and auto didn't
+      when:
+        - ansible_version_major_minor is version('2.12', '<', strict=True)
+        - auto_legacy_discovered.ansible_facts.discovered_interpreter_python == '/usr/bin/python'
+        - auto_discovered.ansible_facts.discovered_interpreter_python != '/usr/bin/python'
+
+    - name: check for warning (only on platforms where auto result is not /usr/bin/python and legacy is) from ansible 2.12 on
+      assert:
+        that:
+        - auto_legacy_discovered.warnings | default([]) | length > 0
+        fail_msg: |
+          auto_legacy_discovered={{ auto_legacy_discovered }}
+      # only check for a warning if auto_legacy returned /usr/bin/python and auto didn't
+      when:
+        - ansible_version_major_minor is version('2.12', '>=', strict=True)
+        - auto_legacy_discovered.ansible_facts.discovered_interpreter_python == '/usr/bin/python'
+        - auto_discovered.ansible_facts.discovered_interpreter_python != '/usr/bin/python'
diff --git a/tests/ansible/integration/interpreter_discovery/auto_legacy_silent.yml b/tests/ansible/integration/interpreter_discovery/auto_legacy_silent.yml
@@ -0,0 +1,22 @@
+- name: integration/interpreter_discovery/auto_legacy_slient.yml
+  hosts: test-targets
+  gather_facts: true
+  tasks:
+    - meta: end_play
+      when:
+        - ansible_version_major_minor is version('2.7', '<=', strict=True)
+          or ansible_version_major_minor is version('2.21', '>=', strict=True)
+
+    - meta: clear_facts
+    - name: Discover with auto_legacy_silent
+      vars:
+        ansible_python_interpreter: auto_legacy_silent
+      ping:
+      register: auto_legacy_silent_discovered
+
+    - assert:
+        that:
+          - auto_legacy_silent_discovered.warnings is not defined
+          - auto_legacy_silent_discovered.ansible_facts.discovered_interpreter_python == legacy.ansible_facts.discovered_interpreter_python
+        fail_msg: |
+          auto_legacy_silent_discovered={{ auto_legacy_silent_discovered }}
diff --git a/tests/ansible/lib/modules/import_from_ansible_collections.py b/tests/ansible/lib/modules/import_from_ansible_collections.py
@@ -5,7 +5,10 @@
 __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.community.general.plugins.module_utils.source_control import bitbucket
+try:
+    from ansible_collections.community.general.plugins.module_utils import _bitbucket as bitbucket
+except ImportError:
+    from ansible_collections.community.general.plugins.module_utils.source_control import bitbucket
 
 
 def main():
diff --git a/tests/image_prep/_user_accounts.yml b/tests/image_prep/_user_accounts.yml
@@ -6,7 +6,6 @@
 - name: Mitogen test users and groups
   hosts: all
   gather_facts: true
-  strategy: mitogen_free
   become: true
   pre_tasks:
     - name: Disable non-localhost SSH for Mitogen users
diff --git a/tests/image_prep/macos_localhost.yml b/tests/image_prep/macos_localhost.yml
@@ -1,7 +1,6 @@
 - name: Configure macOS
   hosts: all
   gather_facts: true
-  strategy: mitogen_free
   become: true
   roles:
     - role: sshd
diff --git a/tox.ini b/tox.ini
