Merge ~adam-collard/maas-ci/+git/system-tests:proxy-env-for-ansible into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

[ansible-tests] Add proxy support

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 2f9a556bc794d00bd22cf23093b83404af1eb0a6

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 3bffcd81b25a420af3bea52b017f05cc57e0c014

review: Approve

968c895... by Adam Collard on 2023-02-10

[ansible-playbook-tests] pass proxy as an extravar

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/system-tests-tester/416/consoleText
COMMIT: 1745597e7bc9b71ddeee888266ab06b95ca7ae79

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/system-tests-tester/417/consoleText
COMMIT: 968c89585c32fc9af80923947a04b6afa002671f

review: Needs Fixing

25414bd... by Adam Collard on 2023-02-10

[ansible-tests] Show tip of ansible-playbooks branch

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/system-tests-tester/418/consoleText
COMMIT: 3bba6f6f75e088e040c3b01789910863333c30b3

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 25414bd796c7ac82f78a45b893660bc8cf3a3272

review: Approve

1addfb4... by Adam Collard on 2023-02-10

[ansible-tests] Set proxy_env as base config to reset back to

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 1addfb4c32b21ae3be88708dac976d81d5fc7659

review: Approve

71c9c20... by Adam Collard on 2023-02-10

[ansible-tests] Bump timeout to 10m

[MAAS Lander (maas-lander)]

UNIT TESTS
-b proxy-env-for-ansible lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 71c9c20d2ed5fa398fe3b9728321536ecfeb3879

review: Approve

[Jack Lloyd-Walters (lloydwaltersj)]

LGTM, +1

review: Approve

diff --git a/systemtests/ansible.py b/systemtests/ansible.py
index 2ca5b40..87b8ad7 100644
--- a/systemtests/ansible.py
+++ b/systemtests/ansible.py
@@ -7,7 +7,7 @@ from datetime import timedelta
 from functools import cached_property
 from logging import getLogger
 from subprocess import CalledProcessError
-from typing import TYPE_CHECKING, Any, Iterator
+from typing import TYPE_CHECKING, Any, Iterator, Optional
 
 from retry import retry
 
@@ -56,23 +56,31 @@ def add_ansible_header(headers: list[str], config: dict[str, Any]) -> None:
         headers.append("ansible-playbooks: true")
 
 
-def apt_update(instance: Instance) -> None:
+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"])
-    instance.quietly_execute(["dpkg", "--configure", "-a"])
+    instance.quietly_execute(["apt-get", "update", "-y"], environment=environment)
+    instance.quietly_execute(["dpkg", "--configure", "-a"], environment=environment)
 
 
-def apt_install(instance: Instance, package: str) -> None:
+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"])
+    instance.quietly_execute(["apt", "install", package, "-y"], environment=environment)
 
 
-def pip_install(instance: Instance, package: str) -> None:
+def pip_install(
+    instance: Instance, package: str, environment: Optional[dict[str, str]] = None
+) -> None:
     """Ensure latest version of Python package is installed."""
     if not pip_package_exists(instance, package):
-        instance.quietly_execute(["pip3", "install", package])
+        instance.quietly_execute(["pip3", "install", package], environment=environment)
     else:
-        instance.quietly_execute(["pip3", "install", package, "--upgrade"])
+        instance.quietly_execute(
+            ["pip3", "install", package, "--upgrade"], environment=environment
+        )
 
 
 def pip_package_exists(instance: Instance, package: str) -> bool:
@@ -84,7 +92,13 @@ def pip_package_exists(instance: Instance, package: str) -> bool:
         return True
 
 
-def clone_repo(instance: Instance, repo: str, branch: str, clone_path: str) -> None:
+def clone_repo(
+    instance: Instance,
+    repo: str,
+    branch: str,
+    clone_path: str,
+    environment: Optional[dict[str, str]] = None,
+) -> None:
     clone_file = instance.files[clone_path]
     if not clone_file.exists():
         instance.execute(
@@ -98,7 +112,9 @@ def clone_repo(instance: Instance, repo: str, branch: str, clone_path: str) -> N
                 repo,
                 clone_path,
             ],
+            environment=environment,
         )
+        instance.execute(["git", "-C", clone_path, "show", "-q"])
         instance.logger.info(f"Cloned {branch} from {repo} to {clone_path}")
 
 
@@ -157,14 +173,6 @@ class AnsibleHost:
             raise MissingRoleOnHost(role)
         self.roles[role].pop(config_key)
 
-    def clear_config(self, role: str = "") -> None:
-        if not role:
-            self.config.clear()
-            return
-        if role not in self.roles.keys():
-            raise MissingRoleOnHost(role)
-        self.roles[role].clear()
-
     def host_setup(self, main_cfg: dict[str, str], role: str = "") -> str:
         cfg = [self.ip]
         cfg_dict = main_cfg.copy()
@@ -256,7 +264,7 @@ class AnsibleHost:
 
 class AnsibleMain:
     use_timeout = True
-    timeout = timedelta(minutes=5)
+    timeout = timedelta(minutes=10)
     ssh_key_file = "/home/ubuntu/.ssh/id_rsa.pub"
 
     def __init__(
@@ -265,31 +273,35 @@ class AnsibleMain:
         instance: Instance,
         playbooks_repo: str,
         playbooks_branch: str,
+        proxy_env: Optional[dict[str, str]],
     ) -> None:
         self._lxd = lxd
         self.instance = instance
         self._playbooks_repo = playbooks_repo
         self._playbooks_branch = playbooks_branch
+        self._proxy_env = proxy_env
         self._hosts_file = self.instance.files["/home/ubuntu/hosts"]
 
-        self.config: dict[str, str] = {}
+        self._base_config = self._proxy_env if self._proxy_env else {}
+        self.config: dict[str, str] = self._base_config.copy()
         self._inventory_: set[AnsibleHost] = set()
 
         self.ansible_repo_path = "/home/ubuntu/ansible_repo"
 
     def setup(self) -> None:
         self.logger.info("Installing python3-pip")
-        apt_update(self.instance)
-        apt_install(self.instance, "python3-pip")
+        apt_update(self.instance, environment=self._proxy_env)
+        apt_install(self.instance, "python3-pip", environment=self._proxy_env)
         self.logger.info("Installing ansible")
-        pip_install(self.instance, "ansible")
+        pip_install(self.instance, "ansible", environment=self._proxy_env)
         self.logger.info("Installing netaddr")
-        pip_install(self.instance, "netaddr")
+        pip_install(self.instance, "netaddr", environment=self._proxy_env)
         clone_repo(
             self.instance,
             self._playbooks_repo,
             self._playbooks_branch,
             self.ansible_repo_path,
+            environment=self._proxy_env,
         )
 
         self.create_config_file()
@@ -388,7 +400,7 @@ class AnsibleMain:
             yield hosts
         finally:
             self.remove_hosts(hosts)
-            self.clear_config()
+            self.reset_config()
 
     def _make_host_name_(self) -> str:
         """Determine the smallest number not yet used as a name"""
@@ -428,8 +440,8 @@ class AnsibleMain:
     def remove_config(self, config_key: str) -> None:
         self.config.pop(config_key)
 
-    def clear_config(self) -> None:
-        self.config.clear()
+    def reset_config(self) -> None:
+        self.config = self._base_config.copy()
 
     def fetch_region(
         self, host: AnsibleHost, user: str = "admin"
@@ -520,4 +532,4 @@ class AnsibleMain:
         ]
         if _debug := re.match(r"-(v)+", debug):
             cmd.append(str(_debug.group()))
-        self.instance.execute(cmd)
+        self.instance.execute(cmd, environment=self._proxy_env)
diff --git a/systemtests/fixtures.py b/systemtests/fixtures.py
index e552fed..1052736 100644
--- a/systemtests/fixtures.py
+++ b/systemtests/fixtures.py
@@ -50,11 +50,13 @@ def ansible_main(config: dict[str, Any]) -> Optional[Iterator[AnsibleMain]]:
     lxd = get_lxd(log)
     instance = Instance(lxd, "ansible-main")
     instance.create_container(config["containers-image"])
+    proxy_env = get_proxy_env(config.get("proxy", {}))
     main = AnsibleMain(
         lxd,
         instance,
         playbooks_repo=playbooks_repo,
         playbooks_branch=playbooks_branch,
+        proxy_env=proxy_env,
     )
     main.setup()
     yield main
@@ -110,6 +112,24 @@ def build_container(config: dict[str, Any]) -> Optional[Iterator[Instance]]:
     yield instance
 
 
+# TODO: Move to property of LXD, and expose on Instance
+def get_proxy_env(
+    proxy_config: dict[str, str], no_proxy: Optional[str] = None
+) -> Optional[dict[str, str]]:
+    """Get proxy related environment variables from config.yaml"""
+    http_proxy = proxy_config.get("http", "")
+    if http_proxy:
+        proxy_env = {
+            "http_proxy": http_proxy,
+            "https_proxy": http_proxy,
+        }
+        if no_proxy:
+            proxy_env["no_proxy"] = no_proxy
+        return proxy_env
+    else:
+        return None
+
+
 @pytest.fixture(scope="session")
 def maas_deb_repo(
     build_container: Optional[Instance], config: dict[str, Any]
@@ -120,17 +140,7 @@ def maas_deb_repo(
     else:
         build_container.logger = getLogger(f"{LOG_NAME}.maas_deb_repo")
         build_ip = build_container.get_ip_address()
-        http_proxy = config.get("proxy", {}).get("http", "")
-        proxy_env: Optional[dict[str, str]]
-        if http_proxy:
-            proxy_env = {
-                "http_proxy": http_proxy,
-                "https_proxy": http_proxy,
-                "no_proxy": build_ip,
-            }
-        else:
-            proxy_env = None
-
+        proxy_env = get_proxy_env(config.get("proxy", {}), no_proxy=build_ip)
         if not build_container.files["/var/www/html/repo/Packages.gz"].exists():
             maas_ppas = config.get("deb", {}).get(
                 "ppa", ["ppa:maas-committers/latest-deps"]