From 7f96b359f73b83ae6abd85830fae2f90406d0d67 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Thu, 2 Mar 2017 17:48:56 +0000
Subject: [PATCH] starting to  move taskotron-dev over to stg msgbus and stg
 koji

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

diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index d44cca4e77..6a5bb05177 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -14,6 +14,9 @@ robots_path: /var/www/html
 # this enables extra repos during dnf operations
 extra_enablerepos: 'infrastructure-testing'
 
+# make sure we're listening to stg fedmsg
+env: staging
+
 
 ############################################################
 # task repo details
@@ -32,6 +35,7 @@ grokmirror_repos:
   - { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/task-python-versions'}
   - { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
   - { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
+  - { name: fedoraqa/rpmlint-scratch, url: 'https://bitbucket.org/fedoraqa/task-rpmlint-scratch.git'}
 grokmirror_default_branch: develop
 
 
diff --git a/inventory/group_vars/taskotron-dev-client-hosts b/inventory/group_vars/taskotron-dev-client-hosts
index 88764f06f8..a77f1a872b 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.fedoraproject.org/kojihub
-kojipkg_url: https://kojipkgs.fedoraproject.org/packages
+kojihub_url: https://koji.stg.fedoraproject.org/kojihub
+kojipkg_url: https://kojipkgs.stg.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 d5abb52f8f..921ddc2337 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
@@ -12,6 +12,9 @@ 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'] %}
+deployment_type = stg
+{% endif%}
 
 [koji_build_completed]
 critpath_filepath = {{ trigger_critpath_file }}
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index 21723f6f3d..d7c5575f0c 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -40,4 +40,10 @@
 - when: {message_type: DistGitCommit, namespace: modules}
   do:
     - {tasks: [check_modulemd]}
+
+# trigger off of scratch builds in dev
+- when: {message_type: KojiTaskCompleted}
+  do:
+    - {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}.git', branch: "${distgit_branch}", fallback_branch: 'master'}}
+    - {tasks: [rpmlint-scratch]}
 {% endif %}