3 files changed, 20 insertions, 2 deletions

diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index af82379..9ae5c6d 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -11,6 +11,13 @@
 {%- set kernel_image = kernel_image|default('uImage') %}
 {%- set kernel_url = kernel_url|default(baseurl(kernel_image)) %}
 {%- set rootfs_type = rootfs_type|default("ramdisk") %}
+{%- set image_type = image_type|default("AGL") %}
+{%- set kernel_defconfig_base = kernel_defconfig_base|default("defconfig") %}
+{%- set kernel_defconfig = kernel_defconfig|default("defconfig+CONFIG_AGL=y") %}
+{%- set kernel_tree = kernel_tree|default("AGL-kernel-tree") %}
+{%- set kernel_version = kernel_version|default("AGL-kernel-version") %}
+{%- set vcs_branch = vcs_branch|default("agl-branch") %}
+{%- set vcs_url = vcs_url|default(baseurl()) %}
 {%- if dtb %}
 {%- set dtb_url = dtb_url|default(baseurl(dtb)) %}
 {%- endif %}
diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2
index f717ef6..069eeb2 100644
--- a/templates/base/agl-base.jinja2
+++ b/templates/base/agl-base.jinja2
@@ -1,8 +1,7 @@
 {%- extends 'base/agl-base-defaults.jinja2' %}
 {%- block job %}
 {%- block metadata %}
-metadata:
-  image.type: 'AGL'
+{% include 'base/agl-metadata.jinja2' %}
 {% endblock %}
 {% if callback_name %}
 {% include 'base/agl-callback.jinja2' %}
diff --git a/templates/base/agl-metadata.jinja2 b/templates/base/agl-metadata.jinja2
new file mode 100644
index 0000000..050eeff
--- /dev/null
+++ b/templates/base/agl-metadata.jinja2
@@ -0,0 +1,12 @@
+metadata:
+  git.branch: {{ vcs_branch }}
+  image.type: {{ image_type }}
+  job.arch: {{ device_arch }}
+  job.name: {{ name }}
+  kernel.tree: {{ kernel_tree }}
+  kernel.version: {{ kernel_version }}
+  kernel.defconfig_base: {{ kernel_defconfig_base }}
+  kernel.defconfig: {{ kernel_defconfig }}
+  platform.mach: {{ device_mach }}
+  platform.name: {{ device_type }}
+  vcs.url: {{ vcs_url }}