From 223394c59690707a528fa512a61db8d95f117660 Mon Sep 17 00:00:00 2001
From: lollivier <lollivier@baylibre.com>
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 <lollivier@baylibre.com>
---
 templates/URLs/default.cfg              | 11 +++++++++++
 templates/base/agl-base-defaults.jinja2 |  3 +--
 templates/machines/m3ulcb.jinja2        |  1 -
 templates/machines/porter.jinja2        |  1 -
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 templates/URLs/default.cfg

(limited to 'templates')

diff --git a/templates/URLs/default.cfg b/templates/URLs/default.cfg
new file mode 100644
index 0000000..4c2adec
--- /dev/null
+++ b/templates/URLs/default.cfg
@@ -0,0 +1,11 @@
+[infra]
+style = AGL
+[default]
+urlbase = https://download.automotivelinux.org/AGL/release/dab/4.0.2/
+[release]
+urlbase = https://download.automotivelinux.org/AGL/release/
+[weekly]
+[daily]
+urlbase = https://download.automotivelinux.org/AGL/snapshots/
+[ci]
+urlbase = https://download.automotivelinux.org/AGL/upload/ci/
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") %}
diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2
index 16a3e76..41b6677 100644
--- a/templates/machines/m3ulcb.jinja2
+++ b/templates/machines/m3ulcb.jinja2
@@ -2,7 +2,6 @@
 {%- set device_arch = "arm64" %}
 {%- set device_mach = "renesas" %}
 {%- set device_type = "r8a7796-m3ulcb" %}
-{%- set dl_dir = "m3ulcb-nogfx" %}
 {%- set dtb = dtb|default("Image-r8a7796-m3ulcb.dtb") %}
 {%- set kernel_image = kernel_image|default("Image") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
diff --git a/templates/machines/porter.jinja2 b/templates/machines/porter.jinja2
index 1ad6e7b..b455922 100644
--- a/templates/machines/porter.jinja2
+++ b/templates/machines/porter.jinja2
@@ -1,6 +1,5 @@
 {%- extends 'boot/generic-uboot-tftp.jinja2' %}
 {%- set device_type = "renesas-porter-uboot" %}
-{%- set dl_dir = "porter-nogfx" %}
 {%- set dtb = dtb|default("uImage-r8a7791-porter.dtb") %}
 {%- set initrd = initrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
-- 
cgit 1.2.3-korg