ansible-core 2.19.0rc2__py3-none-any.whl → 2.19.1__py3-none-any.whl

ansible_test/_internal/metadata.py

@@ -22,6 +22,9 @@ from .diff import (
     FileDiff,
 )
 
+if t.TYPE_CHECKING:
+    from .debugging import DebuggerSettings
+
 
 class Metadata:
     """Metadata object for passing data to delegated tests."""
@@ -71,7 +74,7 @@ class Metadata:
             ansible_test_root=self.ansible_test_root,
             collection_root=self.collection_root,
             debugger_flags=dataclasses.asdict(self.debugger_flags),
-            debugger_settings=dataclasses.asdict(self.debugger_settings) if self.debugger_settings else None,
+            debugger_settings=self.debugger_settings.as_dict() if self.debugger_settings else None,
         )
 
     def to_file(self, path: str) -> None:
@@ -91,6 +94,8 @@ class Metadata:
     @staticmethod
     def from_dict(data: dict[str, t.Any]) -> Metadata:
         """Return metadata loaded from the specified dictionary."""
+        from .debugging import DebuggerSettings
+
         metadata = Metadata(
             debugger_flags=DebuggerFlags(**data['debugger_flags']),
         )
@@ -103,7 +108,7 @@ class Metadata:
         metadata.ansible_lib_root = data['ansible_lib_root']
         metadata.ansible_test_root = data['ansible_test_root']
         metadata.collection_root = data['collection_root']
-        metadata.debugger_settings = DebuggerSettings(**data['debugger_settings']) if data['debugger_settings'] else None
+        metadata.debugger_settings = DebuggerSettings.from_dict(data['debugger_settings']) if data['debugger_settings'] else None
         metadata.loaded = True
 
         return metadata
@@ -155,46 +160,6 @@ class ChangeDescription:
         return changes
 
 
-@dataclasses.dataclass(frozen=True, kw_only=True)
-class DebuggerSettings:
-    """Settings for remote debugging."""
-
-    module: str | None = None
-    """
-    The Python module to import.
-    This should be pydevd or a derivative.
-    If not provided it will be auto-detected.
-    """
-
-    package: str | None = None
-    """
-    The Python package to install for debugging.
-    If `None` then the package will be auto-detected.
-    If an empty string, then no package will be installed.
-    """
-
-    settrace: dict[str, object] = dataclasses.field(default_factory=dict)
-    """
-    Options to pass to the `{module}.settrace` method.
-    Used for running AnsiballZ modules only.
-    The `host` and `port` options will be provided by ansible-test.
-    The `suspend` option defaults to `False`.
-    """
-
-    args: list[str] = dataclasses.field(default_factory=list)
-    """
-    Arguments to pass to `pydevd` on the command line.
-    Used for running Ansible CLI programs only.
-    The `--client` and `--port` options will be provided by ansible-test.
-    """
-
-    port: int = 5678
-    """
-    The port on the origin host which is listening for incoming connections from pydevd.
-    SSH port forwarding will be automatically configured for non-local hosts to connect to this port as needed.
-    """
-
-
 @dataclasses.dataclass(frozen=True, kw_only=True)
 class DebuggerFlags:
     """Flags for enabling specific debugging features."""

ansible_test/_internal/python_requirements.py

@@ -170,11 +170,11 @@ def install_requirements(
 
     from .host_profiles import DebuggableProfile
 
-    if isinstance(host_profile, DebuggableProfile) and host_profile.debugging_enabled and args.metadata.debugger_settings.package:
+    if isinstance(host_profile, DebuggableProfile) and host_profile.debugger and host_profile.debugger.get_python_package():
         commands.append(PipInstall(
             requirements=[],
             constraints=[],
-            packages=[args.metadata.debugger_settings.package],
+            packages=[host_profile.debugger.get_python_package()],
         ))
 
     if not commands:

ansible_test/_util/controller/sanity/pylint/config/ansible-test.cfg

@@ -21,6 +21,7 @@ disable=
     broad-exception-raised,  # many exceptions with no need for a custom type
     too-few-public-methods,
     too-many-public-methods,
+    too-many-ancestors,
     too-many-arguments,
     too-many-branches,
     too-many-instance-attributes,

ansible_test/_util/target/setup/bootstrap.sh

@@ -2,6 +2,24 @@
 
 set -eu
 
+retry_init()
+{
+    attempt=0
+}
+
+retry_or_fail()
+{
+    attempt=$((attempt + 1))
+
+    if [ $attempt -gt 5 ]; then
+      echo "Failed to install packages. Giving up."
+      exit 1
+    fi
+
+    echo "Failed to install packages. Sleeping before trying again..."
+    sleep 10
+}
+
 remove_externally_managed_marker()
 {
     "${python_interpreter}" -c '
@@ -64,13 +82,13 @@ install_pip() {
                 ;;
         esac
 
+        retry_init
         while true; do
             curl --silent --show-error "${pip_bootstrap_url}" -o /tmp/get-pip.py && \
             "${python_interpreter}" /tmp/get-pip.py --disable-pip-version-check --quiet && \
             rm /tmp/get-pip.py \
             && break
-            echo "Failed to install packages. Sleeping before trying again..."
-            sleep 10
+            retry_or_fail
         done
     fi
 }
@@ -99,21 +117,21 @@ bootstrap_remote_alpine()
             "
     fi
 
+    retry_init
     while true; do
         # shellcheck disable=SC2086
         apk add -q ${packages} \
         && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
+        retry_or_fail
     done
 
     # Upgrade the `libexpat` package to ensure that an upgraded Python (`pyexpat`) continues to work.
+    retry_init
     while true; do
         # shellcheck disable=SC2086
         apk upgrade -q libexpat \
         && break
-        echo "Failed to upgrade libexpat. Sleeping before trying again..."
-        sleep 10
+        retry_or_fail
     done
 }
 
@@ -138,12 +156,12 @@ bootstrap_remote_fedora()
             "
     fi
 
+    retry_init
     while true; do
         # shellcheck disable=SC2086
         dnf install -q -y ${packages} \
         && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
+        retry_or_fail
     done
 }
 
@@ -169,6 +187,9 @@ bootstrap_remote_freebsd()
         # Declare platform/python version combinations which do not have supporting OS packages available.
         # For these combinations ansible-test will use pip to install the requirements instead.
         case "${platform_version}/${python_version}" in
+            13.5/3.11)
+                # defaults available
+                ;;
             14.2/3.11)
                 # defaults available
                 ;;
@@ -191,13 +212,13 @@ bootstrap_remote_freebsd()
             "
     fi
 
+    retry_init
     while true; do
         # shellcheck disable=SC2086
         env ASSUME_ALWAYS_YES=YES pkg bootstrap && \
         pkg install -q -y ${packages} \
         && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
+        retry_or_fail
     done
 
     install_pip
@@ -272,12 +293,12 @@ bootstrap_remote_rhel_9()
             "
     fi
 
+    retry_init
     while true; do
         # shellcheck disable=SC2086
         dnf install -q -y ${packages} \
         && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
+        retry_or_fail
     done
 }
 
@@ -302,12 +323,12 @@ bootstrap_remote_rhel_10()
             "
     fi
 
+    retry_init
     while true; do
         # shellcheck disable=SC2086
         dnf install -q -y ${packages} \
         && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
+        retry_or_fail
     done
 }
 
@@ -354,13 +375,13 @@ bootstrap_remote_ubuntu()
             "
     fi
 
+    retry_init
     while true; do
         # shellcheck disable=SC2086
         apt-get update -qq -y && \
         DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends ${packages} \
         && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
+        retry_or_fail
     done
 }