From 223394c59690707a528fa512a61db8d95f117660 Mon Sep 17 00:00:00 2001 From: lollivier Date: Mon, 30 Oct 2017 16:08:23 +0100 Subject: New machine, url, branch, version arguments - Machine is now a mandatory argument: --machine - Change in the URL scheme usage: Now the argument is --url, it should be used with --branch & --version (or --changeid and --patchset which are aliases). The default url is the latest AGL release (dab - 4.0.2) - Build version is derived from the URL, branch and version if not set through command line. Example usage: ./utils/create-jobs.py --machine m3ulcb ./utils/create-jobs.py --machine qemux86-64 ./utils/create-jobs.py --url release --branch eel --version 4.99.1 --machine m3ulcb ./utils/create-jobs.py --url release --branch eel --version 4.99.1 --machine qemux86-64 ./utils/create-jobs.py --url daily --branch master --version latest --machine m3ulcb ./utils/create-jobs.py --url daily --branch master --version latest --machine raspberrypi3 ./utils/create-jobs.py --url ci --changeid 11533 --patchset 2 --machine raspberrypi3 ./utils/create-jobs.py --url ci --changeid 11533 --patchset 2 --machine m3ulcb ./utils/create-jobs.py --url http://baylibre.com/pub/agl/ci/raspberrypi3 --machine raspberrypi3 Update the README.md following changes on the url scheme and --machine argument. Bug-AGL: SPEC-975 Change-Id: Idd0d539627d56e8d28e1e4990570a929b3fa0f5d Signed-off-by: lollivier --- templates/base/agl-base-defaults.jinja2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'templates/base/agl-base-defaults.jinja2') diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index 462fb86..d432b63 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -1,12 +1,11 @@ {%- macro baseurl(object) -%} -{{ urlbase }}/{{ dl_dir }}/{{ object }} +{{ urlbase }}/{{ object }} {%- endmacro %} {%- set action_timeout = action_timeout|default(15) %} {%- set boot_timeout = boot_timeout|default(10) %} {%- set connection_timeout = connection_timeout|default(5) %} {%- set deploy_timeout = deploy_timeout|default(15) %} {%- set device_type = device_type|default(yocto_machine+"-uboot") %} -{%- set dl_dir = dl_dir|default(yocto_machine) %} {%- set image_type = image_type|default("AGL") %} {%- set job_timeout = job_timeout|default(30) %} {%- set kernel_defconfig = kernel_defconfig|default("defconfig+CONFIG_AGL=y") %} -- cgit 1.2.3-korg