diff options
| author |   Loys Ollivier <lollivier@baylibre.com> | 2017-11-07 09:49:23 +0100 |
|---|---|---|
| committer | Loys Ollivier <lollivier@baylibre.com> | 2017-11-07 09:49:23 +0100 |
| commit | 94e09df869c8e6a6ed739a94fbca54348b51705f (patch) | |
| tree | dc9e55febff364885f5667cca19f0f1e45fe93e3 | |
| parent | 0855174575132875ad3188022aeddeb79e07d071 (diff) | |
Fix AGL build version
Fix the defaulted build version if not set from command line.
Change-Id: Ia61dca57abad29cd9e1305bfead15e75c81e06f4
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
| -rw-r--r-- | utils/agljobtemplate.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index b4d44af..be46e92 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -94,6 +94,10 @@ class Agljobtemplate(object): # If not a full url, read from config file url_base, infra = parse_url_file(self._template_path, 'default.cfg', url) if infra == 'AGL': + # If not set, create a build_version from other args + if (not build_version) and (url_branch) and (url_version): + build_version = 'AGL-' + url + '-' + url_branch + '-' + url_version + url_fragment = '' if (url != 'default'): url_fragment += url_branch + '/' + url_version + '/' @@ -112,9 +116,6 @@ class Agljobtemplate(object): job['test_templates'] = test_templates - if (not build_version) and (url_branch) and (url_version): - build_version = 'AGL-' + url + '-' + url_branch + '-' + url_version - if build_version is not None: job['kernel_version'] = build_version |