.azure-pipelines/azure-pipelines.yml

@@ -37,116 +37,293 @@ variables:
   - name: coverageBranches
     value: main
   - name: entryPoint
-    value: tests/utils/shippable/nox.sh
+    value: tests/utils/shippable/shippable.sh
-  - name: prepareEntryPoint
-    value: tests/utils/shippable/nox-prepare.sh
   - name: fetchDepth
     value: 0
 
 resources:
   containers:
     - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:8.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:7.0.0
 
 pool: Standard
 
 stages:
-  - stage: remote_2_19
+
-    displayName: Remote 2.19
+### Sanity & units
+  - stage: Ansible_devel
+    displayName: Sanity & Units devel
     dependsOn: []
-    variables:
-      entryPoint: tests/utils/shippable/nox.sh
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
-            - name: Ubuntu 22.04 + group 1
+            - name: Sanity
-              test: ansible-test-integration-2.19-ubuntu-22.04-azp-1
+              test: 'devel/sanity/1'
-            - name: Ubuntu 22.04 + group 2
+            - name: Units
-              test: ansible-test-integration-2.19-ubuntu-22.04-azp-2
+              test: 'devel/units/1'
-            - name: Ubuntu 22.04 + group 3
+  - stage: Ansible_2_21
-              test: ansible-test-integration-2.19-ubuntu-22.04-azp-3
+    displayName: Sanity & Units 2.21
-            - name: Ubuntu 22.04 + group 4
-              test: ansible-test-integration-2.19-ubuntu-22.04-azp-4
-            - name: Ubuntu 22.04 + group 5
-              test: ansible-test-integration-2.19-ubuntu-22.04-azp-5
-
-  - stage: remote_2_20
-    displayName: Remote 2.20
     dependsOn: []
-    variables:
-      entryPoint: tests/utils/shippable/nox.sh
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
-            - name: RHEL 9.7 + group 1
+            - name: Sanity
-              test: ansible-test-integration-2.20-rhel-9.7-azp-1
+              test: '2.21/sanity/1'
-            - name: RHEL 9.7 + group 2
+            - name: Units
-              test: ansible-test-integration-2.20-rhel-9.7-azp-2
+              test: '2.21/units/1'
-            - name: RHEL 9.7 + group 3
+  - stage: Ansible_2_20
-              test: ansible-test-integration-2.20-rhel-9.7-azp-3
+    displayName: Sanity & Units 2.20
-            - name: RHEL 9.7 + group 4
-              test: ansible-test-integration-2.20-rhel-9.7-azp-4
-            - name: RHEL 9.7 + group 5
-              test: ansible-test-integration-2.20-rhel-9.7-azp-5
-
-  - stage: remote_2_21
-    displayName: Remote 2.21
     dependsOn: []
-    variables:
-      entryPoint: tests/utils/shippable/nox.sh
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
-            - name: RHEL 10.1 + group 1
+            - name: Sanity
-              test: ansible-test-integration-2.21-rhel-10.1-azp-1
+              test: '2.20/sanity/1'
-            - name: RHEL 10.1 + group 2
+            - name: Units
-              test: ansible-test-integration-2.21-rhel-10.1-azp-2
+              test: '2.20/units/1'
-            - name: RHEL 10.1 + group 3
+  - stage: Ansible_2_19
-              test: ansible-test-integration-2.21-rhel-10.1-azp-3
+    displayName: Sanity & Units 2.19
-            - name: RHEL 10.1 + group 4
+    dependsOn: []
-              test: ansible-test-integration-2.21-rhel-10.1-azp-4
+    jobs:
-            - name: RHEL 10.1 + group 5
+      - template: templates/matrix.yml
-              test: ansible-test-integration-2.21-rhel-10.1-azp-5
+        parameters:
+          targets:
+            - name: Sanity
+              test: '2.19/sanity/1'
+            - name: Units
+              test: '2.19/units/1'
+  - stage: Ansible_2_18
+    displayName: Sanity & Units 2.18
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          targets:
+            - name: Sanity
+              test: '2.18/sanity/1'
+            - name: Units
+              test: '2.18/units/1'
 
-  - stage: remote_devel
+### Docker
+  - stage: Docker_devel
+    displayName: Docker devel
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: devel/linux/{0}
+          targets:
+            - name: Fedora 44
+              test: fedora44
+            - name: Ubuntu 26.04
+              test: ubuntu2604
+            - name: Ubuntu 24.04
+              test: ubuntu2404
+            - name: Alpine 3.23
+              test: alpine323
+          groups:
+            - 4
+            - 5
+  - stage: Docker_2_21
+    displayName: Docker 2.21
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.21/linux/{0}
+          targets:
+            - name: Fedora 43
+              test: fedora43
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+            - name: Ubuntu 24.04
+              test: ubuntu2404
+            # - name: Alpine 3.23
+            #   test: alpine323
+          groups:
+            - 4
+            - 5
+  - stage: Docker_2_20
+    displayName: Docker 2.20
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.20/linux/{0}
+          targets:
+            - name: Fedora 42
+              test: fedora42
+            - name: Alpine 3.22
+              test: alpine322
+          groups:
+            - 4
+            - 5
+  - stage: Docker_2_19
+    displayName: Docker 2.19
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.19/linux/{0}
+          targets:
+            - name: Fedora 41
+              test: fedora41
+            - name: Alpine 3.21
+              test: alpine321
+          groups:
+            - 4
+            - 5
+  - stage: Docker_2_18
+    displayName: Docker 2.18
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.18/linux/{0}
+          targets:
+            - name: Fedora 40
+              test: fedora40
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+            - name: Alpine 3.20
+              test: alpine320
+          groups:
+            - 4
+            - 5
+
+### Community Docker
+  - stage: Docker_community_devel
+    displayName: Docker (community images) devel
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: devel/linux-community/{0}
+          targets:
+            - name: Debian 11 Bullseye
+              test: debian-bullseye/3.9
+            - name: Debian 12 Bookworm
+              test: debian-bookworm/3.11
+            - name: Debian 13 Trixie
+              test: debian-13-trixie/3.13
+            - name: ArchLinux
+              test: archlinux/3.14
+          groups:
+            - 4
+            - 5
+
+### Remote
+  - stage: Remote_devel
     displayName: Remote devel
     dependsOn: []
-    variables:
-      entryPoint: tests/utils/shippable/nox.sh
     jobs:
       - template: templates/matrix.yml
         parameters:
+          testFormat: devel/{0}
           targets:
-            - name: RHEL 10.1 + group 1 + sdk-dev-latest
+            - name: RHEL 10.1 with Docker SDK, urllib3, requests from sources
-              test: ansible-test-integration-devel-rhel-10.1-azp-1
+              test: rhel/10.1-dev-latest
-            - name: RHEL 10.1 + group 2 + sdk-dev-latest
+            - name: RHEL 9.7
-              test: ansible-test-integration-devel-rhel-10.1-azp-2
+              test: rhel/9.7
-            - name: RHEL 10.1 + group 3 + sdk-dev-latest
+            # For some reason, Ubuntu 24.04 is *extremely* slower than RHEL 9.6
-              test: ansible-test-integration-devel-rhel-10.1-azp-3
+            # - name: Ubuntu 24.04
-            - name: RHEL 10.1 + group 4 + sdk-dev-latest
+            #   test: ubuntu/24.04
-              test: ansible-test-integration-devel-rhel-10.1-azp-4
+          groups:
-            - name: RHEL 10.1 + group 5 + sdk-dev-latest
+            - 1
-              test: ansible-test-integration-devel-rhel-10.1-azp-5
+            - 2
-            - name: RHEL 9.7 + group 1
+            - 3
-              test: ansible-test-integration-devel-rhel-9.7-azp-1
+            - 4
-            - name: RHEL 9.7 + group 2
+            - 5
-              test: ansible-test-integration-devel-rhel-9.7-azp-2
+  - stage: Remote_2_21
-            - name: RHEL 9.7 + group 3
+    displayName: Remote 2.21
-              test: ansible-test-integration-devel-rhel-9.7-azp-3
+    dependsOn: []
-            - name: RHEL 9.7 + group 4
+    jobs:
-              test: ansible-test-integration-devel-rhel-9.7-azp-4
+      - template: templates/matrix.yml
-            - name: RHEL 9.7 + group 5
+        parameters:
-              test: ansible-test-integration-devel-rhel-9.7-azp-5
+          testFormat: 2.21/{0}
+          targets:
+            - name: RHEL 10.1
+              test: rhel/10.1
+            # - name: RHEL 9.7
+            #   test: rhel/9.7
+          groups:
+            - 1
+            - 2
+            - 3
+            - 4
+            - 5
+  - stage: Remote_2_20
+    displayName: Remote 2.20
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.20/{0}
+          targets:
+            - name: RHEL 9.7
+              test: rhel/9.7
+          groups:
+            - 1
+            - 2
+            - 3
+            - 4
+            - 5
+  - stage: Remote_2_19
+    displayName: Remote 2.19
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.19/{0}
+          targets:
+            - name: Ubuntu 22.04
+              test: ubuntu/22.04
+          groups:
+            - 1
+            - 2
+            - 3
+            - 4
+            - 5
+  - stage: Remote_2_18
+    displayName: Remote 2.18
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.18/{0}
+          targets:
+            - name: RHEL 9.7
+              test: rhel/9.7
+          groups:
+            - 1
+            - 2
+            - 3
+            - 4
+            - 5
+
+  ## Finally
 
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
-      - remote_2_19
+      - Ansible_devel
-      - remote_2_20
+      - Ansible_2_21
-      - remote_2_21
+      - Ansible_2_20
-      - remote_devel
+      - Ansible_2_19
+      - Ansible_2_18
+      - Remote_devel
+      - Remote_2_21
+      - Remote_2_20
+      - Remote_2_19
+      - Remote_2_18
+      - Docker_devel
+      - Docker_2_21
+      - Docker_2_20
+      - Docker_2_19
+      - Docker_2_18
+      - Docker_community_devel
     jobs:
       - template: templates/coverage.yml

.azure-pipelines/scripts/run-tests.sh

@@ -10,13 +10,11 @@ set -o pipefail -eu
 entry_point="$1"
 test="$2"
 read -r -a coverage_branches <<< "$3"  # space separated list of branches to run code coverage on for scheduled builds
-agent_temp_directory="$4"
 
 export COMMIT_MESSAGE
 export COMPLETE
 export COVERAGE
 export IS_PULL_REQUEST
-export COVERAGE_DESTINATION_DIRECTORY="${agent_temp_directory}/coverage"
 
 if [ "${SYSTEM_PULLREQUEST_TARGETBRANCH:-}" ]; then
     IS_PULL_REQUEST=true

.azure-pipelines/templates/test.yml

@@ -23,16 +23,14 @@ jobs:
           - checkout: self
             fetchDepth: $(fetchDepth)
             path: $(checkoutPath)
-          - bash: .azure-pipelines/scripts/run-tests.sh "$(prepareEntryPoint)" "${{ job.test }}" "$(coverageBranches)" "$(Agent.TempDirectory)"
+          - bash: .azure-pipelines/scripts/run-tests.sh "$(entryPoint)" "${{ job.test }}" "$(coverageBranches)"
-            displayName: Prepare Tests
-          - bash: .azure-pipelines/scripts/run-tests.sh "$(entryPoint)" "${{ job.test }}" "$(coverageBranches)" "$(Agent.TempDirectory)"
             displayName: Run Tests
           - bash: .azure-pipelines/scripts/process-results.sh
             condition: succeededOrFailed()
             displayName: Process Results
-          # - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)"
+          - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)"
-          #   condition: eq(variables.haveCoverageData, 'true')
+            condition: eq(variables.haveCoverageData, 'true')
-          #   displayName: Aggregate Coverage Data
+            displayName: Aggregate Coverage Data
           - task: PublishTestResults@2
             condition: eq(variables.haveTestResults, 'true')
             inputs:

.github/workflows/nox.yml

@@ -15,11 +15,6 @@ name: nox
     - cron: '0 9 * * *'
   workflow_dispatch:
 
-concurrency:
-  # Make sure there is at most one active run per PR, but do not cancel any non-PR runs
-  group: ${{ github.workflow }}-${{ (github.head_ref && github.event.number) || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   nox:
     uses: ansible-community/antsibull-nox/.github/workflows/reusable-nox-run.yml@main
@@ -35,6 +30,29 @@ jobs:
       upload-codecov-pr: false
       upload-codecov-push: false
       upload-codecov-schedule: true
-      allow-coverage-cd-override: true
+      max-ansible-core: "2.17"
+      # For some reason GitHub decided to bump Docker on the ubuntu-24.04 image,
+      # which is not compatible with podman and various other things.
+      pre-test-cmd-integration: |-
+        # See https://docs.docker.com/engine/install/ubuntu/.
+
+        # Add Docker's official GPG key:
+        sudo apt update
+        sudo apt install ca-certificates curl
+        sudo install -m 0755 -d /etc/apt/keyrings
+        sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+        sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+        # Add the repository to Apt sources:
+        sudo tee /etc/apt/sources.list.d/docker.sources <<EOF
+        Types: deb
+        URIs: https://download.docker.com/linux/ubuntu
+        Suites: $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}")
+        Components: stable
+        Signed-By: /etc/apt/keyrings/docker.asc
+        EOF
+
+        sudo apt update
+        sudo apt-get install -y --allow-downgrades docker-ce-cli=5:28.0.4-1~ubuntu.24.04~noble docker-ce=5:28.0.4-1~ubuntu.24.04~noble
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

antsibull-nox.toml

@@ -9,10 +9,6 @@
 "community.internal_test_tools" = "git+https://github.com/ansible-collections/community.internal_test_tools.git,main"
 "community.library_inventory_filtering_v1" = "git+https://github.com/ansible-collections/community.library_inventory_filtering.git,stable-1"
 
-[collection_sources_per_ansible.'2.17']
-# community.general's main branch needs ansible-core >= 2.18
-"community.general" = "git+https://github.com/ansible-collections/community.general.git,stable-12"
-
 [vcs]
 vcs = "git"
 development_branch = "main"
@@ -103,28 +99,13 @@ include_devel = true
 
 [sessions.ansible_test_integration]
 session_name_template = "ansible-test-integration-{ansible_core}{dash_docker_short}{dash_remote}{dash_python_version}{dash_target_dashized}"
-display_name_template = "Ⓐ{ansible_core}{plus_docker_nice}{plus_remote_nice}{plus_py_python_version}{plus_target_nice}{plus_force_docker_sdk_for_python_dev}{plus_force_docker_sdk_for_python_pypi}"
+display_name_template = "Ⓐ{ansible_core}{plus_docker_short}{plus_remote}{plus_py_python_version}{plus_target}{plus_force_docker_sdk_for_python_dev}{plus_force_docker_sdk_for_python_pypi}"
-description_template = "Run integration tests with ansible-core {ansible_core}{comma_docker_nice}{comma_remote_nice}{comma_py_python_version}{comma_target_nice}{comma_force_docker_sdk_for_python_dev}{comma_force_docker_sdk_for_python_pypi}"
+description_template = "Run integration tests with ansible-core {ansible_core}{comma_docker_short}{comma_remote}{comma_py_python_version}{comma_target}{comma_force_docker_sdk_for_python_dev}{comma_force_docker_sdk_for_python_pypi}"
-retry_on_error = "in-ci"
 
 [sessions.ansible_test_integration.ansible_vars]
 force_docker_sdk_for_python_dev = { type = "value", value = false, template_value = "" }
 force_docker_sdk_for_python_pypi = { type = "value", value = false, template_value = "" }
 
-[sessions.ansible_test_integration.nice_target_names]
-"azp/1/" = "group 1"
-"azp/2/" = "group 2"
-"azp/3/" = "group 3"
-"azp/4/" = "group 4"
-"azp/5/" = "group 5"
-
-[sessions.ansible_test_integration.nice_docker_names]
-"quay.io/ansible-community/test-image:debian-bullseye" = "Debian 11"
-"quay.io/ansible-community/test-image:debian-bookworm" = "Debian 12"
-"quay.io/ansible-community/test-image:debian-13-trixie" = "Debian 13"
-"quay.io/ansible-community/test-image:archlinux" = "Arch Linux"
-"quay.io/ansible-community/test-image:opensuse-tumbleweed" = "OpenSuSE Tumbleweed"
-
 ##################################################################################################
 
 # Ansible-core 2.17:
@@ -236,12 +217,6 @@ target = [ "azp/4/", "azp/5/" ]
 python_version = "3.13"
 docker = "quay.io/ansible-community/test-image:debian-13-trixie"
 
-[[sessions.ansible_test_integration.groups.sessions]]
-ansible_core = "devel"
-target = [ "azp/4/", "azp/5/" ]
-python_version = "3.13"
-docker = "quay.io/ansible-community/test-image:opensuse-tumbleweed"
-
 [[sessions.ansible_test_integration.groups.sessions]]
 ansible_core = "devel"
 target = [ "azp/4/", "azp/5/" ]
@@ -268,14 +243,14 @@ remote = [
 [sessions.ansible_lint]
 
 [[sessions.ee_check.execution_environments]]
-name = "devel-ubi-10"
+name = "devel-ubi-9"
-description = "ansible-core devel @ RHEL UBI 10"
+description = "ansible-core devel @ RHEL UBI 9"
 test_playbooks = ["tests/ee/all.yml"]
-config.images.base_image.name = "docker.io/redhat/ubi10:latest"
+config.images.base_image.name = "docker.io/redhat/ubi9:latest"
 config.dependencies.ansible_core.package_pip = "https://github.com/ansible/ansible/archive/devel.tar.gz"
 config.dependencies.ansible_runner.package_pip = "ansible-runner"
-config.dependencies.python_interpreter.package_system = "python3.14 python3.14-pip python3.14-cryptography"
+config.dependencies.python_interpreter.package_system = "python3.12 python3.12-pip python3.12-wheel python3.12-cryptography"
-config.dependencies.python_interpreter.python_path = "/usr/bin/python3.14"
+config.dependencies.python_interpreter.python_path = "/usr/bin/python3.12"
 runtime_environment = {"ANSIBLE_PRIVATE_ROLE_VARS" = "true"}
 runtime_container_options = [
     # Mount Docker socket into the container so we can talk to Docker outside the container

galaxy.yml

@@ -7,7 +7,7 @@
 
 namespace: community
 name: docker
-version: 5.3.0
+version: 5.2.1
 readme: README.md
 authors:
   - Ansible Docker Working Group

noxfile.py

@@ -12,7 +12,6 @@ import nox
 
 try:
     import antsibull_nox
-    from antsibull_nox.cli import run as run_antsibull_nox
 except ImportError:
     print("You need to install antsibull-nox in the same Python environment as nox.")
     sys.exit(1)
@@ -21,24 +20,6 @@ except ImportError:
 antsibull_nox.load_antsibull_nox_toml()
 
 
-@nox.session(name="update-azp-config", python=False)
-def update_azp_config(session: nox.Session) -> None:
-    command = [
-        "antsibull-nox",
-        "update-azp-config",
-        "--exclude-tags",
-        "docker",
-        "--min-ansible-core",
-        "2.19",
-    ]
-    if antsibull_nox.IN_CI:
-        command.append("--fail-on-change")
-    session.debug(" ".join(command))
-    result = run_antsibull_nox(command)
-    if result != 0:
-        session.error(f"Execution failed with status code {result}")
-
-
 # Allow to run the noxfile with `python noxfile.py`, `pipx run noxfile.py`, or similar.
 # Requires nox >= 2025.02.09
 if __name__ == "__main__":

tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml

@@ -7,3 +7,4 @@
   ansible.builtin.file:
     path: "{{ remote_tmp_dir }}"
     state: absent
+  no_log: true

tests/unit/plugins/inventory/test_docker_containers.py

@@ -20,7 +20,7 @@ from ansible_collections.community.docker.plugins.inventory.docker_containers im
 )
 
 if t.TYPE_CHECKING:
-    from collections.abc import Callable  # pragma: no cover
+    from collections.abc import Callable
 
 
 @pytest.fixture(scope="module", name="templar")

tests/unit/plugins/module_utils/_api/api/test_client.py

@@ -43,7 +43,7 @@ from ansible_collections.community.docker.tests.unit.plugins.module_utils._api.c
 from .. import fake_api
 
 if t.TYPE_CHECKING:
-    from ansible_collections.community.docker.plugins.module_utils._api.auth import (  # pragma: no cover
+    from ansible_collections.community.docker.plugins.module_utils._api.auth import (
         AuthConfig,
     )
 

tests/unit/plugins/module_utils/_api/fake_api.py

@@ -18,7 +18,7 @@ from ansible_collections.community.docker.tests.unit.plugins.module_utils._api.c
 from . import fake_stat
 
 if t.TYPE_CHECKING:
-    from collections.abc import Callable  # pragma: no cover
+    from collections.abc import Callable
 
 
 CURRENT_VERSION = f"v{DEFAULT_DOCKER_API_VERSION}"

tests/unit/plugins/module_utils/test__copy.py

@@ -13,9 +13,9 @@ from ansible_collections.community.docker.plugins.module_utils._copy import (
 )
 
 if t.TYPE_CHECKING:
-    from collections.abc import Sequence  # pragma: no cover
+    from collections.abc import Sequence
 
-    T = t.TypeVar("T")  # pragma: no cover
+    T = t.TypeVar("T")
 
 
 def _simple_generator(sequence: Sequence[T]) -> t.Generator[T]:

tests/unit/plugins/module_utils/test__image_archive.py

@@ -61,10 +61,12 @@ def test_archived_image_manifest_extracts_nothing_when_file_not_present(
 
 
 def test_archived_image_manifest_raises_when_file_not_a_tar() -> None:
-    with pytest.raises(ImageArchiveInvalidException, match=__file__) as exc_info:
+    try:
         archived_image_manifest(__file__)
-    assert isinstance(exc_info.value.__cause__, tarfile.ReadError)
+        raise AssertionError()
-    assert str(__file__) in str(exc_info.value)
+    except ImageArchiveInvalidException as e:
+        assert isinstance(e.__cause__, tarfile.ReadError)
+        assert str(__file__) in str(e)
 
 
 def test_archived_image_manifest_raises_when_tar_missing_manifest(
@@ -72,10 +74,12 @@ def test_archived_image_manifest_raises_when_tar_missing_manifest(
 ) -> None:
     write_irrelevant_tar(tar_file_name)
 
-    with pytest.raises(ImageArchiveInvalidException) as exc_info:
+    try:
         archived_image_manifest(tar_file_name)
-    assert isinstance(exc_info.value.__cause__, KeyError)
+        raise AssertionError()
-    assert "manifest.json" in str(exc_info.value.__cause__)
+    except ImageArchiveInvalidException as e:
+        assert isinstance(e.__cause__, KeyError)
+        assert "manifest.json" in str(e.__cause__)
 
 
 def test_archived_image_manifest_raises_when_manifest_missing_id(
@@ -85,7 +89,9 @@ def test_archived_image_manifest_raises_when_manifest_missing_id(
 
     write_imitation_archive_with_manifest(tar_file_name, manifest)
 
-    with pytest.raises(ImageArchiveInvalidException) as exc_info:
+    try:
         archived_image_manifest(tar_file_name)
-    assert isinstance(exc_info.value.__cause__, KeyError)
+        raise AssertionError()
-    assert "Config" in str(exc_info.value.__cause__)
+    except ImageArchiveInvalidException as e:
+        assert isinstance(e.__cause__, KeyError)
+        assert "Config" in str(e.__cause__)

tests/unit/plugins/module_utils/test__util.py

@@ -17,12 +17,12 @@ from ansible_collections.community.docker.plugins.module_utils._util import (
 
 if t.TYPE_CHECKING:
 
-    class DAMSpec(t.TypedDict):  # pragma: no cover
+    class DAMSpec(t.TypedDict):
         av: dict[str, t.Any]
         bv: dict[str, t.Any]
         result: bool
 
-    class Spec(t.TypedDict):  # pragma: no cover
+    class Spec(t.TypedDict):
         a: t.Any
         b: t.Any
         method: t.Literal["strict", "ignore", "allow_more_present"]

tests/unit/plugins/modules/test_docker_image.py

@@ -21,13 +21,11 @@ from ..test_support.docker_image_archive_stubbing import (
 )
 
 if t.TYPE_CHECKING:
-    from collections.abc import Callable  # pragma: no cover
+    from collections.abc import Callable
 
 
 def assert_no_logging(msg: str) -> t.NoReturn:
-    raise AssertionError(
+    raise AssertionError(f"Should not have logged anything but logged {msg}")
-        f"Should not have logged anything but logged {msg}"
-    )  # pragma: no cover
 
 
 def capture_logging(messages: list[str]) -> Callable[[str], None]:

tests/unit/plugins/modules/test_docker_swarm_service.py

@@ -12,8 +12,7 @@ from ansible_collections.community.docker.plugins.modules import (
     docker_swarm_service,
 )
 
-docker_errors = pytest.importorskip("docker.errors")
+APIError = pytest.importorskip("docker.errors.APIError")
-APIError = docker_errors.APIError
 
 
 def test_retry_on_out_of_sequence_error(mocker: t.Any) -> None:

tests/utils/shippable/nox-prepare.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-set -o pipefail -eux
-
-nox_session="$1"
-
-docker images ansible/ansible
-docker images quay.io/ansible/*
-docker ps
-
-for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v -e '^drydock/' -e '^quay.io/ansible/azure-pipelines-test-container:' | sed 's/^.* //'); do
-    docker rm -f "${container}" || true  # ignore errors
-done
-
-docker ps
-command -v python
-python -V
-
-function retry
-{
-    # shellcheck disable=SC2034
-    for repetition in 1 2 3; do
-        set +e
-        "$@"
-        result=$?
-        set -e
-        if [ ${result} == 0 ]; then
-            return ${result}
-        fi
-        echo "@* -> ${result}"
-    done
-    echo "Command '@*' failed 3 times!"
-    exit 255
-}
-
-command -v pip
-pip --version
-pip list --disable-pip-version-check
-retry pip install https://github.com/ansible-community/antsibull-nox/archive/main.tar.gz --disable-pip-version-check
-
-export PYTHONIOENCODING='utf-8'
-
-export FORCE_COLOR=1
-export ANTSIBULL_NOX_IGNORE_INSTALLED_COLLECTIONS="true"
-
-if [ "${nox_session}" == "extra-sanity-tests" ]; then
-    nox --verbose --install-only
-else
-    nox --verbose --install-only -e "${nox_session}"
-fi

tests/utils/shippable/nox.sh

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-set -o pipefail -eux
-
-nox_session="$1"
-
-export PYTHONIOENCODING='utf-8'
-
-if [ -n "${COVERAGE:-}" ]; then
-    # on-demand coverage reporting triggered by setting the COVERAGE environment variable to a non-empty value
-    export COVERAGE="--coverage"
-elif [[ "${COMMIT_MESSAGE}" =~ ci_coverage ]]; then
-    # on-demand coverage reporting triggered by having 'ci_coverage' in the latest commit message
-    export COVERAGE="--coverage"
-else
-    # on-demand coverage reporting disabled (default behavior, always-on coverage reporting remains enabled)
-    export COVERAGE="--coverage-check"
-fi
-
-if [ -n "${COMPLETE:-}" ]; then
-    # disable change detection triggered by setting the COMPLETE environment variable to a non-empty value
-    export ANTSIBULL_CHANGE_DETECTION=""
-elif [[ "${COMMIT_MESSAGE}" =~ ci_complete ]]; then
-    # disable change detection triggered by having 'ci_complete' in the latest commit message
-    export ANTSIBULL_CHANGE_DETECTION=""
-elif [ "${IS_PULL_REQUEST:-}" == "true" ]; then
-    # enable change detection for PRs (default behavior)
-    export ANTSIBULL_CHANGE_DETECTION="true"
-    export ANTSIBULL_BASE_BRANCH="${SYSTEM_PULLREQUEST_TARGETBRANCH}"
-    # Create a branch for the current HEAD, which happens to be a merge commit
-    git checkout -b "pull-request-branch"
-    # Name the target branch
-    git branch "${SYSTEM_PULLREQUEST_TARGETBRANCH}" --track "origin/${SYSTEM_PULLREQUEST_TARGETBRANCH}"
-    # Show branches
-    git branch -vv
-else
-    # disable change detection for pushes and scheduled runs
-    export ANTSIBULL_CHANGE_DETECTION=""
-fi
-
-if [[ "${COVERAGE:-}" == "--coverage" ]]; then
-    export ANTSIBULL_NOX_TIMEOUT=60
-else
-    export ANTSIBULL_NOX_TIMEOUT=50
-fi
-
-if [ "${IS_PULL_REQUEST:-}" == "true" ]; then
-    export ANTSIBULL_NOX_INTEGRATION_ALLOW_UNSTABLE_CHANGED="true"
-fi
-
-export FORCE_COLOR=1
-export ANTSIBULL_NOX_IGNORE_INSTALLED_COLLECTIONS="true"
-export ANTSIBULL_NOX_COVERAGE_DESTINATION="${COVERAGE_DESTINATION_DIRECTORY}"
-export ANTSIBULL_NOX_COVERAGE_ANALYSIS_FILE="${COVERAGE_DESTINATION_DIRECTORY}/coverage-analyze-targets.json"
-export ANTSIBULL_NOX_COVERAGE_NO_XML="true"
-
-if [ "${nox_session}" == "extra-sanity-tests" ]; then
-    nox --reuse-existing-virtualenvs --no-install
-else
-    nox --reuse-existing-virtualenvs --no-install -e "${nox_session}" -- ${COVERAGE}
-fi