diff options
author | Loys Ollivier <lollivier@baylibre.com> | 2018-12-05 14:08:25 +0100 |
---|---|---|
committer | Loys Ollivier <lollivier@baylibre.com> | 2018-12-05 14:29:46 +0100 |
commit | 054523569896178e4939766bbd70b34472945441 (patch) | |
tree | c77ed2cc8567257b462658a4600e290f7b4c613c /templates/base | |
parent | bbf18387cdc9ab10f6b9f4f277bbd2790af30190 (diff) |
templates: callbacks: support multiple callback targets
LAVA jobs can now submit multiple callbacks per job.
Update the create-jobs tool and its underlying templates to support this
feature.
- Callback templates are now split in two file and follow LAVA specification:
'section' and 'subsection'.
- create-jobs tool supports multiple arguments for the '--callback-to' option.
- Default configuration for callback targets can now be a list of targets.
Change-Id: I36c502c0bb5b54010ce32a53ba78a6be5e6a1642
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
Diffstat (limited to 'templates/base')
-rw-r--r-- | templates/base/agl-base.jinja2 | 2 | ||||
-rw-r--r-- | templates/base/agl-callback-section.jinja2 | 9 | ||||
-rw-r--r-- | templates/base/agl-callback-subsection.jinja2 | 5 | ||||
-rw-r--r-- | templates/base/agl-callback.jinja2 | 11 |
4 files changed, 15 insertions, 12 deletions
diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2 index 07bf168..fddda12 100644 --- a/templates/base/agl-base.jinja2 +++ b/templates/base/agl-base.jinja2 @@ -4,7 +4,7 @@ {% include 'base/agl-metadata.jinja2' %} {% endblock %} {% if do_callback %} -{% include 'base/agl-callback.jinja2' %} +{% include 'base/agl-callback-section.jinja2' %} {% endif %} {%- block main %} device_type: {{ device_type }} diff --git a/templates/base/agl-callback-section.jinja2 b/templates/base/agl-callback-section.jinja2 new file mode 100644 index 0000000..44987b2 --- /dev/null +++ b/templates/base/agl-callback-section.jinja2 @@ -0,0 +1,9 @@ +{%- block notify -%} +notify: + criteria: + status: finished + callbacks: +{%-for callback_to in callback_to_list %} +{% include 'base/agl-callback-subsection.jinja2' %} +{%- endfor %} +{%- endblock %} diff --git a/templates/base/agl-callback-subsection.jinja2 b/templates/base/agl-callback-subsection.jinja2 new file mode 100644 index 0000000..c8c7db9 --- /dev/null +++ b/templates/base/agl-callback-subsection.jinja2 @@ -0,0 +1,5 @@ + - url: {{ callback_to.backend_fqdn }}/callback/lava/test?lab_name={{ callback_to.lab_name }}&status={STATUS}&status_string={STATUS_STRING} + method: POST + dataset: all + token: {{ callback_to.lab_token }} + content-type: json diff --git a/templates/base/agl-callback.jinja2 b/templates/base/agl-callback.jinja2 deleted file mode 100644 index b5d3e5e..0000000 --- a/templates/base/agl-callback.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ -{%- block notify -%} -notify: - criteria: - status: finished - callbacks: - - url: {{ backend_fqdn }}/callback/lava/test?lab_name={{ lab_name }}&status={STATUS}&status_string={STATUS_STRING} - method: POST - dataset: all - token: {{ lab_token }} - content-type: json -{%- endblock %} |