From 95ceeb3b98d69acc472326fa355c3e6a5458741a Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@baylibre.com>
Date: Mon, 31 Jul 2017 16:34:40 -0700
Subject: templatest/boot: standardize indent/formatting

QEMU templates don't have indentation for deploy or boot action, so
remove extra indentation from deploy and boot actions for grub/pxe/uboot
also.

This allows any additional actions which might be appended (e.g test
actions) to have the same indent level for QEMU and grub/ipxe/uboot
jobs.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
 templates/base/kernel-ci-base-tftp-deploy.jinja2   | 38 +++++++++++-----------
 .../boot/generic-grub-tftp-ramdisk-template.jinja2 | 14 ++++----
 .../boot/generic-ipxe-tftp-ramdisk-template.jinja2 | 14 ++++----
 .../generic-uboot-tftp-ramdisk-template.jinja2     | 14 ++++----
 4 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'templates')

diff --git a/templates/base/kernel-ci-base-tftp-deploy.jinja2 b/templates/base/kernel-ci-base-tftp-deploy.jinja2
index ae1f376..6df7e68 100644
--- a/templates/base/kernel-ci-base-tftp-deploy.jinja2
+++ b/templates/base/kernel-ci-base-tftp-deploy.jinja2
@@ -7,31 +7,31 @@
 {% endblock %}
 {% block deploy %}
 actions:
-  - deploy:
-     timeout:
-       minutes: 2
-     to: tftp
-     kernel:
-         url: {{ kernel_url }}
-         type: {{ kernel_image.lower() }}
+- deploy:
+   timeout:
+     minutes: 2
+   to: tftp
+   kernel:
+       url: {{ kernel_url }}
+       type: {{ kernel_image.lower() }}
 {%- if nfsrootfs_url %}
-     nfsrootfs:
-         url: {{ nfsrootfs_url }}
-         compression: xz
+   nfsrootfs:
+       url: {{ nfsrootfs_url }}
+       compression: xz
 {%- endif %}
 {%- if initrd_url %}
-     ramdisk:
-         url: {{ initrd_url }}
-         compression: gz
+   ramdisk:
+       url: {{ initrd_url }}
+       compression: gz
 {%- endif %}
 {%- if modules_url %}
-     modules:
-         url: {{ modules_url }}
-         compression: xz
+   modules:
+       url: {{ modules_url }}
+       compression: xz
 {%- endif %}
 {%- if dtb_url %}
-     dtb:
-         url: {{ dtb_url }}
+   dtb:
+       url: {{ dtb_url }}
 {%- endif %}
-     os: oe
+   os: oe
 {% endblock %}
diff --git a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2 b/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
index 488df5f..45e954a 100644
--- a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
+++ b/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
@@ -10,11 +10,11 @@
 {{ super () }}
 {%- endblock %}
 
-  - boot:
-     method: grub
-     commands: ramdisk
-     prompts:
-       - 'linaro-test'
-       - 'root@debian:~#'
-       - '/ #'
+- boot:
+   method: grub
+   commands: ramdisk
+   prompts:
+     - 'linaro-test'
+     - 'root@debian:~#'
+     - '/ #'
 {% endblock %}
diff --git a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2 b/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
index 1384e0e..8399c11 100644
--- a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
+++ b/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
@@ -10,11 +10,11 @@
 {{ super () }}
 {%- endblock %}
 
-  - boot:
-     method: ipxe
-     commands: ramdisk
-     prompts:
-       - 'linaro-test'
-       - 'root@debian:~#'
-       - '/ #'
+- boot:
+   method: ipxe
+   commands: ramdisk
+   prompts:
+     - 'linaro-test'
+     - 'root@debian:~#'
+     - '/ #'
 {% endblock %}
diff --git a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2 b/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
index a5c2937..6236b35 100644
--- a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
+++ b/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
@@ -10,11 +10,11 @@
 {{ super () }}
 {%- endblock %}
 
-  - boot:
-     method: u-boot
-     commands: ramdisk
-     prompts:
-       - 'linaro-test'
-       - 'root@debian:~#'
-       - '/ #'
+- boot:
+   method: u-boot
+   commands: ramdisk
+   prompts:
+     - 'linaro-test'
+     - 'root@debian:~#'
+     - '/ #'
 {% endblock %}
-- 
cgit v1.2.3