From 38bc484a19a94cb14f693da753b73e77c7dae276 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Aug 2017 21:27:12 +0000 Subject: [PATCH] Hold greenwave policy in the config map. --- .../openshift-apps/greenwave/files/buildconfig.yml | 2 -- .../greenwave/templates/configmap.yml | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/roles/openshift-apps/greenwave/files/buildconfig.yml b/roles/openshift-apps/greenwave/files/buildconfig.yml index ee6b99e60c..27b61c271e 100644 --- a/roles/openshift-apps/greenwave/files/buildconfig.yml +++ b/roles/openshift-apps/greenwave/files/buildconfig.yml @@ -21,8 +21,6 @@ spec: python2-flask RUN git clone -b startup-logging https://pagure.io/greenwave.git /srv/greenwave RUN ln -s /etc/greenwave/settings.py /srv/greenwave/conf/settings.py - RUN mkdir -p /etc/greenwave/policies/ - RUN ln -s /srv/greenwave/conf/policies/fedora.yaml /etc/greenwave/policies/fedora.yaml WORKDIR /srv/greenwave EXPOSE 8080 ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app diff --git a/roles/openshift-apps/greenwave/templates/configmap.yml b/roles/openshift-apps/greenwave/templates/configmap.yml index e60a8278b1..97bba6feb9 100644 --- a/roles/openshift-apps/greenwave/templates/configmap.yml +++ b/roles/openshift-apps/greenwave/templates/configmap.yml @@ -11,4 +11,15 @@ data: PORT = 8080 WAIVERDB_API_URL = 'https://waiverdb-stg-web-waiverdb.app.os.stg.fedoraproject.org/api/v1.0' DEBUG = False - POLICIES_DIR = '/etc/greenwave/policies/' + POLICIES_DIR = '/etc/greenwave/' + fedora.yaml: |- + id: "taskotron_release_critical_tasks" + product_versions: + - fedora-27 + - fedora-26 + - fedora-25 + decision_context: bodhi_update_push_stable + rules: + - !PassingTestCaseRule {test_case_name: dist.abicheck} + - !PassingTestCaseRule {test_case_name: dist.rpmdeplint} + - !PassingTestCaseRule {test_case_name: dist.upgradepath}