canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+462949@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:worker-private-ppa-modtig into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/462949
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:worker-private-ppa-modtig into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
index f1bbac5..4915580 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -898,19 +898,29 @@ def request(msg):
                 else:
                     ppaprefix = "http://";
                 # add GPG key
-                argv += [
-                    "--setup-commands",
-                    "apt-key adv --keyserver keyserver.ubuntu.com --recv-key "
-                    + fingerprint,
-                ]
-                # add apt source
-                argv += [
-                    "--setup-commands",
-                    'REL=$(sed -rn "/^(deb|deb-src) .*(ubuntu.com|ftpmaster)/ { s/^[^ ]+ +(\[.*\] *)?[^ ]* +([^ -]+) +.*$/\\2/p; q }" /etc/apt/sources.list); '
-                    'echo "deb %(prefix)sppa.launchpad.net/%(u)s/%(p)s/ubuntu $REL main" > /etc/apt/sources.list.d/autopkgtest-%(u)s-%(p)s.list; '
-                    'echo "deb-src %(prefix)sppa.launchpad.net/%(u)s/%(p)s/ubuntu $REL main" >> /etc/apt/sources.list.d/autopkgtest-%(u)s-%(p)s.list;'
-                    % {"prefix": ppaprefix, "u": ppauser, "p": ppaname},
-                ]
+                if release == "noble":
+                    argv += [
+                        "--setup-commands",
+                        "apt-get install -y software-properties-common",
+                    ]
+                    argv += [
+                        "--setup-commands",
+                        "add-apt-repository --enable-source --yes  ppa:%(u)s/%(p)s" % {"u": ppauser, "p": ppaname},
+                    ]
+                else:
+                    argv += [
+                        "--setup-commands",
+                        "apt-key adv --keyserver keyserver.ubuntu.com --recv-key "
+                        + fingerprint,
+                    ]
+                    # add apt source
+                    argv += [
+                        "--setup-commands",
+                        'REL=$(sed -rn "/^(deb|deb-src) .*(ubuntu.com|ftpmaster)/ { s/^[^ ]+ +(\[.*\] *)?[^ ]* +([^ -]+) +.*$/\\2/p; q }" /etc/apt/sources.list); '
+                        'echo "deb %(prefix)sppa.launchpad.net/%(u)s/%(p)s/ubuntu $REL main" > /etc/apt/sources.list.d/autopkgtest-%(u)s-%(p)s.list; '
+                        'echo "deb-src %(prefix)sppa.launchpad.net/%(u)s/%(p)s/ubuntu $REL main" >> /etc/apt/sources.list.d/autopkgtest-%(u)s-%(p)s.list;'
+                        % {"prefix": ppaprefix, "u": ppauser, "p": ppaname},
+                    ]
 
             # put results into separate container, named by the last PPA
             container += "-%s-%s" % (ppauser, ppaname)