Merge ~juliank/autopkgtest-cloud:migration-reference-0 into autopkgtest-cloud:master

[Julian Andres Klode]

[Steve Langasek (vorlon)]

review: Needs Information

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
index 8384446..ed98b44 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -648,10 +648,13 @@ def request(msg):
             if 'test-git' not in params and 'test-bzr' not in params and ('ppas' not in params or 'all-proposed' in params):
                 pocket_arg = '--apt-pocket=proposed'
                 if 'all-proposed' not in params and not pkgname.startswith('linux'):
-                    trigs = ['src:' + t.split('/', 1)[0] for t in params.get('triggers', [])]
+                    trigs = ['src:' + t.split('/', 1)[0] for t in params.get('triggers', []) if t != 'migration-reference/0']
                     if trigs:
                         pocket_arg += '=' + ','.join(trigs)
-                argv.append(pocket_arg)
+                    else:
+                        pocket_arg = ""
+                if pocket_arg:
+                    argv.append(pocket_arg)
             argv.append('--apt-upgrade')
 
         # determine which test to run
diff --git a/charms/focal/autopkgtest-web/webcontrol/request/submit.py b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
index 763be5d..56742e1 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/submit.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
@@ -114,6 +114,11 @@ class Submit:
             # Debian Policy 5.6.1 and 5.6.12
             if not NAME.match(trigsrc) or not VERSION.match(trigver):
                 raise ValueError('Malformed trigger')
+
+            # Special snowflake
+            if trigger == 'migration-reference/0':
+                continue
+
             if ppas:
                 if not self.is_valid_package_version(release, trigsrc, trigver,
                                                      ppas and ppas[-1] or None):
@@ -355,10 +360,10 @@ class Submit:
                       person, release, component, package, code, repr(response))
         return code >= 200 and code < 300
 
-    def in_allowed_team(self, person, package=[]):
+    def in_allowed_team(self, person, package=[], teams=[]):
         """Check if person is in ALLOWED_TEAMS"""
 
-        for team in ALLOWED_TEAMS:
+        for team in (teams or ALLOWED_TEAMS):
             (code, response) = self.lp_request('~%s/participants' % team, {})
             for e in response.get('entries', []):
                 if e.get('name') == person: