From 483a7423e10abce472af7f8cc79a1913789c8274 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 21 Nov 2017 20:35:57 +0000
Subject: [PATCH] Reinstitute greenwave abicheck policy, borrowing taskotron's
 blacklist.

---
 .../greenwave/templates/configmap.yml         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/roles/openshift-apps/greenwave/templates/configmap.yml b/roles/openshift-apps/greenwave/templates/configmap.yml
index a65714489a..a50e157e84 100644
--- a/roles/openshift-apps/greenwave/templates/configmap.yml
+++ b/roles/openshift-apps/greenwave/templates/configmap.yml
@@ -111,23 +111,23 @@ data:
     rules:
       - !PassingTestCaseRule {test_case_name: dist.rpmdeplint}
       - !PassingTestCaseRule {test_case_name: dist.upgradepath}
-    #    --- !Policy
-    #    id: "taskotron_release_critical_tasks_for_stable_with_blacklist"
-    #    product_versions:
-    #      - fedora-27
-    #      - fedora-26
-    #      - fedora-25
-    #    decision_context: bodhi_update_push_stable
-    #    relevance_value: koji_build
-    #    # abicheck only runs on a subset of all packages.  We borrow the list from
-    #    # taskotron's ansible vars.  See discussion in https://pagure.io/greenwave/issue/68
-    #{% if env == 'staging' %}
-    #    blacklist: [{{ hostvars[groups['taskotron-stg'][0]]['trigger_abicheck_blacklist'] | join (',') }}]
-    #{% else %}
-    #    blacklist: [{{ hostvars[groups['taskotron-prod'][0]]['trigger_abicheck_blacklist'] | join (',') }}]
-    #{% endif %}
-    #    rules:
-    #      - !PassingTestCaseRule {test_case_name: dist.abicheck}
+    --- !Policy
+    id: "taskotron_release_critical_tasks_for_stable_with_blacklist"
+    product_versions:
+      - fedora-27
+      - fedora-26
+      - fedora-25
+    decision_context: bodhi_update_push_stable
+    relevance_value: koji_build
+    # abicheck only runs on a subset of all packages.  We borrow the list from
+    # taskotron's ansible vars.  See discussion in https://pagure.io/greenwave/issue/68
+{% if env == 'staging' %}
+    blacklist: [{{ hostvars[groups['taskotron-stg'][0]]['trigger_abicheck_blacklist'] | join (',') }}]
+{% else %}
+    blacklist: [{{ hostvars[groups['taskotron-prod'][0]]['trigger_abicheck_blacklist'] | join (',') }}]
+{% endif %}
+    rules:
+      - !PassingTestCaseRule {test_case_name: dist.abicheck}
     --- !Policy
     # Fedora Atomic CI pipeline
     # http://fedoraproject.org/wiki/CI