From a4b9280479fa381f8ee5d610ff03ef171cc6ed96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20P=C3=A1ral?= <kparal@redhat.com>
Date: Fri, 19 Jan 2018 10:21:37 +0100
Subject: [PATCH] taskotron-trigger: merge trigger rules

---
 .../templates/trigger_rules.yml.j2            | 22 ++++++++-------
 .../templates/trigger_rules.yml.j2.dev        | 27 -------------------
 2 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev

diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index da91b20a27..c155f5d946 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -3,10 +3,6 @@
   do:
     - {tasks: [rpmlint, rpmgrill, python-versions]}
 
-- when: {message_type: KojiBuildPackageCompleted, name: docker}
-  do:
-    - {tasks: [dockerautotest]}
-
 - when:
     message_type: KojiBuildPackageCompleted
     name:
@@ -24,17 +20,24 @@
   do:
     - {tasks: [check_modulemd]}
 
-- when:
-    message_type: ModuleBuildComplete
-  do:
-    - {tasks: [modularity-testing-framework]}
-
 - when:
     message_type: GitHubPullRequestOpened
     repo_name: {$regex: '/^container-images\/.+/'}
   do:
     - {tasks: [mtf-containers]}
 
+{% if deployment_type in ['stg', 'prod'] %}
+{# these tasks are not ansiblized yet #}
+- when:
+    message_type: ModuleBuildComplete
+  do:
+    - {tasks: [modularity-testing-framework]}
+
+- when: {message_type: KojiBuildPackageCompleted, name: docker}
+  do:
+    - {tasks: [dockerautotest]}
+{% endif %}
+
 {# disabled due to missing nested virt: https://pagure.io/taskotron/issue/239
 - when:
     message_type: AtomicCompose
@@ -46,4 +49,3 @@
   do:
     - {tasks: [fedora-cloud-tests]}
 #}
-
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev
deleted file mode 100644
index 43da94c0fb..0000000000
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- when: {message_type: KojiBuildPackageCompleted}
-  do:
-    - {tasks: [rpmlint, rpmgrill, python-versions]}
-
-- when:
-    message_type: KojiBuildPackageCompleted
-    name:
-      $nin: [{{ trigger_abicheck_blacklist | join(',') }}]
-  do:
-    - {tasks: [abicheck]}
-
-- when:
-    message_type: KojiTagChanged
-    tag: {$regex: '/^f[0-9]{2}-updates(-testing)?-pending$$/'}
-  do:
-    - {tasks: [rpmdeplint]}
-
-- when: {message_type: DistGitCommit, namespace: modules}
-  do:
-    - {tasks: [check_modulemd]}
-
-- when:
-    message_type: GitHubPullRequestOpened
-    repo_name: {$regex: '/^container-images\/.+/'}
-  do:
-    - {tasks: [mtf-containers]}