diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2019-05-30 15:38:35 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-05-30 15:38:38 -0700 |
| commit | 402db0b5d149c47b5f0313c1c114eeabd0950d80 (patch) | |
| tree | 61ed919612cd4dfaf50205f55865a75fd887e034 | |
| parent | 77a8ce4fcd8b26b6ff6c2a76788b5eff1d80ff97 (diff) | |
add tags: section, ensure tags are always lowercase
Whenever --device-tags are passed, a "tags:" section is added to the
job with all of the tags passed on the command-line.
To facilitate this, the device_tags list is passed directly from
python to the jinja templates, and iteration is done in jinja
instead of a string created in python.
Also, while here, ensure that tags are always passed lower-cased.
IMPORTANT: this implies that any tags in LAVA labs that are upper-case
will *never* be used.
Change-Id: I8f274098a69e34c32c5ed2d1c430eca0d364bcc5
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
| -rw-r--r-- | templates/base/agl-base.jinja2 | 7 | ||||
| -rw-r--r-- | templates/tests/ci.jinja2 | 7 | ||||
| -rw-r--r-- | utils/agljobtemplate.py | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2 index fddda12..0bc7188 100644 --- a/templates/base/agl-base.jinja2 +++ b/templates/base/agl-base.jinja2 @@ -8,6 +8,13 @@ {% endif %} {%- block main %} device_type: {{ device_type }} +{%- if DEVICE_TAGS %} +tags: +{%- for tag in DEVICE_TAGS %} +- {{ tag|lower }} +{%- endfor %} +{%- endif %} + job_name: {{ name }} timeouts: diff --git a/templates/tests/ci.jinja2 b/templates/tests/ci.jinja2 index feca60e..b5974fc 100644 --- a/templates/tests/ci.jinja2 +++ b/templates/tests/ci.jinja2 @@ -18,9 +18,12 @@ history: False path: test-suites/short-smoke/service-check.yaml name: service-check +{%- if DEVICE_TAGS %} parameters: - DEVICE_TAGS: "{{ DEVICE_TAGS }}" -{% if "CAN" in DEVICE_TAGS %} + DEVICE_TAGS: "{{ DEVICE_TAGS|join(' ')|lower }}" +{%- endif -%} + +{% if "can" in DEVICE_TAGS|lower %} {% include 'tests/can.jinja2' %} {% endif %} diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index b12a8ef..3c69832 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -150,7 +150,6 @@ class Agljobtemplate(object): else: job['APPURL'] = applications_url - device_tags = ' '.join(device_tags) job['DEVICE_TAGS'] = device_tags test_templates = [] |