diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2019-05-02 12:01:38 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-05-03 12:03:52 +0000 |
| commit | 9f65834ede3dc27716ff0de154a23551d155dc18 (patch) | |
| tree | a36e36177bd0d5c7eb314973a6e8895783109164 /utils/agljobtemplate.py | |
| parent | 639d305a82d80cbee0b9fd2d25b6020f3ad9e003 (diff) | |
utils/agljobtemplate.py: Fix APPURL generation
The generated APPURL was invalid:
- it needed to be always using ci
- it missed branch and arches path
This patch move the generation of the application url in the jinja file
for accessing the new sdk_arch
Bug-AGL: SPEC-1850
Change-Id: Ie3ffff5f6181fdc89c3ebbd41078e4d60a06992b
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
Diffstat (limited to 'utils/agljobtemplate.py')
| -rw-r--r-- | utils/agljobtemplate.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index e18e10f..90ff82c 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -136,20 +136,21 @@ class Agljobtemplate(object): if applications_url is None: app_url_base = '' - for section in defaults: + # WGT will be always uploaded in ci + appdefaults, appinfra = parse_cfg_file(self._template_path, 'default.cfg', 'ci') + for section in appdefaults: if section[0] == "urlbase": app_url_base = section[1] - app_url_fragment = '' - - if app_changeid is not None: - app_url_fragment += app_changeid + '/' + app_patchset - applications_url = urlparse.urljoin(app_url_base, app_url_fragment) + job['app_changeid'] = app_changeid + job['app_patchset'] = app_patchset + job['app_url_base'] = app_url_base + job['APPURL'] = 'automatic' + else: + job['APPURL'] = applications_url device_tags = ' '.join(device_tags) job['DEVICE_TAGS'] = device_tags - if applications_url is not None: - job['APPURL'] = applications_url test_templates = [] # If the user doesn't specify tests, use the default ones from the build-type |