From 6591d67c477b5c3f304e4be8c8e487c239b7767d Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@canonical.com>
Date: Tue, 15 Sep 2015 15:10:49 +0200
Subject: [PATCH] autopkgtest: Trigger lxc tests from linux-meta*, not linux

This is more consistent with the DKMS triggers, and will make things easier for
the kernel status matrix.
---
 autopkgtest.py            | 8 ++++++--
 tests/test_autopkgtest.py | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/autopkgtest.py b/autopkgtest.py
index e9bd304..990feb4 100644
--- a/autopkgtest.py
+++ b/autopkgtest.py
@@ -209,8 +209,12 @@ class AutoPackageTest(object):
 
         # Hardcode linux → lxc trigger until we get a more flexible
         # implementation: https://bugs.debian.org/779559
-        if src == 'linux' and 'lxc' not in reported_pkgs:
-            tests.append(('lxc', self.britney.sources['testing']['lxc'][VERSION]))
+        if src.startswith('linux-meta') and 'lxc' not in reported_pkgs:
+            try:
+                tests.append(('lxc', self.britney.sources['testing']['lxc'][VERSION]))
+            except KeyError:
+                # no lxc package in that series? *shrug*, then not
+                pass
 
         tests.sort(key=lambda s_v: s_v[0])
         return tests
diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
index cf7e454..c761d4d 100755
--- a/tests/test_autopkgtest.py
+++ b/tests/test_autopkgtest.py
@@ -1130,12 +1130,12 @@ fancy 1 i386 linux-meta-lts-grumpy 1
     def test_kernel_triggers_lxc(self):
         '''LXC test gets triggered by kernel uploads'''
 
-        self.data.add('lxc', False, {'Testsuite-Triggers': 'linux-libc-dev'},
+        self.data.add('lxc', False, {'Testsuite-Triggers': 'linux-generic'},
                       testsuite='autopkgtest')
 
         self.do_test(
-            [('linux-libc-dev', {'Source': 'linux'}, None)],
-            {'linux': (False, {'lxc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})})
+            [('linux-generic', {'Source': 'linux-meta'}, None)],
+            {'linux-meta': (False, {'lxc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})})
 
     def test_disable_adt(self):
         '''Run without autopkgtest requests'''