From d5b7f9c993c47e2ac7ec5580fc33b1707a541d12 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 25 Oct 2017 00:32:36 +0000
Subject: [PATCH] Move the dist.abicheck blacklist to a group_var.

---
 inventory/group_vars/taskotron-dev                              | 1 +
 inventory/group_vars/taskotron-prod                             | 1 +
 inventory/group_vars/taskotron-stg                              | 1 +
 .../taskotron/taskotron-trigger/templates/trigger_rules.yml.j2  | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index 637ca04085..b96792c0b6 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -48,6 +48,7 @@ resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.
 taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/
 # make sure this doesn't have a trailing slash
 trigger_distgit_repo_url: git://pkgs02.phx2.fedoraproject.org
+trigger_abicheck_blacklist: [firefox,thunderbird,kernel,kdelibs,kdepim,qt,mariadb,java-1.8.0-openjdk,libreoffice]
 instances:
   - { name: "Production", url: "https://taskotron.fedoraproject.org"}
   - { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"}
diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron-prod
index 5bb463bf80..10a2cd8a67 100644
--- a/inventory/group_vars/taskotron-prod
+++ b/inventory/group_vars/taskotron-prod
@@ -44,6 +44,7 @@ resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb
 resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0
 taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/
 trigger_distgit_repo_url: git://pkgs02.phx2.fedoraproject.org
+trigger_abicheck_blacklist: [firefox,thunderbird,kernel,kdelibs,kdepim,qt,mariadb,java-1.8.0-openjdk,libreoffice]
 instances:
   - { name: "Production", url: "https://taskotron.fedoraproject.org"}
   - { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"}
diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg
index a9d54989c1..1b57e0633e 100644
--- a/inventory/group_vars/taskotron-stg
+++ b/inventory/group_vars/taskotron-stg
@@ -51,6 +51,7 @@ taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/
 # make sure this doesn't have a trailing slash
 trigger_distgit_repo_url: https://src.stg.fedoraproject.org/
 trigger_critpath_url: https://admin.stg.fedoraproject.org/pkgdb/api/critpath?format=json
+trigger_abicheck_blacklist: [firefox,thunderbird,kernel,kdelibs,kdepim,qt,mariadb,java-1.8.0-openjdk,libreoffice]
 
 instances:
   - { name: "Production", url: "https://taskotron.fedoraproject.org"}
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index d652499990..57d745e873 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -14,7 +14,7 @@
 {% if deployment_type in ['stg', 'prod'] %}
       $in: ${critpath_pkgs}
 {% endif %}
-      $nin: [firefox,thunderbird,kernel,kdelibs,kdepim,qt,mariadb,java-1.8.0-openjdk,libreoffice]
+      $nin: {{ trigger_abicheck_blacklist }}
   do:
     - {tasks: [abicheck]}