Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

taskotron-dev-clients: add artifacts_baseurl and resultsdb_frontend conf opts

Browse source
This commit is contained in:
Martin Krizek 2015-07-10 09:30:28 +00:00
parent ffb6eb3c51
commit ef79bdd6b1
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/group_vars/taskotron-dev-clients
View file

@ -5,11 +5,13 @@ num_cpus: 2
slave_user: buildslave slave_user: buildslave
taskotron_fas_user: taskotron taskotron_fas_user: taskotron
execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb/ execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb
resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0/ resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0
bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi/ bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi
kojihub_url: http://koji.fedoraproject.org/kojihub 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 deployment_type: dev
slave_home: /home/buildslave/ slave_home: /home/buildslave/
slave_dir: /home/buildslave/slave slave_dir: /home/buildslave/slave

12
roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
View file

@ -55,12 +55,24 @@ bodhi_server: {{ bodhi_server }}
## URL of ResultsDB server API interface, which can store all test results ## URL of ResultsDB server API interface, which can store all test results
resultsdb_server: {{ resultsdb_server }} 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 ## URL of ExecDB server API interface, which tracks task execution status
execdb_server: {{ execdb_external_url }} execdb_server: {{ execdb_external_url }}
## URL of taskotron buildmaster ## URL of taskotron buildmaster
taskotron_master: {{ taskotron_master }} 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 ## name of step in buildbot that executes the task
buildbot_task_step: 'runtask' buildbot_task_step: 'runtask'