From 798580a53aa3537f0c1127ed258dab21a92f5665 Mon Sep 17 00:00:00 2001 From: Loys Ollivier Date: Wed, 8 Nov 2017 10:59:53 +0100 Subject: Callback procedure update New callback procedure. Now the arguments are: - '--callback-from' LAVA lab - '--callback-to' kCI instance This new procedure helps differentiating the lab and the kCI target. Callback config files updated accordingly. Documentation on callback updated. Change-Id: I41b9dc86e33783f1d6a8164fc783557c81678c7f Signed-off-by: Loys Ollivier --- templates/callback/callback_readme.md | 37 +++++++++++++++++++++++++++++ templates/callback/callback_readme.txt | 19 --------------- templates/callback/lab-agl-core.cfg | 10 +++++++- templates/callback/lab-baylibre-lavabox.cfg | 4 ---- templates/callback/lab-baylibre-legacy.cfg | 10 +++++++- 5 files changed, 55 insertions(+), 25 deletions(-) create mode 100644 templates/callback/callback_readme.md delete mode 100644 templates/callback/callback_readme.txt delete mode 100644 templates/callback/lab-baylibre-lavabox.cfg (limited to 'templates/callback') diff --git a/templates/callback/callback_readme.md b/templates/callback/callback_readme.md new file mode 100644 index 0000000..73c4c82 --- /dev/null +++ b/templates/callback/callback_readme.md @@ -0,0 +1,37 @@ +## Using --callback-* arguments ## +- - - - + +For each LAVA lab target, a configuration file must be created in this repo. +The file name must correspond to the LAVA lab name as registered in KernelCI.\ +Using the argument "--callback-from LAB_NAME", the script will search for a file called "LAB_NAME.cfg" in this folder.\ +Using the argument "--callback-to KCI_NAME", the script will search in the previous cfg file for a section called KCI_NAME. This section must contain three fields described below. + +### Requirements: ### + +* Filetype: .cfg +* Filename: .cfg + * [default] section + * section = "The section containing the callback data to use by default" + * [CUSTOM] section + * backend_fqdn = "The FQDN of the kernelCI backend to callback" + * lab_name = "The lab name as registered for the kernelCI backend" + * lab_token = "The kernelCI backend lab token. Usually this is the 'LAVA description' string as shorthand of the token. Alternatively it can be the token itself." + +Example file: _lab-mylab.cfg_ +``` +[default] +section = centralized-kci + +[centralized-kci] +backend_fqdn = http(s)://api.centralized-kci.org +lab_name = lab-my-lab +lab_token = lab-my-lab-callback-centralized-kci + +[my-dev-kci] +backend_fqdn = http(s)://api.my-dev-kci.org +lab_name = lab-my-lab +lab_token = f1d130b4-8198-4d34-9841-bad7d4ea64d9 +``` + +_Warning:_\ +If the lab_token is a LAVA description string, make sure that the actual token is registered in the LAVA interface and matches this string. diff --git a/templates/callback/callback_readme.txt b/templates/callback/callback_readme.txt deleted file mode 100644 index 7bfed0d..0000000 --- a/templates/callback/callback_readme.txt +++ /dev/null @@ -1,19 +0,0 @@ -## The callbacks info must be in this repo ## -- - - - - -### Requirements: ### - -* Filetype: .cfg -* Filename: .cfg - * [default] section - * backend_fqdn = "The FQDN of the kernelCI backend to callback" - * lab_name = "The lab name as registered for the kernelCI backend" - * lab_token = "The kernelCI backend lab token" - -Example file: lab-mylab.cfg -` -[default] -backend_fqdn = http(s)://api.mylab.com -lab_name = lab-mylab -lab_token = 123g5789-45f4-4f21-a485-7412589df235 -` diff --git a/templates/callback/lab-agl-core.cfg b/templates/callback/lab-agl-core.cfg index 6be0098..08df284 100644 --- a/templates/callback/lab-agl-core.cfg +++ b/templates/callback/lab-agl-core.cfg @@ -1,4 +1,12 @@ [default] +section = AGL + +[AGL] +backend_fqdn = http://kernelci.automotivelinux.org:8888 +lab_name = AGL-core-lab-1 +lab_token = lab-agl-core-callback-LF + +[Baylibre] backend_fqdn = http://api.dev.baylibre.com lab_name = lab-agl-core -lab_token = lab-agl-core-callback +lab_token = lab-agl-core-callback-baylibre \ No newline at end of file diff --git a/templates/callback/lab-baylibre-lavabox.cfg b/templates/callback/lab-baylibre-lavabox.cfg deleted file mode 100644 index e8b849e..0000000 --- a/templates/callback/lab-baylibre-lavabox.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[default] -backend_fqdn = http://api.lavabox -lab_name = lab-baylibre-lavabox -lab_token = callback-demo diff --git a/templates/callback/lab-baylibre-legacy.cfg b/templates/callback/lab-baylibre-legacy.cfg index c9e38b5..e5ac5a0 100644 --- a/templates/callback/lab-baylibre-legacy.cfg +++ b/templates/callback/lab-baylibre-legacy.cfg @@ -1,4 +1,12 @@ [default] +section = AGL + +[AGL] +backend_fqdn = http://kernelci.automotivelinux.org:8888 +lab_name = lab-baylibre +lab_token = lab-baylibre-legacy-callback-LF + +[Baylibre] backend_fqdn = http://api.dev.baylibre.com lab_name = lab-baylibre-legacy -lab_token = lab-baylibre-legacy-callback +lab_token = lab-baylibre-legacy-callback-baylibre \ No newline at end of file -- cgit 1.2.3-korg