add grub-efi support

* tests: increase timeout
* ci: split e2e tests

Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>

templates/ubuntu.Dockerfile

@@ -2,14 +2,21 @@ FROM {{ .Image }}
 
 USER root
 
-RUN apt-get update -y && \
+RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
   linux-image-virtual \
   initramfs-tools \
   systemd-sysv \
   systemd \
 {{- if .Grub }}
-  grub2 \
+  grub-common \
+  grub2-common \
+{{- end }}
+{{- if .GrubBIOS }}
+  grub-pc-bin \
+{{- end }}
+{{- if .GrubEFI }}
+  grub-efi-amd64-bin \
 {{- end }}
   dbus \
   isc-dhcp-client \
@@ -17,11 +24,6 @@ RUN apt-get update -y && \
   iputils-ping && \
   find /boot -type l -exec rm {} \;
 
-{{- if not .Grub }}
-RUN mv $(find /boot -name 'vmlinuz-*') /boot/vmlinuz && \
-      mv $(find /boot -name 'initrd.img-*') /boot/initrd.img
-{{- end }}
-
 RUN systemctl preset-all
 
 {{ if .Password }}RUN echo "root:{{ .Password }}" | chpasswd {{ end }}
@@ -54,3 +56,9 @@ iface eth0 inet dhcp\n\
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends cryptsetup-initramfs && \
     update-initramfs -u -v
 {{- end }}
+
+# needs to be after update-initramfs
+{{- if not .Grub }}
+RUN mv $(find /boot -name 'vmlinuz-*') /boot/vmlinuz && \
+      mv $(find /boot -name 'initrd.img-*') /boot/initrd.img
+{{- end }}