Merge ~ddstreet/autopkgtest-cloud:lp1847816 into autopkgtest-cloud:master

Proposed by Dan Streetman
Status: Merged
Merged at revision: e5e758938d9962ec8dbe491f7b3c72e2c41c6221
Proposed branch: ~ddstreet/autopkgtest-cloud:lp1847816
Merge into: autopkgtest-cloud:master
Diff against target: 12 lines (+1/-0)
1 file modified
worker/worker (+1/-0)
Reviewer Review Type Date Requested Status
Iain Lane Approve
Andy Whitcroft Approve
Seth Forshee (community) Needs Fixing
Review via email: mp+377688@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Thanks. Please could you rebase this and update in line with the latest commit, and also ask someone from the kernel team (e.g. apw) to review this MP to see if it's correct from their perspective?

review: Needs Information
Revision history for this message
Iain Lane (laney) wrote :

Wait a minute, just noticed that commit is buggy ;(

Revision history for this message
Dan Streetman (ddstreet) wrote :

rebased onto latest commit

Revision history for this message
Dan Streetman (ddstreet) wrote :

@apw @sforshee could you review and let me know if this looks ok?

If it's possible to have a custom kernel that doesn't provide linux-modules-extra-FLAVOR, I could move that into a separate optional (||:) line, but it seemed like all the custom kernels also provided a linux-modules-extra-FLAVOR metapkg.

Thanks!

Revision history for this message
Seth Forshee (sforshee) wrote :

linux-kvm at least does not supply a modules-extra package, there may also be other derivatives which do not. So the package needs to be optional.

review: Needs Fixing
Revision history for this message
Dan Streetman (ddstreet) wrote :

ok, re-pushed to make the install of modules-extra pkg optional.

It looks like SCSI_DEBUG is disabled entirely on linux-kvm, so I'll have to update the systemd test to ignore failure if the module isn't available, but this change will at least allow the test to run on kernels where the scsi_debug module is available, but in the -extra deb.

Revision history for this message
Dan Streetman (ddstreet) wrote :

@sforshee or @apw, could you review?

Revision history for this message
Andy Whitcroft (apw) wrote :

> ok, re-pushed to make the install of modules-extra pkg optional.
>
> It looks like SCSI_DEBUG is disabled entirely on linux-kvm, so I'll have to
> update the systemd test to ignore failure if the module isn't available, but
> this change will at least allow the test to run on kernels where the
> scsi_debug module is available, but in the -extra deb.

We have generally frowned upon not having scsi-debug module available in a kernel. I would suggest asking for that to be enabled to fix the testing.

Revision history for this message
Andy Whitcroft (apw) wrote :

The use of || : had me visually confused, it is so hard to see it is even there. But it looks ok to me. This in general is using a set of Provides: on the first flavour, therefore we will need to check for/add the same Provides: form on the extras meta too.

review: Approve
Revision history for this message
Dan Streetman (ddstreet) wrote :

> > ok, re-pushed to make the install of modules-extra pkg optional.
> >
> > It looks like SCSI_DEBUG is disabled entirely on linux-kvm, so I'll have to
> > update the systemd test to ignore failure if the module isn't available, but
> > this change will at least allow the test to run on kernels where the
> > scsi_debug module is available, but in the -extra deb.
>
> We have generally frowned upon not having scsi-debug module available in a
> kernel. I would suggest asking for that to be enabled to fix the testing.

I targeted the lp bug to linux-kvm, and I'll send a patch to the list enabling the module. I'm not aware of any other kernels that don't build it, but I haven't specifically checked all of them.

Revision history for this message
Iain Lane (laney) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/worker/worker b/worker/worker
2index 9b911d9..92c2aa6 100755
3--- a/worker/worker
4+++ b/worker/worker
5@@ -489,6 +489,7 @@ def request(msg):
6 else:
7 argv += ['--setup-commands', 'apt-get install -y ^linux-image%(f)s$ ^linux-headers%(f)s$ || apt-get install -y ^linux-image-generic%(f)s$ ^linux-headers-generic%(f)s$' %
8 {'f': flavor}]
9+ argv += ['--setup-commands', 'apt-get install -y ^linux-modules-extra%(f)s$ || :' % {'f': flavor}]
10 break
11
12 if 'testname' in params:

Subscribers

People subscribed via source and target branches