Merge branch 'master' of /git/ansible

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]}
 #}
-

roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev

@@ -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]}