Merge branch 'master' of /git/ansible

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

@@ -2,7 +2,7 @@
 url = http://127.0.0.1:8080/change_hook
 
 [trigger]
-valid_arches = x86_64
+valid_arches = x86_64,armhfp
 koji_url = http://koji.fedoraproject.org/kojihub
 datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw
 execdb_server = {{ execdb_server }}

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

@@ -1,23 +0,0 @@
-[buildbot]
-url = http://127.0.0.1:8080/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 }}
-

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

@@ -2,10 +2,13 @@
 - when:
     message_type: KojiBuildPackageCompleted
   do:
+    - tasks:
+        - rpmlint
     - tasks:
         - python-versions
         - rpmgrill
-        - rpmlint
+      arches:
+        - noarch
 
 - when:
     message_type: KojiBuildPackageCompleted
@@ -29,6 +32,8 @@
   do:
     - tasks:
         - check_modulemd
+      arches:
+        - noarch
 
 - when:
     message_type: GitHubPullRequestOpened
@@ -37,3 +42,6 @@
   do:
     - tasks:
         - mtf-containers
+      arches:
+        - noarch
+

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

@@ -1,47 +0,0 @@
----
-- when:
-    message_type: KojiBuildPackageCompleted
-  do:
-    - tasks:
-        - rpmlint
-    - tasks:
-        - python-versions
-        - rpmgrill
-      arches:
-        - noarch
-
-- 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
-      arches:
-        - noarch
-
-- when:
-    message_type: GitHubPullRequestOpened
-    repo_name:
-      $regex: '/^container-images\/.+/'
-  do:
-    - tasks:
-        - mtf-containers
-      arches:
-        - noarch
-