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 <ktouil@baylibre.com>
Change-Id: I2fb4c3d0cb8cd1d0e3c36c1df55185cb4dde43c3

5 files changed, 13 insertions, 4 deletions

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:
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index a74b7a6..867bfab 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -91,7 +91,7 @@ class Agljobtemplate(object):
                    lava_callback=None, kci_callback=None, build_id=None,
                    rfs_image=None, kernel_image=None, dtb_image=None, modules_image=None,
                    build_type=None, vcs_commit=None, vcs_branch=None,
-                   build_version=None, device_tags="",
+                   build_version=None, device_tags="", build_tags="",
                    applications_url=None, app_changeid=None, app_patchset=None, app_branch=None):
 
         if machine not in self.machines:
@@ -157,6 +157,7 @@ class Agljobtemplate(object):
                 job['APPURL'] = applications_url
 
         job['DEVICE_TAGS'] = device_tags
+        job['BUILD_TAGS'] = build_tags
 
         test_templates = []
         # If the user doesn't specify tests, use the default ones from the build-type
diff --git a/utils/create-jobs.py b/utils/create-jobs.py
index 5a0f660..28eb643 100755
--- a/utils/create-jobs.py
+++ b/utils/create-jobs.py
@@ -55,6 +55,8 @@ def parse_cmdline(machines, tests, rfs_types):
                         help="the version number of the build.")
     parser.add_argument('--device-tags', dest='device_tags', action='store',
                         help="The device tags to be used to create the job.", nargs='*', default="")
+    parser.add_argument('--build-tags', dest='build_tags', action='store',
+                        help="The build tags to be used to create the job.", nargs='*', default="")
     parser.add_argument('--commit', dest='vcs_commit', action='store',
                         help="The build hash.")
     parser.add_argument('--build-id', dest='build_id', action='store',
@@ -100,7 +102,7 @@ def main():
                          modules_image=args.modules_img, vcs_branch=args.vcs_branch,
                          build_type=args.build_type, vcs_commit=args.vcs_commit,
                          build_version=args.build_version, device_tags=args.device_tags,
-                         applications_url=args.applications_url,
+                         applications_url=args.applications_url, build_tags=args.build_tags,
                          app_changeid=args.app_changeid, app_patchset=args.app_patchset, app_branch=args.app_branch)
 
     if args.job_file is None: