From a615d681269433fcc0574cbbbdf972c0752d930f Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Mon, 2 Jul 2018 11:17:44 +1000
Subject: [PATCH] greenwave: add subject_type key to policies for upcoming 0.8
 release

In Greenwave 0.8 (not released yet) subject_type will replace
relevance_key and relevance_value:

https://docs.pagure.org/greenwave/release-notes.html#next-release

Add the appropriate subject_type keys to all policies so that we can
roll out the latest code to staging.

This is not wrapped in a conditional because older versions of Greenwave
will just ignore the new subject_type key, while newer versions of
Greenwave will ignore the relevance_key and relevance_value keys.

Later, once Greenwave 0.8 is released and rolled out in stage and prod,
we can remove the relevance_key and relevance_value from the policies.
---
 roles/openshift-apps/greenwave/templates/configmap.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/roles/openshift-apps/greenwave/templates/configmap.yml b/roles/openshift-apps/greenwave/templates/configmap.yml
index ce37141fae..95d66f1642 100644
--- a/roles/openshift-apps/greenwave/templates/configmap.yml
+++ b/roles/openshift-apps/greenwave/templates/configmap.yml
@@ -40,6 +40,7 @@ data:
     product_versions:
       - fedora-rawhide
     decision_context: rawhide_compose_sync_to_mirrors
+    subject_type: compose
     blacklist: []
     rules:
       - !PassingTestCaseRule {test_case_name: compose.cloud.all}
@@ -100,6 +101,7 @@ data:
       - fedora-26
     decision_context: bodhi_update_push_testing
     blacklist: []
+    subject_type: koji_build
     relevance_value: koji_build
 {% if env == 'staging' %}
     rules:
@@ -115,6 +117,7 @@ data:
       - fedora-26
     decision_context: bodhi_update_push_stable
     blacklist: []
+    subject_type: koji_build
     relevance_value: koji_build
 {% if env == 'staging' %}
     rules:
@@ -130,6 +133,7 @@ data:
       - fedora-epel-6
     decision_context: bodhi_update_push_testing
     blacklist: []
+    subject_type: koji_build
     relevance_value: koji_build
     rules: []
     --- !Policy
@@ -140,6 +144,7 @@ data:
       - fedora-epel-6
     decision_context: bodhi_update_push_stable
     blacklist: []
+    subject_type: koji_build
     relevance_value: koji_build
     rules: []
     --- !Policy
@@ -152,6 +157,7 @@ data:
       - fedora-26
     decision_context: bodhi_update_push_testing
     blacklist: []
+    subject_type: koji_build
     relevance_key: original_spec_nvr
 {% if env == 'staging' %}
     rules:
@@ -170,6 +176,7 @@ data:
       - fedora-26
     decision_context: bodhi_update_push_stable
     blacklist: []
+    subject_type: koji_build
     relevance_key: original_spec_nvr
 {% if env == 'staging' %}
     rules: