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

[Adam Collard]

Proxy configuration doesn't need to be complete

One should be able to configure the MAAS proxy without setting a proxy for the execution of tests

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 083eaa69c1a355d247d35d5de6acc1dd143618d3

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/systemtests/fixtures.py b/systemtests/fixtures.py
index 6e0760d..f97616b 100644
--- a/systemtests/fixtures.py
+++ b/systemtests/fixtures.py
@@ -38,8 +38,7 @@ def build_container(config: dict[str, Any]) -> Iterator[str]:
     else:
         cloud_config = {}
 
-        proxy_config = config.get("proxy", {})
-        http_proxy = proxy_config.get("http", "")
+        http_proxy = config.get("proxy", {}).get("http", "")
         if http_proxy:
             cloud_config["apt"] = {
                 "proxy": http_proxy,
@@ -63,6 +62,7 @@ def maas_deb_repo(
         yield None
     else:
         lxd = get_lxd(getLogger(f"{LOG_NAME}.maas_deb_repo"))
+        build_ip = lxd.get_ip_address(build_container)
         if not lxd.file_exists(build_container, "/var/www/html/repo/Packages.gz"):
             lxd.execute(
                 build_container,
@@ -116,18 +116,21 @@ def maas_deb_repo(
                 environment={"DEBIAN_FRONTEND": "noninteractive"},
             )
 
-            proxy: Optional[dict[str, str]]
-            if "proxy" in config:
-                proxy = {
-                    "http_proxy": config["proxy"]["http"],
-                    "https_proxy": config["proxy"]["http"],
-                    "no_proxy": lxd.get_ip_address(build_container),
+            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 = None
+                proxy_env = None
 
             lxd.execute(
-                build_container, ["make", "-C", "maas", "package"], environment=proxy
+                build_container,
+                ["make", "-C", "maas", "package"],
+                environment=proxy_env,
             )
             lxd.execute(
                 build_container,
@@ -138,7 +141,7 @@ def maas_deb_repo(
                 ],
             )
             lxd.execute(build_container, ["mv", "build-area", "/var/www/html/repo"])
-        yield f"http://{lxd.get_ip_address(build_container)}/repo"
+        yield f"http://{build_ip}/repo"
 
 
 def get_user_data(
@@ -213,10 +216,11 @@ def maas_container(config: dict[str, Any], build_container: str) -> Iterator[str
                     ]
                 },
             }
-            if "proxy" in config:
-                proxy = config["proxy"]["http"]
+            http_proxy = config.get("proxy", {}).get("http", "")
+            if http_proxy:
                 snap_proxy_cmd = (
-                    f'snap set system proxy.http="{proxy}" proxy.https="{proxy}"'
+                    f'snap set system proxy.http="{http_proxy}"'
+                    f'proxy.https="{http_proxy}"'
                 )
                 cloud_config["snap"]["commands"].insert(0, snap_proxy_cmd)
         else:
@@ -232,27 +236,27 @@ def maas_container(config: dict[str, Any], build_container: str) -> Iterator[str
             with tempfile.NamedTemporaryFile("w") as f:
                 contents = dedent(
                     f"""\
-                Package: *
-                Pin: origin "{build_container_ip}"
-                Pin-Priority: 999
-                """
+                    Package: *
+                    Pin: origin "{build_container_ip}"
+                    Pin-Priority: 999
+                    """
                 )
                 f.write(contents)
                 f.flush()
                 lxd.push_file(container_name, f.name, apt_preference)
 
-            if "proxy" in config:
-                proxy = config["proxy"]["http"]
-                apt_conf = "/etc/apt/apt.conf.d/80maas-system-test"
-                with tempfile.NamedTemporaryFile("w") as f:
-                    contents = dedent(
-                        f"""\
-                    Acquire::http::Proxy "{proxy}";
-                    Acquire::https::Proxy "{proxy}";
+            http_proxy = config.get("proxy", {}).get("http", "")
+            if http_proxy:
+                contents = dedent(
+                    f"""\
+                    Acquire::http::Proxy "{http_proxy}";
+                    Acquire::https::Proxy "{http_proxy}";
                     Acquire::http::Proxy::{build_container_ip} "DIRECT";
                     Acquire::https::Proxy::{build_container_ip} "DIRECT";
                     """
-                    )
+                )
+                apt_conf = "/etc/apt/apt.conf.d/80maas-system-test"
+                with tempfile.NamedTemporaryFile("w") as f:
                     f.write(contents)
                     f.flush()
                     lxd.push_file(container_name, f.name, apt_conf)