Merge ~kleinm/curtin:centos-arm64-fixes into curtin:master

[Mark Klein]

This adds arm64 compatibility for RH installations

The current behaviour for Redhat based installs assumes x86_64
arch for grub. This change queries the target arch and makes
decisions on packages based on that.

[Michael Hudson-Doyle (mwhudson)]

Looks plausible but I have no way to test this.

Are there tests that need updating?

[Mark Klein (kleinm)]

I added some unit tests for the new combinations. Also restructured some longer lines due to tox complaints

I also fixed an issue with original commit after doing some tests on real hardware. x86_64 should have been amd64 at this check so nothing breaks on that side.

[Michael Hudson-Doyle (mwhudson)]

Sorry for dropping this. I can't test this but also I can't see a way this could possibly make things worse so let's get it landed and out there.

review: Approve

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

review: Approve (continuous-integration)

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

Commit message lints:
- Line #2 has 86 too many characters. Line starts with: "The current behaviour"...

review: Needs Fixing

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

review: Approve (continuous-integration)

diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index 4cf7301..eaeb9c4 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -1266,15 +1266,22 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
     if util.is_uefi_bootable():
         uefi_pkgs = ['efibootmgr']
         if osfamily == DISTROS.redhat:
-            # centos/redhat doesn't support 32-bit?
-            if 'grub2-efi-x64-modules' not in installed_packages:
-                # Previously Curtin only supported unsigned GRUB due to an
-                # upstream bug. By default lp:maas-image-builder and
-                # packer-maas have grub preinstalled. If grub2-efi-x64-modules
-                # is already in the image use unsigned grub so the install
-                # doesn't require Internet access. If grub is missing use the
-                # signed version.
-                uefi_pkgs.extend(['grub2-efi-x64', 'shim-x64'])
+            arch = distro.get_architecture()
+            if arch == 'amd64':
+                # centos/redhat doesn't support 32-bit?
+                if 'grub2-efi-x64-modules' not in installed_packages:
+                    # Previously Curtin only supported unsigned GRUB due to an
+                    # upstream bug. By default lp:maas-image-builder and
+                    # packer-maas have grub preinstalled. If
+                    # grub2-efi-x64-modules is already in the image use
+                    # unsigned grub so the install doesn't require Internet
+                    # access. If grub is missing use to signed version.
+                    uefi_pkgs.extend(['grub2-efi-x64', 'shim-x64'])
+            if arch == 'arm64':
+                if 'grub2-efi-aa64-modules' not in installed_packages:
+                    # Packages required for arm64 grub installer
+                    uefi_pkgs.extend(['grub2-efi-aa64-modules',
+                                      'grub2-efi-aa64', 'shim-aa64'])
         elif osfamily == DISTROS.debian:
             arch = distro.get_architecture()
             if arch == 'i386':
diff --git a/curtin/commands/install_grub.py b/curtin/commands/install_grub.py
index 5f8311f..89810c7 100644
--- a/curtin/commands/install_grub.py
+++ b/curtin/commands/install_grub.py
@@ -51,6 +51,11 @@ def get_grub_package_name(target_arch, uefi, rhel_ver=None):
             # grub2-efi-x64 installs a signed grub bootloader
             grub_name = "grub2-efi-x64"
             grub_target = "x86_64-efi"
+        elif target_arch == 'aarch64':
+            # centos 7+, no centos6 support
+            # grub2-efi-aa64 installs a signed grub bootloader
+            grub_name = "grub2-efi-aa64"
+            grub_target = "arm64-efi"
         elif target_arch == 'arm64':
             grub_name = 'grub-efi-%s' % target_arch
             grub_target = "arm64-efi"
diff --git a/tests/unittests/test_commands_install_grub.py b/tests/unittests/test_commands_install_grub.py
index 8808159..a53f35d 100644
--- a/tests/unittests/test_commands_install_grub.py
+++ b/tests/unittests/test_commands_install_grub.py
@@ -44,6 +44,22 @@ class TestGetGrubPackageName(CiTestCase):
             ('grub2-efi-x64', 'x86_64-efi'),
             install_grub.get_grub_package_name(target_arch, uefi, rhel_ver))
 
+    def test_uefi_rhel7_arm64(self):
+        target_arch = 'aarch64'
+        uefi = True
+        rhel_ver = '7'
+        self.assertEqual(
+            ('grub2-efi-aa64', 'arm64-efi'),
+            install_grub.get_grub_package_name(target_arch, uefi, rhel_ver))
+
+    def test_uefi_rhel8_arm64(self):
+        target_arch = 'aarch64'
+        uefi = True
+        rhel_ver = '8'
+        self.assertEqual(
+            ('grub2-efi-aa64', 'arm64-efi'),
+            install_grub.get_grub_package_name(target_arch, uefi, rhel_ver))
+
     def test_uefi_debian_arm64(self):
         target_arch = 'arm64'
         uefi = True
diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
index e5fead3..41670f7 100644
--- a/tests/unittests/test_curthooks.py
+++ b/tests/unittests/test_curthooks.py
@@ -504,6 +504,22 @@ class TestInstallMissingPkgs(CiTestCase):
         self.mock_install_packages.assert_called_with(
                 expected_pkgs, target=target, osfamily=distro.DISTROS.redhat)
 
+    @patch.object(events, 'ReportEventStack')
+    def test_install_packages_on_uefi_arm64_centos(self, mock_events):
+        arch = 'arm64'
+        self.mock_arch.return_value = arch
+        self.mock_machine.return_value = 'arm64'
+        expected_pkgs = ['efibootmgr', 'grub2-efi-aa64',
+                         'grub2-efi-aa64-modules', 'shim-aa64']
+        self.mock_uefi.return_value = True
+        self.mock_haspkg.return_value = True
+        target = "not-a-real-target"
+        cfg = {}
+        curthooks.install_missing_packages(
+            cfg, target=target, osfamily=distro.DISTROS.redhat)
+        self.mock_install_packages.assert_called_with(
+                expected_pkgs, target=target, osfamily=distro.DISTROS.redhat)
+
 
 class TestSetupZipl(CiTestCase):