Merge ~mwhudson/curtin:lp-1927703 into curtin:master

[Michael Hudson-Doyle]

curthooks: always install shim-signed if available (when UEFI booted)

Rather than just on amd64. It's been available on arm64 since at least
20.04 (and is in bionic-updates).

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:b8808ca2ed6a3e92b1249845b2db99061168f1bf
https://jenkins.ubuntu.com/server/job/curtin-ci/121/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/121/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/121/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/121/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/121/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/121//rebuild

review: Needs Fixing (continuous-integration)

[Paride Legovini (paride)]

The annoying flaky fail

************* Module curtin.commands.install_grub
curtin/commands/install_grub.py:93:19: E1101: Instance of 'Distros' has no 'debian' member (no-member)
curtin/commands/install_grub.py:155:28: E1101: Instance of 'Distros' has no 'redhat' member (no-member)
curtin/commands/install_grub.py:246:28: E1101: Instance of 'Distros' has no 'debian' member (no-member)
curtin/commands/install_grub.py:250:30: E1101: Instance of 'Distros' has no 'redhat' member (no-member)
curtin/commands/install_grub.py:263:28: E1101: Instance of 'Distros' has no 'debian' member (no-member)
[...]

Retriggering.

[Ryan Harper (raharper)]

LGTM

review: Approve

[Michael Hudson-Doyle (mwhudson)]

Although it turns out that shim-signed is somewhat broken on arm64 until the current round of shim/grub SRUs are complete, so I'll hold off merging this until that happens (which should be soon)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:7d8ba7c4ee4ff935af6a46b2a6ddd81a097bd38e
https://jenkins.ubuntu.com/server/job/curtin-ci/180/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/180/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/180/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/180/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/180/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/180//rebuild

review: Approve (continuous-integration)

diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index 8ed4f5f..647a0bf 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -1287,8 +1287,9 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
             if distro.has_pkg_available(uefi_pkg_signed):
                 uefi_pkgs.append(uefi_pkg_signed)
 
-            # AMD64 has shim-signed for SecureBoot support
-            if arch == "amd64":
+            # amd64 and arm64 (since bionic) has shim-signed for
+            # SecureBoot support
+            if distro.has_pkg_available("shim-signed"):
                 uefi_pkgs.append("shim-signed")
         else:
             raise ValueError('Unknown grub2 package list for distro: %s' %