From 29395d0c96176935fcde597849afaa52a2d95671 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mar 29 2023 15:47:14 +0000 Subject: openqa: report queued 'results' on prod too It seems to work OK on staging, so let's try it out on prod and see how it looks in Bodhi. Signed-off-by: Adam Williamson --- diff --git a/inventory/group_vars/openqa_lab b/inventory/group_vars/openqa_lab index 2274fc3..b97d180 100644 --- a/inventory/group_vars/openqa_lab +++ b/inventory/group_vars/openqa_lab @@ -18,12 +18,6 @@ external_hostname: openqa.stg.fedoraproject.org fedmsg_env: stg freezes: false -# this is overridden from _servers_common temporarily to test -# queued/running "result" reporting - adamw 2023-02 -openqa_amqp_resultsdb_reporter_routing_keys: - - "org.fedoraproject.{{ deployment_type }}.openqa.job.done" - - "org.fedoraproject.{{ deployment_type }}.openqa.job.create" - - "org.fedoraproject.{{ deployment_type }}.openqa.job.restart" openqa_assetsize_ppc: 300 openqa_assetsize_updates_ppc: 100 openqa_compose_arches: x86_64,aarch64,ppc64le diff --git a/inventory/group_vars/openqa_servers_common b/inventory/group_vars/openqa_servers_common index a0dd7de..8c8c9d0 100644 --- a/inventory/group_vars/openqa_servers_common +++ b/inventory/group_vars/openqa_servers_common @@ -30,7 +30,10 @@ openqa_amqp_reporter_key: /etc/pki/fedora-messaging/openqa{{ openqa_env_suffix } openqa_amqp_reporter_url: "amqps://openqa{{ openqa_env_suffix }}:@rabbitmq{{ openqa_env_suffix }}.fedoraproject.org/%2Fpubsub" # fedora-messaging resultsdb reporter settings openqa_amqp_resultsdb_reporter_queue: "openqa{{ openqa_env_suffix }}_resultsdb_reporter" -openqa_amqp_resultsdb_reporter_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"] +openqa_amqp_resultsdb_reporter_routing_keys: + - "org.fedoraproject.{{ deployment_type }}.openqa.job.done" + - "org.fedoraproject.{{ deployment_type }}.openqa.job.create" + - "org.fedoraproject.{{ deployment_type }}.openqa.job.restart" # fedora-messaging scheduler settings (that differ from defaults) openqa_amqp_scheduler_cert: /etc/pki/fedora-messaging/openqa-cert.pem openqa_amqp_scheduler_key: /etc/pki/fedora-messaging/openqa-key.pem