From 55c756f9846551f826ac82d079a692d37d5c77d2 Mon Sep 17 00:00:00 2001 From: Khouloud Touil Date: Wed, 7 Aug 2019 17:04:30 +0200 Subject: Add/use the new arguemnt --build-tags Add new argument --build-tags to be used in the job template and to be passed to the tests to be run along with using --device-tags. Bug-AGL: SPEC-2721 Signed-off-by: Khouloud Touil Change-Id: I2fb4c3d0cb8cd1d0e3c36c1df55185cb4dde43c3 --- templates/base/agl-base.jinja2 | 6 ++++++ templates/tests/ci.jinja2 | 3 +-- templates/tests/release.jinja2 | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2 index 0bc7188..20fc01f 100644 --- a/templates/base/agl-base.jinja2 +++ b/templates/base/agl-base.jinja2 @@ -14,6 +14,12 @@ tags: - {{ tag|lower }} {%- endfor %} {%- endif %} +{%- if BUILD_TAGS %} +build-tags: +{%- for tag in BUILD_TAGS %} +- {{ tag|lower }} +{%- endfor %} +{%- endif %} job_name: {{ name }} diff --git a/templates/tests/ci.jinja2 b/templates/tests/ci.jinja2 index b5974fc..8408057 100644 --- a/templates/tests/ci.jinja2 +++ b/templates/tests/ci.jinja2 @@ -18,10 +18,9 @@ history: False path: test-suites/short-smoke/service-check.yaml name: service-check -{%- if DEVICE_TAGS %} parameters: + BUILD_TAGS: "{{ BUILD_TAGS|join(' ')|lower }}" DEVICE_TAGS: "{{ DEVICE_TAGS|join(' ')|lower }}" -{%- endif -%} {% if "can" in DEVICE_TAGS|lower %} {% include 'tests/can.jinja2' %} diff --git a/templates/tests/release.jinja2 b/templates/tests/release.jinja2 index 965af1a..fdfe6bf 100644 --- a/templates/tests/release.jinja2 +++ b/templates/tests/release.jinja2 @@ -19,6 +19,7 @@ path: test-suites/short-smoke/service-check.yaml name: service-check parameters: + BUILD_TAGS: "{{ BUILD_TAGS }}" DEVICE_TAGS: "{{ DEVICE_TAGS }}" - test: -- cgit 1.2.3-korg