Port to debian

diff --git a/debian/tests/10_uefi_boot_tests.py b/debian/tests/10_uefi_boot_tests.py
index e2d0d2937c798e315edbcdc025a139178c2d9ad8..7ef4df4478891b52ee3e8f090f9c585def88efc7 100755 (executable)
--- a/debian/tests/10_uefi_boot_tests.py
+++ b/debian/tests/10_uefi_boot_tests.py
@@ -42,7 +42,7 @@ class UEFIBootTests(UEFITestsBase):
     def testNewShim(self):
         """Validate that a new SHIM binary on the image will boot"""
         new_shim = UEFIVirtualMachine(self.base_image)
-        new_shim.update(src='/usr/lib/shim/shimx64.efi.signed', dst='/boot/efi/EFI/ubuntu/shimx64.efi')
+        new_shim.update(src='/usr/lib/shim/shimx64.efi.signed', dst='/boot/efi/EFI/debian/shimx64.efi')
         new_shim.update(src='/usr/lib/shim/shimx64.efi.signed', dst='/boot/efi/EFI/BOOT/BOOTX64.efi')
         new_shim.run()
         self.assertBoots(new_shim)

diff --git a/debian/tests/uefi_tests_base.py b/debian/tests/uefi_tests_base.py
index cf9d40b11e705e4eb5877ba588f50816467d0817..f007d741521296917cc10fa15101734812b2bb8c 100644 (file)
--- a/debian/tests/uefi_tests_base.py
+++ b/debian/tests/uefi_tests_base.py
@@ -67,7 +67,7 @@ class UEFITestsBase(unittest.TestCase):
         # Base paths for the ESP.
         klass.uefi_base_dir = os.path.join('/', 'boot', 'efi', 'EFI')
         klass.uefi_boot_dir = os.path.join(klass.uefi_base_dir, 'BOOT')
-        klass.uefi_install_dir = os.path.join(klass.uefi_base_dir, 'ubuntu')
+        klass.uefi_install_dir = os.path.join(klass.uefi_base_dir, 'debian')
 
         # CAs for signature validation
         klass.canonical_ca = os.path.join('/usr/share/grub', 'canonical-uefi-ca.crt')
@@ -151,7 +151,7 @@ DEFAULT_METADATA = 'instance-id: nocloud\nlocal-hostname: autopkgtest\n'
 
 DEFAULT_USERDATA = """#cloud-config
 locale: en_US.UTF-8
-password: ubuntu
+password: debian
 chpasswd: { expire: False }
 ssh_pwauth: True
 manage_etc_hosts: True
@@ -173,7 +173,7 @@ class UEFIVirtualMachine(UEFITestsBase):
         self.path = tempfile.mkstemp(dir=self.autopkgtest_dir.name)[1]
         if not base:
             subprocess.run(['wget',
-                            'http://cloud-images.ubuntu.com/%s/current/%s-server-cloudimg-%s.img'
+                            'http://cloud.debian.org/%s/lastest/debian-%s-genericcloud-%s.img'
                             % (self.release, self.release, self.arch),
                             '-O', '%s/base.img' % self.autopkgtest_dir.name])
         else: