sts-sponsors team mailing list archive

[Adam Collard <mp+437152@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/system-tests:eatmydata into ~maas-committers/maas-ci/+git/system-tests:master.

Commit message:
[ansible-tests] Use eatmydata to speed up configuration of ansible-main


Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/system-tests/+merge/437152
-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/system-tests:eatmydata into ~maas-committers/maas-ci/+git/system-tests:master.

diff --git a/systemtests/ansible.py b/systemtests/ansible.py
index 87b8ad7..8db10f9 100644
--- a/systemtests/ansible.py
+++ b/systemtests/ansible.py
@@ -60,15 +60,21 @@ def apt_update(
     instance: Instance, environment: Optional[dict[str, str]] = None
 ) -> None:
     """Update APT indices, fix broken dpkg."""
-    instance.quietly_execute(["apt-get", "update", "-y"], environment=environment)
-    instance.quietly_execute(["dpkg", "--configure", "-a"], environment=environment)
+    instance.quietly_execute(
+        ["eatmydata", "apt-get", "update", "-y"], environment=environment
+    )
+    instance.quietly_execute(
+        ["eatmydata", "dpkg", "--configure", "-a"], environment=environment
+    )
 
 
 def apt_install(
     instance: Instance, package: str, environment: Optional[dict[str, str]] = None
 ) -> None:
     """Install given package from apt."""
-    instance.quietly_execute(["apt", "install", package, "-y"], environment=environment)
+    instance.quietly_execute(
+        ["eatmydata", "apt", "install", package, "-y"], environment=environment
+    )
 
 
 def pip_install(
@@ -76,10 +82,13 @@ def pip_install(
 ) -> None:
     """Ensure latest version of Python package is installed."""
     if not pip_package_exists(instance, package):
-        instance.quietly_execute(["pip3", "install", package], environment=environment)
+        instance.quietly_execute(
+            ["eatmydata", "pip3", "install", package], environment=environment
+        )
     else:
         instance.quietly_execute(
-            ["pip3", "install", package, "--upgrade"], environment=environment
+            ["eatmydata", "pip3", "install", package, "--upgrade"],
+            environment=environment,
         )
 
 
@@ -103,6 +112,7 @@ def clone_repo(
     if not clone_file.exists():
         instance.execute(
             [
+                "eatmydata",
                 "git",
                 "clone",
                 "-b",
@@ -523,6 +533,7 @@ class AnsibleMain:
     def run_playbook(self, playbook: str = "site.yaml", debug: str = "-v") -> None:
         self.create_hosts_file()
         cmd: list[str] = [
+            "eatmydata",
             "ansible-playbook",
             f"{self.ansible_repo_path}/{playbook}",
             "-i",