worker: Don't run PPAs against -proposed

PPAs don't have a separate pocket so we can't pin down packages for testing in
isolation. In a way, a PPA already fulfills the same purpose as -proposed, i. e.
a set of packages which we want to land in Ubuntu as a group. Thus only run PPA
tests against -release, same as with tests from git and bzr.

LP: #1541334

1 files changed, 6 insertions, 6 deletions

diff --git a/worker/worker b/worker/worker
index c452aeb..ae2b5ae 100755
--- a/worker/worker
+++ b/worker/worker
@@ -244,14 +244,14 @@ def request(msg):
         container += '-%s-%s' % (ppauser, ppaname)
 
     # only install the triggering package from -proposed, rest from -release
-    # this provides better isolation between -proposed packages; but don't
-    # do that for PPAs as we can't set up proper apt pinning for those
-    # right now: also skip that for the kernel as the linux vs. linux-meta
-    # split always screws up the apt pinning
+    # this provides better isolation between -proposed packages; but only do
+    # that for Ubuntu itself, not for things from git, PPAs, etc.
+    # also skip that for the kernel as the linux vs. linux-meta split always
+    # screws up the apt pinning
     if cfg.get('virt', 'args') != 'null':
-        if 'test-git' not in params and 'test-bzr' not in params:
+        if 'test-git' not in params and 'test-bzr' not in params and 'ppas' not in params:
             pocket_arg = '--apt-pocket=proposed'
-            if 'ppas' not in params and not pkgname.startswith('linux'):
+            if not pkgname.startswith('linux'):
                 trigs = ['src:' + t.split('/', 1)[0] for t in params.get('triggers', [])]
                 if trigs:
                     pocket_arg += '=' + ','.join(trigs)