From ca280ac4f3871d096a87bf40c1ec43296a0fe8de Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Mon, 30 Oct 2017 16:03:31 +1000 Subject: [PATCH] greenwave: fix configmap.yml to make 'oc apply' happy --- .../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 e5402f785b..3c8fac92eb 100644 --- a/roles/openshift-apps/greenwave/templates/configmap.yml +++ b/roles/openshift-apps/greenwave/templates/configmap.yml @@ -112,23 +112,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