sts-sponsors team mailing list archive

[Diego Mascialino <mp+433798@xxxxxxxxxxxxxxxxxx>]

Diego Mascialino has proposed merging ~dmascialino/maas-ci/+git/system-tests:allow_list_of_ppa into ~maas-committers/maas-ci/+git/system-tests:master.

Commit message:
Allow list of PPAs



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~dmascialino/maas-ci/+git/system-tests/+merge/433798

Our utils/gen_config.py generates a list of PPAs.

This MP fixes system-tests code to use it correctly.
-- 
Your team MAAS Committers is requested to review the proposed merge of ~dmascialino/maas-ci/+git/system-tests:allow_list_of_ppa into ~maas-committers/maas-ci/+git/system-tests:master.

diff --git a/config.yaml.sample b/config.yaml.sample
index 991b6cb..e9648fe 100644
--- a/config.yaml.sample
+++ b/config.yaml.sample
@@ -87,7 +87,8 @@ machines:
                     -----END PRIVATE KEY-----
 
 deb:
-    ppa: ppa:maas-committers/latest-deps
+    ppa:
+        - ppa:maas-committers/latest-deps
     git_repo: https://git.launchpad.net/maas
     git_branch: master
 
diff --git a/systemtests/fixtures.py b/systemtests/fixtures.py
index 033fa08..63e9baf 100644
--- a/systemtests/fixtures.py
+++ b/systemtests/fixtures.py
@@ -28,12 +28,13 @@ LXD_PROFILE = os.environ.get("MAAS_SYSTEMTESTS_LXD_PROFILE", "prof-maas-lab")
 
 def _add_maas_ppa(lxd: CLILXD, container: str, config: dict[str, Any]) -> None:
     """Add MAAS PPA to the given container."""
-    MAAS_PPA = config.get("deb", {}).get("ppa", "ppa:maas-committers/latest-deps")
-    lxd.execute(
-        container,
-        ["add-apt-repository", "-y", MAAS_PPA],
-        environment={"DEBIAN_FRONTEND": "noninteractive"},
-    )
+    MAAS_PPA = config.get("deb", {}).get("ppa", ["ppa:maas-committers/latest-deps"])
+    for ppa in MAAS_PPA:
+        lxd.execute(
+            container,
+            ["add-apt-repository", "-y", ppa],
+            environment={"DEBIAN_FRONTEND": "noninteractive"},
+        )
 
 
 @pytest.fixture(scope="session")