From da911be7cd0ad229bb0160fe60d4fe66541b4c64 Mon Sep 17 00:00:00 2001
From: Martin Krizek <mkrizek@redhat.com>
Date: Fri, 10 Mar 2017 08:36:32 +0000
Subject: [PATCH] taskotron-dev: revert experimental changes

---
 inventory/group_vars/taskotron-dev-client-hosts               | 4 ++--
 roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2    | 2 +-
 .../taskotron-trigger/templates/trigger_rules.yml.j2          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inventory/group_vars/taskotron-dev-client-hosts b/inventory/group_vars/taskotron-dev-client-hosts
index a77f1a872b..88764f06f8 100644
--- a/inventory/group_vars/taskotron-dev-client-hosts
+++ b/inventory/group_vars/taskotron-dev-client-hosts
@@ -40,8 +40,8 @@ taskotron_fas_password: ''
 execdb_external_url: https://taskotron-dev.fedoraproject.org/execdb
 resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0
 bodhi_server: https://bodhi.fedoraproject.org/
-kojihub_url: https://koji.stg.fedoraproject.org/kojihub
-kojipkg_url: https://kojipkgs.stg.fedoraproject.org/packages
+kojihub_url: https://koji.fedoraproject.org/kojihub
+kojipkg_url: https://kojipkgs.fedoraproject.org/packages
 taskotron_master: https://taskotron-dev.fedoraproject.org/taskmaster
 resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb
 artifacts_base_url: https://taskotron-dev.fedoraproject.org/artifacts
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
index ecdd1c1aaf..814b15efc8 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
@@ -12,7 +12,7 @@ joblog_file = {{ trigger_joblog_file }}
 fuse_delay = 900 ; 15 minutes in seconds
 git_cache_dir = {{ trigger_cache_dir }}
 rules_template = {{ trigger_rules_template_path }}
-{% if deployment_type in ['dev', 'stg'] %}
+{% if deployment_type in ['stg'] %}
 deployment_type = stg
 {% endif%}
 
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index 4205903dac..f84effb245 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -31,7 +31,7 @@
 {% else %}
     - {tasks: [depcheck]}
 {% endif %}
-{% if deployment_type not in ['dev', 'stg'] %}
+{% if deployment_type not in ['stg'] %}
 {# stg bodhi doesn't have the info we need, stg koji doesn't have the builds from prod bodhi #}
 - when:
     message_type: KojiTagChanged
@@ -39,7 +39,7 @@
   do:
     - {tasks: [upgradepath]}
 {% endif %}
-{% if deployment_type in ['dev', 'stg'] %}
+{% if deployment_type in ['stg'] %}
 - when: {message_type: DistGitCommit, namespace: modules}
   do:
     - {tasks: [check_modulemd]}