From df4a57e5964a612cf5c6c509926658e827dd99ae Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
Date: Thu, 2 Apr 2020 10:35:17 +0200
Subject: SPEC-3210: handle the deprecation of actions: boot: type:

Specifying the kernel type in "actions: boot:" is deprecated.
It should now be set in "deploy: kernel:".

So this patch set unconditonaly the type: in the deploy section (before
it was only for ramdisk method) and remove the type: from the deprecated
place.
But due to a bug in LAVA, NBD jobs rely on type: to be in the deprecated
place until 2020.02 (2020.02 has the fix).

So this patch must be applied only after LAVA 2020.02 was deployed.

Change-Id: Ida30092d2abe14b05d5e37f651f91ab33876e4f5
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
---
 templates/boot/generic-grub-tftp.jinja2  | 2 +-
 templates/boot/generic-ipxe-tftp.jinja2  | 2 +-
 templates/boot/generic-uboot-tftp.jinja2 | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'templates/boot')

diff --git a/templates/boot/generic-grub-tftp.jinja2 b/templates/boot/generic-grub-tftp.jinja2
index 0d42443..1a82f27 100644
--- a/templates/boot/generic-grub-tftp.jinja2
+++ b/templates/boot/generic-grub-tftp.jinja2
@@ -25,8 +25,8 @@ context:
 {{ super() }}
     kernel:
       url: {{ kernel_url }}
-{%- if rootfs_type == 'ramdisk' %}
       type: {{ kernel_type }}
+{%- if rootfs_type == 'ramdisk' %}
     ramdisk:
       url: {{ initrd_url }}
       compression: {{ initrd_compression }}
diff --git a/templates/boot/generic-ipxe-tftp.jinja2 b/templates/boot/generic-ipxe-tftp.jinja2
index 25aa9f1..c36a7e9 100644
--- a/templates/boot/generic-ipxe-tftp.jinja2
+++ b/templates/boot/generic-ipxe-tftp.jinja2
@@ -25,8 +25,8 @@ context:
 {{ super() }}
     kernel:
       url: {{ kernel_url }}
-{%- if rootfs_type == 'ramdisk' %}
       type: {{ kernel_type }}
+{%- if rootfs_type == 'ramdisk' %}
     ramdisk:
       url: {{ initrd_url }}
       compression: {{ initrd_compression }}
diff --git a/templates/boot/generic-uboot-tftp.jinja2 b/templates/boot/generic-uboot-tftp.jinja2
index 62c657e..8befb6d 100644
--- a/templates/boot/generic-uboot-tftp.jinja2
+++ b/templates/boot/generic-uboot-tftp.jinja2
@@ -12,7 +12,6 @@ protocols:
 {{ super() }}
     commands: {{ boot_commands|default("ramdisk") }}
 {%- if rootfs_type == 'nbd' %}
-    type: {{ uboot_type|default("bootm") }}
     transfer_overlay:
       download_command: wget
       unpack_command: tar -C / -xvpf
@@ -22,8 +21,8 @@ protocols:
 {{ super() }}
     kernel:
       url: {{ kernel_url }}
-{%- if rootfs_type == 'ramdisk' %}
       type: {{ kernel_type }}
+{%- if rootfs_type == 'ramdisk' %}
     ramdisk:
       url: {{ initrd_url }}
       compression: {{ initrd_compression }}
-- 
cgit 1.2.3-korg