Merge ~adam-collard/maas-ci/+git/system-tests:eatmydata into ~maas-committers/maas-ci/+git/system-tests:master

Proposed by Adam Collard
Status: Merged
Merged at revision: f78c0703829d3ffd7e6c318365904c0665c3211f
Proposed branch: ~adam-collard/maas-ci/+git/system-tests:eatmydata
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 61 lines (+16/-5)
1 file modified
systemtests/ansible.py (+16/-5)
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
MAAS Lander Approve
Review via email: mp+437152@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b eatmydata lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: f78c0703829d3ffd7e6c318365904c0665c3211f

review: Approve
Revision history for this message
Adam Collard (adam-collard) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemtests/ansible.py b/systemtests/ansible.py
2index 87b8ad7..8db10f9 100644
3--- a/systemtests/ansible.py
4+++ b/systemtests/ansible.py
5@@ -60,15 +60,21 @@ def apt_update(
6 instance: Instance, environment: Optional[dict[str, str]] = None
7 ) -> None:
8 """Update APT indices, fix broken dpkg."""
9- instance.quietly_execute(["apt-get", "update", "-y"], environment=environment)
10- instance.quietly_execute(["dpkg", "--configure", "-a"], environment=environment)
11+ instance.quietly_execute(
12+ ["eatmydata", "apt-get", "update", "-y"], environment=environment
13+ )
14+ instance.quietly_execute(
15+ ["eatmydata", "dpkg", "--configure", "-a"], environment=environment
16+ )
17
18
19 def apt_install(
20 instance: Instance, package: str, environment: Optional[dict[str, str]] = None
21 ) -> None:
22 """Install given package from apt."""
23- instance.quietly_execute(["apt", "install", package, "-y"], environment=environment)
24+ instance.quietly_execute(
25+ ["eatmydata", "apt", "install", package, "-y"], environment=environment
26+ )
27
28
29 def pip_install(
30@@ -76,10 +82,13 @@ def pip_install(
31 ) -> None:
32 """Ensure latest version of Python package is installed."""
33 if not pip_package_exists(instance, package):
34- instance.quietly_execute(["pip3", "install", package], environment=environment)
35+ instance.quietly_execute(
36+ ["eatmydata", "pip3", "install", package], environment=environment
37+ )
38 else:
39 instance.quietly_execute(
40- ["pip3", "install", package, "--upgrade"], environment=environment
41+ ["eatmydata", "pip3", "install", package, "--upgrade"],
42+ environment=environment,
43 )
44
45
46@@ -103,6 +112,7 @@ def clone_repo(
47 if not clone_file.exists():
48 instance.execute(
49 [
50+ "eatmydata",
51 "git",
52 "clone",
53 "-b",
54@@ -523,6 +533,7 @@ class AnsibleMain:
55 def run_playbook(self, playbook: str = "site.yaml", debug: str = "-v") -> None:
56 self.create_hosts_file()
57 cmd: list[str] = [
58+ "eatmydata",
59 "ansible-playbook",
60 f"{self.ansible_repo_path}/{playbook}",
61 "-i",

Subscribers

People subscribed via source and target branches

to all changes: