canonical-ubuntu-qa team mailing list archive

[Paride Legovini <mp+429974@xxxxxxxxxxxxxxxxxx>]

Paride Legovini has proposed merging ~paride/ubuntu/+source/autopkgtest:lp1988527-ppc64-kvm-JAMMY into ubuntu/+source/autopkgtest:ubuntu/jammy-devel.

Requested reviews:
  Brian Murray (brian-murray)
  Canonical's Ubuntu QA (canonical-ubuntu-qa)
  git-ubuntu import (git-ubuntu-import)
Related bugs:
  Bug #1988527 in autopkgtest (Ubuntu): "autopkgtest_qemu doesn't use accel=kvm on ppc64le, being fully unusable on that arch"
  https://bugs.launchpad.net/ubuntu/+source/autopkgtest/+bug/1988527

For more details, see:
https://code.launchpad.net/~paride/ubuntu/+source/autopkgtest/+git/autopkgtest/+merge/429974
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~paride/ubuntu/+source/autopkgtest:lp1988527-ppc64-kvm-JAMMY into ubuntu/+source/autopkgtest:ubuntu/jammy-devel.

diff --git a/debian/changelog b/debian/changelog
index e13023d..647e339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+autopkgtest (5.20ubuntu1) jammy; urgency=medium
+
+  * qemu: fix the ppc64le arch name in kvm_compatible().
+    Upstream cherry-pick (93fd5ea9). (LP: #1988527)
+
+ -- Paride Legovini <paride@xxxxxxxxxx>  Thu, 15 Sep 2022 15:27:52 +0200
+
 autopkgtest (5.20) unstable; urgency=medium
 
   * Determine build-needed by parsing the control (Closes: #1002477)
diff --git a/debian/control b/debian/control
index 594f954..f3d010f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: autopkgtest
-Maintainer: Debian CI team <team+ci@xxxxxxxxxxxxxxxxxx>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
+XSBC-Original-Maintainer: Debian CI team <team+ci@xxxxxxxxxxxxxxxxxx>
 Uploaders: Ian Jackson <ijackson@xxxxxxxxxxxxxxxxxxxxxx>,
            Martin Pitt <mpitt@xxxxxxxxxx>,
            Antonio Terceiro <terceiro@xxxxxxxxxx>,
diff --git a/lib/autopkgtest_qemu.py b/lib/autopkgtest_qemu.py
index 6733ede..13fae41 100644
--- a/lib/autopkgtest_qemu.py
+++ b/lib/autopkgtest_qemu.py
@@ -631,8 +631,7 @@ class Qemu:
             'aarch64': ['aarch64'],
             # According to https://wiki.alpinelinux.org/wiki/S390x/Installation
             's390x': ['s390x'],
-            # According to https://wiki.debian.org/ppc64el/Installation
-            'ppc64el': ['ppc64el'],
+            'ppc64le': ['ppc64le'],
         }.get(uname_m, [])
 
     def get_socket_path(self, name: str) -> str: