update ansible collections sops, docker and debops

2026-09-21 22:26:20 +02:00 · 2026-09-21 22:26:20 +02:00 · e31ee5e39c
commit e31ee5e39c
parent f1135b818f
910 changed files with 27667 additions and 19786 deletions
--- a/ansible_collections/community/docker/.azure-pipelines/azure-pipelines.yml
+++ b/ansible_collections/community/docker/.azure-pipelines/azure-pipelines.yml
@ -37,244 +37,116 @@ variables:
  - name: coverageBranches
    value: main
  - name: entryPoint
-    value: tests/utils/shippable/shippable.sh
+    value: tests/utils/shippable/nox.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:7.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:8.0.0

 pool: Standard

 stages:
-
-### Sanity & units
-  - stage: Ansible_devel
-    displayName: Sanity & Units devel
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: 'devel/sanity/1'
-            - name: Units
-              test: 'devel/units/1'
-  - stage: Ansible_2_20
-    displayName: Sanity & Units 2.20
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.20/sanity/1'
-            - name: Units
-              test: '2.20/units/1'
-  - stage: Ansible_2_19
-    displayName: Sanity & Units 2.19
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        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'
-
-### Docker
-  - stage: Docker_devel
-    displayName: Docker devel
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/linux/{0}
-          targets:
-            - name: Fedora 42
-              test: fedora42
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-            - name: Ubuntu 24.04
-              test: ubuntu2404
-            - name: Alpine 3.22
-              test: alpine322
-          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.13
-          groups:
-            - 4
-            - 5
-
-### Remote
-  - stage: Remote_devel
-    displayName: Remote devel
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/{0}
-          targets:
-            - name: RHEL 10.0
-              test: rhel/10.0
-            - name: RHEL 9.6 with Docker SDK, urllib3, requests from sources
-              test: rhel/9.6-dev-latest
-            # For some reason, Ubuntu 24.04 is *extremely* slower than RHEL 9.6
-            # - name: Ubuntu 24.04
-            #   test: ubuntu/24.04
-          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.6
-              test: rhel/9.6
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
-  - stage: Remote_2_19
+  - stage: remote_2_19
    displayName: Remote 2.19
    dependsOn: []
+    variables:
+      entryPoint: tests/utils/shippable/nox.sh
    jobs:
      - template: templates/matrix.yml
        parameters:
-          testFormat: 2.19/{0}
          targets:
-            - name: RHEL 9.5
-              test: rhel/9.5
-            - 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.4
-              test: rhel/9.4
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
+            - name: Ubuntu 22.04 + group 1
+              test: ansible-test-integration-2.19-ubuntu-22.04-azp-1
+            - name: Ubuntu 22.04 + group 2
+              test: ansible-test-integration-2.19-ubuntu-22.04-azp-2
+            - name: Ubuntu 22.04 + group 3
+              test: ansible-test-integration-2.19-ubuntu-22.04-azp-3
+            - 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

-  ## Finally
+  - 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
+              test: ansible-test-integration-2.20-rhel-9.7-azp-1
+            - name: RHEL 9.7 + group 2
+              test: ansible-test-integration-2.20-rhel-9.7-azp-2
+            - name: RHEL 9.7 + group 3
+              test: ansible-test-integration-2.20-rhel-9.7-azp-3
+            - 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
+              test: ansible-test-integration-2.21-rhel-10.1-azp-1
+            - name: RHEL 10.1 + group 2
+              test: ansible-test-integration-2.21-rhel-10.1-azp-2
+            - name: RHEL 10.1 + group 3
+              test: ansible-test-integration-2.21-rhel-10.1-azp-3
+            - name: RHEL 10.1 + group 4
+              test: ansible-test-integration-2.21-rhel-10.1-azp-4
+            - name: RHEL 10.1 + group 5
+              test: ansible-test-integration-2.21-rhel-10.1-azp-5
+
+  - stage: remote_devel
+    displayName: Remote devel
+    dependsOn: []
+    variables:
+      entryPoint: tests/utils/shippable/nox.sh
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          targets:
+            - name: RHEL 10.2 + group 1 + sdk-dev-latest
+              test: ansible-test-integration-devel-rhel-10.2-azp-1
+            - name: RHEL 10.2 + group 2 + sdk-dev-latest
+              test: ansible-test-integration-devel-rhel-10.2-azp-2
+            - name: RHEL 10.2 + group 3 + sdk-dev-latest
+              test: ansible-test-integration-devel-rhel-10.2-azp-3
+            - name: RHEL 10.2 + group 4 + sdk-dev-latest
+              test: ansible-test-integration-devel-rhel-10.2-azp-4
+            - name: RHEL 10.2 + group 5 + sdk-dev-latest
+              test: ansible-test-integration-devel-rhel-10.2-azp-5
+            - name: RHEL 9.8 + group 1
+              test: ansible-test-integration-devel-rhel-9.8-azp-1
+            - name: RHEL 9.8 + group 2
+              test: ansible-test-integration-devel-rhel-9.8-azp-2
+            - name: RHEL 9.8 + group 3
+              test: ansible-test-integration-devel-rhel-9.8-azp-3
+            - name: RHEL 9.8 + group 4
+              test: ansible-test-integration-devel-rhel-9.8-azp-4
+            - name: RHEL 9.8 + group 5
+              test: ansible-test-integration-devel-rhel-9.8-azp-5

  - stage: Summary
    condition: succeededOrFailed()
    dependsOn:
-      - Ansible_devel
-      - Ansible_2_20
-      - Ansible_2_19
-      - Ansible_2_18
-      - Remote_devel
-      - Remote_2_20
-      - Remote_2_19
-      - Remote_2_18
-      - Docker_devel
-      - Docker_2_20
-      - Docker_2_19
-      - Docker_2_18
-      - Docker_community_devel
+      - remote_2_19
+      - remote_2_20
+      - remote_2_21
+      - remote_devel
    jobs:
      - template: templates/coverage.yml
--- a/ansible_collections/community/docker/.azure-pipelines/scripts/aggregate-coverage.sh
+++ b/ansible_collections/community/docker/.azure-pipelines/scripts/aggregate-coverage.sh
@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-# Aggregate code coverage results for later processing.
-
 # 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

+# Aggregate code coverage results for later processing.
+
 set -o pipefail -eu

 agent_temp_directory="$1"
@ -13,10 +13,6 @@ PATH="${PWD}/bin:${PATH}"

 mkdir "${agent_temp_directory}/coverage/"

-if [[ "$(ansible --version)" =~ \ 2\.9\. ]]; then
-    exit
-fi
-
 options=(--venv --venv-system-site-packages --color -v)

 ansible-test coverage combine --group-by command --export "${agent_temp_directory}/coverage/" "${options[@]}"
--- a/ansible_collections/community/docker/.azure-pipelines/scripts/combine-coverage.py
+++ b/ansible_collections/community/docker/.azure-pipelines/scripts/combine-coverage.py
@ -11,8 +11,7 @@ Keep in mind that Azure Pipelines does not enforce unique job display names (onl
 It is up to pipeline authors to avoid name collisions when deviating from the recommended format.
 """

-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations

 import os
 import re
@ -24,12 +23,12 @@ def main():
    """Main program entry point."""
    source_directory = sys.argv[1]

-    if '/ansible_collections/' in os.getcwd():
+    if "/ansible_collections/" in os.getcwd():
        output_path = "tests/output"
    else:
        output_path = "test/results"

-    destination_directory = os.path.join(output_path, 'coverage')
+    destination_directory = os.path.join(output_path, "coverage")

    if not os.path.exists(destination_directory):
        os.makedirs(destination_directory)
@ -38,27 +37,27 @@ def main():
    count = 0

    for name in os.listdir(source_directory):
-        match = re.search('^Coverage (?P<attempt>[0-9]+) (?P<label>.+)$', name)
-        label = match.group('label')
-        attempt = int(match.group('attempt'))
+        match = re.search("^Coverage (?P<attempt>[0-9]+) (?P<label>.+)$", name)
+        label = match.group("label")
+        attempt = int(match.group("attempt"))
        jobs[label] = max(attempt, jobs.get(label, 0))

    for label, attempt in jobs.items():
-        name = 'Coverage {attempt} {label}'.format(label=label, attempt=attempt)
+        name = f"Coverage {attempt} {label}"
        source = os.path.join(source_directory, name)
        source_files = os.listdir(source)

        for source_file in source_files:
            source_path = os.path.join(source, source_file)
-            destination_path = os.path.join(destination_directory, source_file + '.' + label)
-            print('"%s" -> "%s"' % (source_path, destination_path))
+            destination_path = os.path.join(destination_directory, source_file + "." + label)
+            print(f'"{source_path}" -> "{destination_path}"')
            shutil.copyfile(source_path, destination_path)
            count += 1

-    print('Coverage file count: %d' % count)
-    print('##vso[task.setVariable variable=coverageFileCount]%d' % count)
-    print('##vso[task.setVariable variable=outputPath]%s' % output_path)
+    print(f"Coverage file count: {count}")
+    print(f"##vso[task.setVariable variable=coverageFileCount]{count}")
+    print(f"##vso[task.setVariable variable=outputPath]{output_path}")


-if __name__ == '__main__':
+if __name__ == "__main__":
    main()
--- a/ansible_collections/community/docker/.azure-pipelines/scripts/process-results.sh
+++ b/ansible_collections/community/docker/.azure-pipelines/scripts/process-results.sh
@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-# Check the test results and set variables for use in later steps.
-
 # 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

+# Check the test results and set variables for use in later steps.
+
 set -o pipefail -eu

 if [[ "$PWD" =~ /ansible_collections/ ]]; then
--- a/ansible_collections/community/docker/.azure-pipelines/scripts/publish-codecov.py
+++ b/ansible_collections/community/docker/.azure-pipelines/scripts/publish-codecov.py
@ -15,7 +15,6 @@ import pathlib
 import shutil
 import subprocess
 import tempfile
-import typing as t
 import urllib.request


@ -23,7 +22,7 @@ import urllib.request
 class CoverageFile:
    name: str
    path: pathlib.Path
-    flags: t.List[str]
+    flags: list[str]


@dataclasses.dataclass(frozen=True)
@ -34,8 +33,8 @@ class Args:

 def parse_args() -> Args:
    parser = argparse.ArgumentParser()
-    parser.add_argument('-n', '--dry-run', action='store_true')
-    parser.add_argument('path', type=pathlib.Path)
+    parser.add_argument("-n", "--dry-run", action="store_true")
+    parser.add_argument("path", type=pathlib.Path)

    args = parser.parse_args()

@ -46,32 +45,36 @@ def parse_args() -> Args:
    return Args(**kwargs)


-def process_files(directory: pathlib.Path) -> t.Tuple[CoverageFile, ...]:
+def process_files(directory: pathlib.Path) -> tuple[CoverageFile, ...]:
    processed = []
-    for file in directory.joinpath('reports').glob('coverage*.xml'):
-        name = file.stem.replace('coverage=', '')
+    for file in directory.joinpath("reports").glob("coverage*.xml"):
+        name = file.stem.replace("coverage=", "")

        # Get flags from name
-        flags = name.replace('-powershell', '').split('=')  # Drop '-powershell' suffix
-        flags = [flag if not flag.startswith('stub') else flag.split('-')[0] for flag in flags]  # Remove "-01" from stub files
+        flags = name.replace("-powershell", "").split("=")  # Drop '-powershell' suffix
+        flags = [
+            flag if not flag.startswith("stub") else flag.split("-")[0] for flag in flags
+        ]  # Remove "-01" from stub files

        processed.append(CoverageFile(name, file, flags))

    return tuple(processed)


-def upload_files(codecov_bin: pathlib.Path, files: t.Tuple[CoverageFile, ...], dry_run: bool = False) -> None:
+def upload_files(codecov_bin: pathlib.Path, files: tuple[CoverageFile, ...], dry_run: bool = False) -> None:
    for file in files:
        cmd = [
            str(codecov_bin),
-            '--name', file.name,
-            '--file', str(file.path),
+            "--name",
+            file.name,
+            "--file",
+            str(file.path),
        ]
        for flag in file.flags:
-            cmd.extend(['--flags', flag])
+            cmd.extend(["--flags", flag])

        if dry_run:
-            print(f'DRY-RUN: Would run command: {cmd}')
+            print(f"DRY-RUN: Would run command: {cmd}")
            continue

        subprocess.run(cmd, check=True)
@ -79,11 +82,11 @@ def upload_files(codecov_bin: pathlib.Path, files: t.Tuple[CoverageFile, ...], d

 def download_file(url: str, dest: pathlib.Path, flags: int, dry_run: bool = False) -> None:
    if dry_run:
-        print(f'DRY-RUN: Would download {url} to {dest} and set mode to {flags:o}')
+        print(f"DRY-RUN: Would download {url} to {dest} and set mode to {flags:o}")
        return

    with urllib.request.urlopen(url) as resp:
-        with dest.open('w+b') as f:
+        with dest.open("w+b") as f:
            # Read data in chunks rather than all at once
            shutil.copyfileobj(resp, f, 64 * 1024)

@ -92,14 +95,14 @@ def download_file(url: str, dest: pathlib.Path, flags: int, dry_run: bool = Fals

 def main():
    args = parse_args()
-    url = 'https://ansible-ci-files.s3.amazonaws.com/codecov/linux/codecov'
-    with tempfile.TemporaryDirectory(prefix='codecov-') as tmpdir:
-        codecov_bin = pathlib.Path(tmpdir) / 'codecov'
+    url = "https://ansible-ci-files.s3.amazonaws.com/codecov/linux/codecov"
+    with tempfile.TemporaryDirectory(prefix="codecov-") as tmpdir:
+        codecov_bin = pathlib.Path(tmpdir) / "codecov"
        download_file(url, codecov_bin, 0o755, args.dry_run)

        files = process_files(args.path)
        upload_files(codecov_bin, files, args.dry_run)


-if __name__ == '__main__':
+if __name__ == "__main__":
    main()
--- a/ansible_collections/community/docker/.azure-pipelines/scripts/report-coverage.sh
+++ b/ansible_collections/community/docker/.azure-pipelines/scripts/report-coverage.sh
@ -1,18 +1,14 @@
 #!/usr/bin/env bash
-# Generate code coverage reports for uploading to Azure Pipelines and codecov.io.
-
 # 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

+# Generate code coverage reports for uploading to Azure Pipelines and codecov.io.
+
 set -o pipefail -eu

 PATH="${PWD}/bin:${PATH}"

-if [[ "$(ansible --version)" =~ \ 2\.9\. ]]; then
-    exit
-fi
-
 if ! ansible-test --help >/dev/null 2>&1; then
    # Install the devel version of ansible-test for generating code coverage reports.
    # This is only used by Ansible Collections, which are typically tested against multiple Ansible versions (in separate jobs).
--- a/ansible_collections/community/docker/.azure-pipelines/scripts/run-tests.sh
+++ b/ansible_collections/community/docker/.azure-pipelines/scripts/run-tests.sh
@ -1,20 +1,22 @@
 #!/usr/bin/env bash
-# Configure the test environment and run the tests.
-
 # 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

+# Configure the test environment and run the tests.
+
 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
--- a/ansible_collections/community/docker/.azure-pipelines/scripts/time-command.py
+++ b/ansible_collections/community/docker/.azure-pipelines/scripts/time-command.py
@ -5,8 +5,7 @@

 """Prepends a relative timestamp to each input line from stdin and writes it to stdout."""

-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations

 import sys
 import time
@ -16,14 +15,14 @@ def main():
    """Main program entry point."""
    start = time.time()

-    sys.stdin.reconfigure(errors='surrogateescape')
-    sys.stdout.reconfigure(errors='surrogateescape')
+    sys.stdin.reconfigure(errors="surrogateescape")
+    sys.stdout.reconfigure(errors="surrogateescape")

    for line in sys.stdin:
-        seconds = time.time() - start
-        sys.stdout.write('%02d:%02d %s' % (seconds // 60, seconds % 60, line))
+        seconds = int(time.time() - start)
+        sys.stdout.write(f"{seconds // 60:02}:{seconds % 60:02} {line}")
        sys.stdout.flush()


-if __name__ == '__main__':
+if __name__ == "__main__":
    main()
--- a/ansible_collections/community/docker/.azure-pipelines/templates/test.yml
+++ b/ansible_collections/community/docker/.azure-pipelines/templates/test.yml
@ -23,14 +23,16 @@ jobs:
          - checkout: self
            fetchDepth: $(fetchDepth)
            path: $(checkoutPath)
-          - bash: .azure-pipelines/scripts/run-tests.sh "$(entryPoint)" "${{ job.test }}" "$(coverageBranches)"
+          - bash: .azure-pipelines/scripts/run-tests.sh "$(prepareEntryPoint)" "${{ job.test }}" "$(coverageBranches)" "$(Agent.TempDirectory)"
+            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)"
-            condition: eq(variables.haveCoverageData, 'true')
-            displayName: Aggregate Coverage Data
+          # - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)"
+          #   condition: eq(variables.haveCoverageData, 'true')
+          #   displayName: Aggregate Coverage Data
          - task: PublishTestResults@2
            condition: eq(variables.haveTestResults, 'true')
            inputs: