taskotron: upgrade production to F29

roles/taskotron/taskotron-trigger/tasks/main.yml

@@ -5,7 +5,6 @@
     - fedmsg
     - fedmsg-hub
     - taskotron-trigger
-    - python2-resultsdb_api  # TODO: remove when transition to buildbot 1.7 is complete
     - python3-resultsdb_api
   when: ansible_cmdline.ostree is not defined
 
@@ -16,19 +15,6 @@
     - trigger.cfg.j2
   notify:
     - restart fedmsg-hub-3
-  when: deployment_type in ['dev', 'stg']
-
-###########
-## TODO: remove when transition to buildbot 1.7 is complete
-- name: generate trigger configuration
-  template: src={{ item }} dest=/etc/taskotron/trigger.cfg owner=root group=root mode=0744
-  with_first_found:
-    - trigger.cfg.j2.{{ deployment_type }}
-    - trigger.cfg.j2
-  notify:
-    - restart fedmsg-hub
-  when: deployment_type in ['prod']
-###########
 
 - name: generate trigger rules
   template: src={{ item }} dest=/etc/taskotron/trigger_rules.yml owner=root group=root mode=0744
@@ -37,34 +23,11 @@
     - trigger_rules.yml.j2
   notify:
     - restart fedmsg-hub-3
-  when: deployment_type in ['dev', 'stg']
-
-###########
-## TODO: remove when transition to buildbot 1.7 is complete
-- name: generate trigger rules
-  template: src={{ item }} dest=/etc/taskotron/trigger_rules.yml owner=root group=root mode=0744
-  with_first_found:
-    - trigger_rules.yml.j2.{{ deployment_type }}
-    - trigger_rules.yml.j2
-  notify:
-    - restart fedmsg-hub
-  when: deployment_type in ['prod']
-#########
 
 - name: copy fedmsg logging configuration
   copy: src=logging.py dest=/etc/fedmsg.d/logging.py owner=root group=root mode=0744
   notify:
     - restart fedmsg-hub-3
-  when: deployment_type in ['dev', 'stg']
-
-###########
-## TODO: remove when transition to buildbot 1.7 is complete
-- name: copy fedmsg logging configuration
-  copy: src=logging.py dest=/etc/fedmsg.d/logging.py owner=root group=root mode=0744
-  notify:
-    - restart fedmsg-hub
-  when: deployment_type in ['prod']
-###########
 
 - name: install fetch_activity
   copy: src=fetch_activity.py dest=/root/fetch_activity.py owner=root group=root mode=0644
@@ -82,11 +45,3 @@
 
 - name: start and enable fedmsg-hub-3 service
   service: name=fedmsg-hub-3 enabled=yes state=started
-  when: deployment_type in ['dev', 'stg']
-
-###########
-## TODO: remove when transition to buildbot 1.7 is complete
-- name: start and enable fedmsg-hub service
-  service: name=fedmsg-hub enabled=yes state=started
-  when: deployment_type in ['prod']
-###########

roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2

@@ -1,5 +1,5 @@
 [buildbot]
-url = http://127.0.0.1:8080/change_hook
+url = http://127.0.0.1:8010/change_hook
 
 [trigger]
 valid_arches = x86_64,armhfp

roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.dev

@@ -1,23 +0,0 @@
-[buildbot]
-url = http://127.0.0.1:8010/change_hook
-
-[trigger]
-valid_arches = x86_64,armhfp
-koji_url = http://koji.fedoraproject.org/kojihub
-datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw
-execdb_server = {{ execdb_server }}
-runner_type = BuildbotRunner
-job_logging = True
-joblog_file = {{ trigger_joblog_file }}
-fuse_delay = 900 ; 15 minutes in seconds
-git_cache_dir = {{ trigger_cache_dir }}
-rules_template = {{ trigger_rules_template_path }}
-{# enable this if you want taskotron-stg to react to just stg fedmsgs
-{% if deployment_type in ['stg'] %}
-deployment_type = stg
-{% endif%}
-#}
-
-[koji_build_completed]
-; critpath_filepath = {{ trigger_critpath_file }}
-critpath_filepath =

roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.stg

@@ -1,23 +0,0 @@
-[buildbot]
-url = http://127.0.0.1:8010/change_hook
-
-[trigger]
-valid_arches = x86_64,armhfp
-koji_url = http://koji.fedoraproject.org/kojihub
-datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw
-execdb_server = {{ execdb_server }}
-runner_type = BuildbotRunner
-job_logging = True
-joblog_file = {{ trigger_joblog_file }}
-fuse_delay = 900 ; 15 minutes in seconds
-git_cache_dir = {{ trigger_cache_dir }}
-rules_template = {{ trigger_rules_template_path }}
-{# enable this if you want taskotron-stg to react to just stg fedmsgs
-{% if deployment_type in ['stg'] %}
-deployment_type = stg
-{% endif%}
-#}
-
-[koji_build_completed]
-; critpath_filepath = {{ trigger_critpath_file }}
-critpath_filepath =