From 360659dc04e764f0c32b6495468b682f2aa23bda Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Tue, 12 Apr 2016 21:42:01 +0800
Subject: [PATCH] Add the bundle_stream variable for job templates
The bundle_stream variable will allow to easily set the
bundle stream from the profile file for the different
job templates.
This commit also sets the value of such a variable to
the new stream: /public/personal/apertis-validator/
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D2684
---
templates/group-apparmor-tpl.json | 2 +-
templates/group-clutter-tpl.json | 2 +-
templates/group-common-tpl.json | 2 +-
templates/group-folks-tpl.json | 2 +-
templates/group-sdk-tpl.json | 2 +-
templates/minimal-predeployed-1503-target-tpl.json | 2 +-
templates/minimal-tpl.json | 2 +-
templates/profiles.yaml | 1 +
templates/sqlite-tpl.json | 2 +-
9 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index b9edf037..4b2b0bdc 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -168,7 +168,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
diff --git a/templates/group-clutter-tpl.json b/templates/group-clutter-tpl.json
index 0eb041b6..fe1f0e68 100644
--- a/templates/group-clutter-tpl.json
+++ b/templates/group-clutter-tpl.json
@@ -98,7 +98,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index 03a21648..c76b3fbf 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -409,7 +409,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
diff --git a/templates/group-folks-tpl.json b/templates/group-folks-tpl.json
index ca93781d..155b71b8 100644
--- a/templates/group-folks-tpl.json
+++ b/templates/group-folks-tpl.json
@@ -97,7 +97,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index 27c5ce31..9f7876d4 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -87,7 +87,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
diff --git a/templates/minimal-predeployed-1503-target-tpl.json b/templates/minimal-predeployed-1503-target-tpl.json
index 13a3e7b7..f1f7d639 100644
--- a/templates/minimal-predeployed-1503-target-tpl.json
+++ b/templates/minimal-predeployed-1503-target-tpl.json
@@ -38,7 +38,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
diff --git a/templates/minimal-tpl.json b/templates/minimal-tpl.json
index 0a100bb1..f003b190 100644
--- a/templates/minimal-tpl.json
+++ b/templates/minimal-tpl.json
@@ -37,7 +37,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
diff --git a/templates/profiles.yaml b/templates/profiles.yaml
index 29f3e4fd..d5698466 100644
--- a/templates/profiles.yaml
+++ b/templates/profiles.yaml
@@ -12,6 +12,7 @@ main-profile:
fs: btrfs
image_variant: collabora
baseurl: "https://images.apertis.org"
+ bundle_stream: "/public/personal/apertis-validator/"
profiles:
- name: apertis-16.06-daily-minnowboard-max-minimal
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index 6581f20f..fdf310d5 100644
--- a/templates/sqlite-tpl.json
+++ b/templates/sqlite-tpl.json
@@ -62,7 +62,7 @@
{
"command": "submit_results",
"parameters": {
- "stream": "/private/team/Apertis/",
+ "stream": "{{bundle_stream}}",
"server": "https://lava.collabora.co.uk/RPC2/"
}
}
--
GitLab