aboutsummaryrefslogtreecommitdiff
path: root/templates/boot
diff options
context:
space:
mode:
authorMatt Hart <matthew.hart@linaro.org>2017-03-22 22:12:44 +0000
committerMatt Hart <matthew.hart@linaro.org>2017-03-22 22:12:44 +0000
commit816849dde332654502727b922cf52f59ce0f349b (patch)
tree3b383260cd49de2afe0a6402ffe1741321bb7ad3 /templates/boot
parenta55c1068e7a4edb018a8f17c8e4540d6a2a2b00f (diff)
Update lava-ci scripts and templates to include branch support
Diffstat (limited to 'templates/boot')
-rw-r--r--templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json4
-rw-r--r--templates/boot/generic-arm-dtb-kernel-ci-boot-template.json4
-rw-r--r--templates/boot/generic-arm-kernel-ci-boot-template.json4
-rw-r--r--templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json4
-rw-r--r--templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json4
-rw-r--r--templates/boot/generic-arm64-kernel-ci-boot-template.json4
-rw-r--r--templates/boot/generic-x86-kernel-ci-boot-template.json4
-rw-r--r--templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json4
8 files changed, 24 insertions, 8 deletions
diff --git a/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json b/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
index 362e0bb..4824774 100644
--- a/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"device.tree": "{device_tree}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
index bfc6b64..a781c1e 100644
--- a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"device.tree": "{device_tree}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm-kernel-ci-boot-template.json b/templates/boot/generic-arm-kernel-ci-boot-template.json
index 1940722..57fafa5 100644
--- a/templates/boot/generic-arm-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",
"platform.fastboot": "{fastboot}",
diff --git a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
index d761903..23d2c5c 100644
--- a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"device.tree": "{device_tree}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json b/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
index 252d298..c37ca63 100644
--- a/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"device.tree": "{device_tree}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm64-kernel-ci-boot-template.json b/templates/boot/generic-arm64-kernel-ci-boot-template.json
index b12409b..f0a13f2 100644
--- a/templates/boot/generic-arm64-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",
"platform.fastboot": "{fastboot}",
diff --git a/templates/boot/generic-x86-kernel-ci-boot-template.json b/templates/boot/generic-x86-kernel-ci-boot-template.json
index 4822c1f..8fd3be6 100644
--- a/templates/boot/generic-x86-kernel-ci-boot-template.json
+++ b/templates/boot/generic-x86-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",
"platform.fastboot": "{fastboot}",
diff --git a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
index 675cefd..2a3f4fb 100644
--- a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
"image.type": "{image_type}",
"image.url": "{image_url}",
"kernel.tree": "{tree}",
- "kernel.version": "{kernel_version}",
+ "kernel.describe": "{kernel_describe}",
+ "kernel.branch": "{kernel_branch}",
+ "arch": "{arch}",
"device.tree": "{device_tree}",
"kernel.endian": "{endian}",
"kernel.defconfig": "{defconfig}",