From 8d17d7b07820b1193bcb74e796bcb01c89924b82 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 13 Nov 2019 17:08:13 -0800 Subject: [PATCH] Disable openQA wiki reporter on stg as well See https://pagure.io/fedora-infrastructure/issue/8381 - I'm disabling everything on openQA stg that edits the wiki until that's resolved. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa_stg | 5 +++++ roles/openqa/dispatcher/tasks/main.yml | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/inventory/group_vars/openqa_stg b/inventory/group_vars/openqa_stg index bb2f68cd45..ae72f6e344 100644 --- a/inventory/group_vars/openqa_stg +++ b/inventory/group_vars/openqa_stg @@ -40,6 +40,11 @@ wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json" openqa_wikitcms_hostname: stg.fedoraproject.org openqa_resultsdb_url: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ +# FIXME: disable consumers that write to wiki until auth key +# is working again: +# https://pagure.io/fedora-infrastructure/issue/8381 +openqa_amqp_wiki_reporter_queue: + deployment_type: stg freezes: false diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index 33f4f0d5a8..0ebf13c550 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -348,15 +348,15 @@ - name: Enable and start fedora-messaging scheduler service service: name=fm-consumer@fedora_openqa_scheduler enabled=yes state=started - when: "openqa_amqp_scheduler_queue is defined" + when: "openqa_amqp_scheduler_queue is defined and openqa_amqp_scheduler_queue" - name: Enable and start fedora-messaging wiki reporter service service: name=fm-consumer@fedora_openqa_wiki_reporter enabled=yes state=started - when: "openqa_amqp_wiki_reporter_queue is defined" + when: "openqa_amqp_wiki_reporter_queue is defined and openqa_amqp_wiki_reporter_queue" - name: Enable and start fedora-messaging ResultsDB reporter service service: name=fm-consumer@fedora_openqa_resultsdb_reporter enabled=yes state=started - when: "openqa_amqp_resultsdb_reporter_queue is defined" + when: "openqa_amqp_resultsdb_reporter_queue is defined and openqa_amqp_resultsdb_reporter_queue" - name: Set up cron job to schedule live-respins jobs copy: src=schedule-live-respins.cron dest=/etc/cron.hourly/schedule-live-respins owner=root group=root mode=0755