diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2019-05-15 16:20:24 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2019-05-15 16:22:22 +0200 |
| commit | e0f674a2693507d589d8a43c38496ff80e56d8c7 (patch) | |
| tree | ea54ba78493cceea6b3120523cb9a60d714d9b1e | |
| parent | 1495bc00e56e44059ee05126eda30b2f85c93b58 (diff) | |
SPEC-1850: permit to override master branch for appfw
I have assumed that only master is used for appfw but it is false.
Some app review are done against non-master branch.
This patch adds a way to change the branch used via --app-branch.
Bug-AGL: SPEC-1850
Change-Id: I10c8ad0e5a08158f9c2295692e4b3c266b97b14e
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
| -rw-r--r-- | templates/tests/application-lifecycle.jinja2 | 2 | ||||
| -rw-r--r-- | utils/agljobtemplate.py | 3 | ||||
| -rwxr-xr-x | utils/create-jobs.py | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/templates/tests/application-lifecycle.jinja2 b/templates/tests/application-lifecycle.jinja2 index dc4f1b8..c9e6242 100644 --- a/templates/tests/application-lifecycle.jinja2 +++ b/templates/tests/application-lifecycle.jinja2 @@ -11,5 +11,5 @@ {%- if APPURL != 'automatic' %} APPURL: "{{ APPURL }}" {%- else %} - APPURL: "{{app_url_base}}/{{ app_changeid }}/{{ app_patchset }}/{{ vcs_branch }}/{{ sdk_arch }}" + APPURL: "{{app_url_base}}/{{ app_changeid }}/{{ app_patchset }}/{{ app_branch }}/{{ sdk_arch }}" {%- endif %} diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index 90ff82c..cbf27e7 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -92,7 +92,7 @@ class Agljobtemplate(object): 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="", - applications_url=None, app_changeid=None, app_patchset=None): + applications_url=None, app_changeid=None, app_patchset=None, app_branch=None): if machine not in self.machines: raise RuntimeError("{} is not a available machine".format(machine)) @@ -144,6 +144,7 @@ class Agljobtemplate(object): job['app_changeid'] = app_changeid job['app_patchset'] = app_patchset + job['app_branch'] = app_branch job['app_url_base'] = app_url_base job['APPURL'] = 'automatic' else: diff --git a/utils/create-jobs.py b/utils/create-jobs.py index 463d706..5a0f660 100755 --- a/utils/create-jobs.py +++ b/utils/create-jobs.py @@ -65,6 +65,8 @@ def parse_cmdline(machines, tests, rfs_types): help="An application changeid.", default=None) parser.add_argument('--app-patchset', dest='app_patchset', action='store', help="An application patchset.", default=None) + parser.add_argument('--app-branch', dest='app_branch', action='store', + help="An application branch.", default="master") args = parser.parse_args() @@ -99,7 +101,7 @@ def main(): 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, - app_changeid=args.app_changeid, app_patchset=args.app_patchset) + app_changeid=args.app_changeid, app_patchset=args.app_patchset, app_branch=args.app_branch) if args.job_file is None: print job |