aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2017-07-31 16:34:40 -0700
committerKevin Hilman <khilman@baylibre.com>2017-07-31 16:42:22 -0700
commit95ceeb3b98d69acc472326fa355c3e6a5458741a (patch)
tree835835343de5e7b72b96027ee8166e06368728da /templates
parent9c533e2065bfec86b427100b256b33692fd85949 (diff)
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>
Diffstat (limited to 'templates')
-rw-r--r--templates/base/kernel-ci-base-tftp-deploy.jinja238
-rw-r--r--templates/boot/generic-grub-tftp-ramdisk-template.jinja214
-rw-r--r--templates/boot/generic-ipxe-tftp-ramdisk-template.jinja214
-rw-r--r--templates/boot/generic-uboot-tftp-ramdisk-template.jinja214
4 files changed, 40 insertions, 40 deletions
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 %}