“Canonical Kernel Team” team

Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/lxc-noble into ~canonical-kernel-team/+git/autotest-client-tests:master

  1. Git
  2. lp:~canonical-kernel-team/+git/autotest-client-tests
  3. phlin/lxc-noble
  4. Merge into master
Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: 649edaf747fc28651905f0fc06fa202e9812cee2
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:phlin/lxc-noble
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 31 lines (+7/-3)
1 file modified
ubuntu_lxc/ubuntu_lxc.py (+7/-3)
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+464661@code.launchpad.net

Commit message

KERNTT-915
Fix the test build issue for noble, it just need to be added to the
series check list like mantic. Rewrite if statement to cover future
releases.

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Patch tested on maas@obruchev and it's working as expected.

Revision history for this message
Francis Ginther (fginther) wrote :

+1

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied and pushed, thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_lxc/ubuntu_lxc.py b/ubuntu_lxc/ubuntu_lxc.py
2index f2f8cdf..1fa9e0e 100644
3--- a/ubuntu_lxc/ubuntu_lxc.py
4+++ b/ubuntu_lxc/ubuntu_lxc.py
5@@ -29,11 +29,14 @@ class ubuntu_lxc(test.test):
6 ]
7 gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
8 pkgs.append(gcc)
9- if self.series in ['lunar', 'mantic']:
10+ # For Mantic and newer
11+ if self.series not in ['precise', 'trusty', 'xenial', 'bionic', 'focal', 'jammy']:
12 pkgs.append('meson')
13 pkgs.append('docbook2x')
14 pkgs.append('docbook-utils')
15- pkgs.append('criu')
16+ # criu is not available on Noble
17+ if self.series in ['mantic']:
18+ pkgs.append('criu')
19
20 pkgs.append('liblxc1')
21 cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
22@@ -58,7 +61,8 @@ class ubuntu_lxc(test.test):
23 utils.system('apt-get source --download-only lxc')
24 utils.system("dpkg-source -x lxc*dsc lxc-pkg-ubuntu")
25 os.chdir('/tmp/lxc-pkg-ubuntu')
26- if self.series not in ['lunar', 'mantic']:
27+ # For > Xenial and <= Jammy
28+ if self.series in ['bionic', 'focal', 'jammy']:
29 gcc_multiarch = utils.system_output('gcc -print-multiarch', retain_output=False)
30 utils.system('autoreconf -f -i')
31 cmd = '--enable-tests --disable-rpath --disable-doc --with-distro=ubuntu \

Subscribers

People subscribed via source and target branches

to all changes: