From c6df616f76ee459f009cbf50d8c762010c7b64f6 Mon Sep 17 00:00:00 2001
From: Guillaume Tucker <guillaume.tucker@collabora.com>
Date: Fri, 10 Aug 2018 13:45:19 +0100
Subject: templates: rename ramdisk-template to ramdisk-boot-template

In order to be consistent with other test plans, rename boot templates
with ramdisk-boot-template and fix templates that extend it
accordingly.

Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
---
 ...c-depthcharge-tftp-ramdisk-boot-template.jinja2 | 22 ++++++++++
 ...eneric-depthcharge-tftp-ramdisk-template.jinja2 | 22 ----------
 .../generic-grub-tftp-ramdisk-boot-template.jinja2 | 20 +++++++++
 .../boot/generic-grub-tftp-ramdisk-template.jinja2 | 20 ---------
 .../generic-ipxe-tftp-ramdisk-boot-template.jinja2 | 20 +++++++++
 .../boot/generic-ipxe-tftp-ramdisk-template.jinja2 | 20 ---------
 templates/boot/generic-qemu-boot-template.jinja2   | 49 ++++++++++++++++++++++
 ...generic-uboot-tftp-ramdisk-boot-template.jinja2 | 20 +++++++++
 .../generic-uboot-tftp-ramdisk-template.jinja2     | 20 ---------
 templates/boot/qemu-generic-boot-template.jinja2   | 49 ----------------------
 10 files changed, 131 insertions(+), 131 deletions(-)
 create mode 100644 templates/boot/generic-depthcharge-tftp-ramdisk-boot-template.jinja2
 delete mode 100644 templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2
 create mode 100644 templates/boot/generic-grub-tftp-ramdisk-boot-template.jinja2
 delete mode 100644 templates/boot/generic-grub-tftp-ramdisk-template.jinja2
 create mode 100644 templates/boot/generic-ipxe-tftp-ramdisk-boot-template.jinja2
 delete mode 100644 templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
 create mode 100644 templates/boot/generic-qemu-boot-template.jinja2
 create mode 100644 templates/boot/generic-uboot-tftp-ramdisk-boot-template.jinja2
 delete mode 100644 templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
 delete mode 100644 templates/boot/qemu-generic-boot-template.jinja2

(limited to 'templates/boot')

diff --git a/templates/boot/generic-depthcharge-tftp-ramdisk-boot-template.jinja2 b/templates/boot/generic-depthcharge-tftp-ramdisk-boot-template.jinja2
new file mode 100644
index 0000000..5587aad
--- /dev/null
+++ b/templates/boot/generic-depthcharge-tftp-ramdisk-boot-template.jinja2
@@ -0,0 +1,22 @@
+{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
+{% block metadata %}
+{{ super() }}
+{% endblock %}
+{% block main %}
+{{ super() }}
+{% endblock %}
+{% block actions %}
+{%- block deploy %}
+{{ super () }}
+{%- endblock %}
+{% block kernel_image_type %}
+{%- endblock %}
+
+- boot:
+    timeout:
+      minutes: 5
+    method: depthcharge
+    commands: ramdisk
+    prompts:
+      - '{{ rootfs_prompt }}'
+{% endblock %}
diff --git a/templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2 b/templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2
deleted file mode 100644
index 5587aad..0000000
--- a/templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
-{% block metadata %}
-{{ super() }}
-{% endblock %}
-{% block main %}
-{{ super() }}
-{% endblock %}
-{% block actions %}
-{%- block deploy %}
-{{ super () }}
-{%- endblock %}
-{% block kernel_image_type %}
-{%- endblock %}
-
-- boot:
-    timeout:
-      minutes: 5
-    method: depthcharge
-    commands: ramdisk
-    prompts:
-      - '{{ rootfs_prompt }}'
-{% endblock %}
diff --git a/templates/boot/generic-grub-tftp-ramdisk-boot-template.jinja2 b/templates/boot/generic-grub-tftp-ramdisk-boot-template.jinja2
new file mode 100644
index 0000000..de831f9
--- /dev/null
+++ b/templates/boot/generic-grub-tftp-ramdisk-boot-template.jinja2
@@ -0,0 +1,20 @@
+{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
+{% block metadata %}
+{{ super() }}
+{% endblock %}
+{% block main %}
+{{ super() }}
+{% endblock %}
+{% block actions %}
+{%- block deploy %}
+{{ super () }}
+{%- endblock %}
+
+- boot:
+    timeout:
+      minutes: 5
+    method: grub
+    commands: ramdisk
+    prompts:
+      - '{{ rootfs_prompt }}'
+{% endblock %}
diff --git a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2 b/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
deleted file mode 100644
index de831f9..0000000
--- a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
-{% block metadata %}
-{{ super() }}
-{% endblock %}
-{% block main %}
-{{ super() }}
-{% endblock %}
-{% block actions %}
-{%- block deploy %}
-{{ super () }}
-{%- endblock %}
-
-- boot:
-    timeout:
-      minutes: 5
-    method: grub
-    commands: ramdisk
-    prompts:
-      - '{{ rootfs_prompt }}'
-{% endblock %}
diff --git a/templates/boot/generic-ipxe-tftp-ramdisk-boot-template.jinja2 b/templates/boot/generic-ipxe-tftp-ramdisk-boot-template.jinja2
new file mode 100644
index 0000000..069453c
--- /dev/null
+++ b/templates/boot/generic-ipxe-tftp-ramdisk-boot-template.jinja2
@@ -0,0 +1,20 @@
+{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
+{% block metadata %}
+{{ super() }}
+{% endblock %}
+{% block main %}
+{{ super() }}
+{% endblock %}
+{% block actions %}
+{%- block deploy %}
+{{ super () }}
+{%- endblock %}
+
+- boot:
+    timeout:
+      minutes: 5
+    method: ipxe
+    commands: ramdisk
+    prompts:
+      - '{{ rootfs_prompt }}'
+{% endblock %}
diff --git a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2 b/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
deleted file mode 100644
index 069453c..0000000
--- a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
-{% block metadata %}
-{{ super() }}
-{% endblock %}
-{% block main %}
-{{ super() }}
-{% endblock %}
-{% block actions %}
-{%- block deploy %}
-{{ super () }}
-{%- endblock %}
-
-- boot:
-    timeout:
-      minutes: 5
-    method: ipxe
-    commands: ramdisk
-    prompts:
-      - '{{ rootfs_prompt }}'
-{% endblock %}
diff --git a/templates/boot/generic-qemu-boot-template.jinja2 b/templates/boot/generic-qemu-boot-template.jinja2
new file mode 100644
index 0000000..39736de
--- /dev/null
+++ b/templates/boot/generic-qemu-boot-template.jinja2
@@ -0,0 +1,49 @@
+{% extends 'base/kernel-ci-base.jinja2' %}
+{% set ctx_arch = arch %}
+{% if arch == "arm" %}
+{% set ctx_cpu = 'cortex-a15' %}
+{% set console_dev = 'ttyAMA0' %}
+{% endif %}
+{% if arch == "arm64" %}
+{% set ctx_cpu = 'cortex-a57' %}
+{% set console_dev = 'ttyAMA0' %}
+{% endif %}
+{% if arch == 'x86' %}
+{% set ctx_arch = 'x86_64' %}
+{% set ctx_cpu = 'qemu64' %}
+{% set console_dev = 'ttyS0' %}
+{% endif %}
+{% block metadata %}
+{{ super() }}
+{% endblock %}
+{% block main %}
+{{ super() }}
+{% endblock %}
+{% block actions %}
+context:
+  arch: {{ ctx_arch }}
+  cpu: {{ ctx_cpu }}
+  guestfs_interface: virtio
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    os: oe
+    images:
+      kernel:
+        image_arg: '-kernel {kernel} -append "console={{ console_dev }},115200 root=/dev/ram0 debug verbose"'
+        url: {{ kernel_url }}
+      ramdisk:
+        image_arg: '-initrd {ramdisk}'
+        url: {{ initrd_url }}
+
+- boot:
+    timeout:
+      minutes: 5
+    method: qemu
+    media: tmpfs
+    prompts:
+      - '{{ rootfs_prompt }}'
+{% endblock %}
diff --git a/templates/boot/generic-uboot-tftp-ramdisk-boot-template.jinja2 b/templates/boot/generic-uboot-tftp-ramdisk-boot-template.jinja2
new file mode 100644
index 0000000..935c249
--- /dev/null
+++ b/templates/boot/generic-uboot-tftp-ramdisk-boot-template.jinja2
@@ -0,0 +1,20 @@
+{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
+{% block metadata %}
+{{ super() }}
+{% endblock %}
+{% block main %}
+{{ super() }}
+{% endblock %}
+{% block actions %}
+{%- block deploy %}
+{{ super () }}
+{%- endblock %}
+
+- boot:
+    timeout:
+      minutes: 5
+    method: u-boot
+    commands: ramdisk
+    prompts:
+      - '{{ rootfs_prompt }}'
+{% endblock %}
diff --git a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2 b/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
deleted file mode 100644
index 935c249..0000000
--- a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'base/kernel-ci-base-tftp-deploy.jinja2' %}
-{% block metadata %}
-{{ super() }}
-{% endblock %}
-{% block main %}
-{{ super() }}
-{% endblock %}
-{% block actions %}
-{%- block deploy %}
-{{ super () }}
-{%- endblock %}
-
-- boot:
-    timeout:
-      minutes: 5
-    method: u-boot
-    commands: ramdisk
-    prompts:
-      - '{{ rootfs_prompt }}'
-{% endblock %}
diff --git a/templates/boot/qemu-generic-boot-template.jinja2 b/templates/boot/qemu-generic-boot-template.jinja2
deleted file mode 100644
index 39736de..0000000
--- a/templates/boot/qemu-generic-boot-template.jinja2
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends 'base/kernel-ci-base.jinja2' %}
-{% set ctx_arch = arch %}
-{% if arch == "arm" %}
-{% set ctx_cpu = 'cortex-a15' %}
-{% set console_dev = 'ttyAMA0' %}
-{% endif %}
-{% if arch == "arm64" %}
-{% set ctx_cpu = 'cortex-a57' %}
-{% set console_dev = 'ttyAMA0' %}
-{% endif %}
-{% if arch == 'x86' %}
-{% set ctx_arch = 'x86_64' %}
-{% set ctx_cpu = 'qemu64' %}
-{% set console_dev = 'ttyS0' %}
-{% endif %}
-{% block metadata %}
-{{ super() }}
-{% endblock %}
-{% block main %}
-{{ super() }}
-{% endblock %}
-{% block actions %}
-context:
-  arch: {{ ctx_arch }}
-  cpu: {{ ctx_cpu }}
-  guestfs_interface: virtio
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    os: oe
-    images:
-      kernel:
-        image_arg: '-kernel {kernel} -append "console={{ console_dev }},115200 root=/dev/ram0 debug verbose"'
-        url: {{ kernel_url }}
-      ramdisk:
-        image_arg: '-initrd {ramdisk}'
-        url: {{ initrd_url }}
-
-- boot:
-    timeout:
-      minutes: 5
-    method: qemu
-    media: tmpfs
-    prompts:
-      - '{{ rootfs_prompt }}'
-{% endblock %}
-- 
cgit v1.2.3