From db671e24ad14fbc5b3200642d5ed2e5a5951001f Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Wed, 19 Aug 2015 16:35:55 +0000
Subject: [PATCH] cleanup of taskotron.yaml template, disabling bodhi comments
 in taskotron dev/stg

---
 inventory/group_vars/taskotron-dev-clients    |  1 +
 inventory/group_vars/taskotron-prod-clients   |  3 ++-
 inventory/group_vars/taskotron-stg-clients    |  2 ++
 .../templates/taskotron.yaml.j2               | 22 ++-----------------
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/inventory/group_vars/taskotron-dev-clients b/inventory/group_vars/taskotron-dev-clients
index 0dcfdde8b9..6f58e25a57 100644
--- a/inventory/group_vars/taskotron-dev-clients
+++ b/inventory/group_vars/taskotron-dev-clients
@@ -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
diff --git a/inventory/group_vars/taskotron-prod-clients b/inventory/group_vars/taskotron-prod-clients
index 69475003fa..e0619b8508 100644
--- a/inventory/group_vars/taskotron-prod-clients
+++ b/inventory/group_vars/taskotron-prod-clients
@@ -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
diff --git a/inventory/group_vars/taskotron-stg-clients b/inventory/group_vars/taskotron-stg-clients
index 43149e5143..dec72990a2 100644
--- a/inventory/group_vars/taskotron-stg-clients
+++ b/inventory/group_vars/taskotron-stg-clients
@@ -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
diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
index 8e2bd965ef..a8dec5ab0c 100644
--- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
+++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
@@ -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}}'