From ef79bdd6b19ef338cc0bbb5131dfefea766a7d55 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Fri, 10 Jul 2015 09:30:28 +0000 Subject: [PATCH] taskotron-dev-clients: add artifacts_baseurl and resultsdb_frontend conf opts --- inventory/group_vars/taskotron-dev-clients | 10 ++++++---- .../taskotron-client/templates/taskotron.yaml.j2 | 12 ++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/taskotron-dev-clients b/inventory/group_vars/taskotron-dev-clients index ad4b105c47..b3f2885869 100644 --- a/inventory/group_vars/taskotron-dev-clients +++ b/inventory/group_vars/taskotron-dev-clients @@ -5,11 +5,13 @@ num_cpus: 2 slave_user: buildslave taskotron_fas_user: taskotron -execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb/ -resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0/ -bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi/ +execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb +resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 +bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi kojihub_url: http://koji.fedoraproject.org/kojihub -taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster/ +taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster +resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb +artifacts_base_url: http://taskotron-dev.fedoraproject.org/artifacts deployment_type: dev slave_home: /home/buildslave/ slave_dir: /home/buildslave/slave diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 index 63165e262d..d7edaeac50 100644 --- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 @@ -55,12 +55,24 @@ bodhi_server: {{ bodhi_server }} ## URL of ResultsDB server API interface, which can store all test results resultsdb_server: {{ resultsdb_server }} +{% if deployment_type == 'dev' %} +## URL of ResultsDB frontend, which displays results from ResultsDB. +## Please make sure the URL doesn't have a trailing slash. +resultsdb_frontend: {{ resultsdb_external_url }} +{% endif %} + ## URL of ExecDB server API interface, which tracks task execution status execdb_server: {{ execdb_external_url }} ## URL of taskotron buildmaster taskotron_master: {{ taskotron_master }} +{% if deployment_type == 'dev' %} +## URL of artifacts base directory, to construct artifacts URLs from. +## Please make sure the URL doesn't have a trailing slash. +artifacts_baseurl: {{ artifacts_base_url }} +{% endif %} + ## name of step in buildbot that executes the task buildbot_task_step: 'runtask'