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

cleanup of taskotron.yaml template, disabling bodhi comments in taskotron dev/stg

Browse source
This commit is contained in:
Tim Flink 2015-08-19 16:35:55 +00:00
parent fda6ad2848
commit db671e24ad
4 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,7 @@ 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
client_report_to_bodhi: 'False'
############################################################
# task git mirror config

3
inventory/group_vars/taskotron-prod-clients
View file

@ -31,7 +31,7 @@ taskotron_admin_email: taskotron-admin-members@fedoraproject.org
############################################################
taskotron_fas_user: taskotron
taskotron_fas_password: '{{ taskotron_fas_password}}'
taskotron_fas_password: '{{ prod_taskotron_fas_password}}'
execdb_external_url: https://taskotron.fedoraproject.org/execdb/
resultsdb_server: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
@ -42,6 +42,7 @@ taskotron_master: https://taskotron.fedoraproject.org/taskmaster/
resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb
artifacts_base_url: http://taskotron.fedoraproject.org/artifacts
client_report_to_bodhi: 'True'
############################################################
# task git mirror config

2
inventory/group_vars/taskotron-stg-clients
View file

@ -44,6 +44,8 @@ taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/
resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb
artifacts_base_url: http://taskotron.stg.fedoraproject.org/artifacts
client_report_to_bodhi: 'False'
############################################################
# task git mirror config

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

@ -33,11 +33,7 @@ reporting_enabled: True
## If True, test results (for selected tests) will be sent as comments to
## Fedora Update System (Bodhi). This requires that you have Bodhi
## credentials filled in secrets.conf.
{% if deployment_type == 'dev' or deployment_type == 'stg'%}
report_to_bodhi: False
{% else %}
report_to_bodhi: True
{% endif %}
report_to_bodhi: {{ client_report_to_bodhi }}
## Whether to send test results to the configured ResultsDB server.
report_to_resultsdb: True
@ -59,11 +55,9 @@ bodhi_server: {{ bodhi_server }}
## URL of ResultsDB server API interface, which can store all test results
resultsdb_server: {{ resultsdb_server }}
{% if deployment_type == 'dev' or deployment_type == 'stg' %}
## 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 }}
@ -71,11 +65,9 @@ execdb_server: {{ execdb_external_url }}
## URL of taskotron buildmaster
taskotron_master: {{ taskotron_master }}
{% if deployment_type == 'dev' or deployment_type == 'stg' %}
## 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'
@ -104,15 +96,5 @@ buildbot_task_step: 'runtask'
## FAS (Fedora Accounts System) credentials
## These credentials are used when reporting results into Bodhi.
fas_username: '{{ taskotron_fas_user }}'
{% if deployment_type == 'dev' %}
#fas_password: '{{ dev_taskotron_fas_password}}'
fas_password: ''
{% endif %}
{% if deployment_type == 'stg' %}
#fas_password: '{{ stg_taskotron_fas_password}}'
fas_password: ''
{% endif %}
{% if deployment_type == 'prod' %}
fas_password: '{{ taskotron_fas_password }}'
{% endif %}
fas_password: '{{ taskotron_fas_password}}'