From b50fa6a4778f017096c0d5151bb7d27a12e51b40 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 21 Jun 2023 13:15:38 +0200 Subject: [PATCH] openqa amqp: fix stg-on-prod queue names so, this was working before somehow, but it was pretty clearly wrong. We were using queues owned by openqa.stg on the prod rabbitmq instance for the cases where the openQA "stg" consumers need to listen to prod queues. This can only have been working with an openqa.stg user on prod, which seems wrong. Instead, these three consumers should do it the way the relval and relvalami consumers do - use a queue owned by the "openqa" user, but with a suffix so they have a different queue from the actual prod queue. The upshot of this is that in the configs, we should go from: amqp_url = "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub" ... queue = "openqa.stg_scheduler" - which is weird and I have no idea how it ever worked - to: amqp_url = "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub" ... queue = "openqa_scheduler_stg" - which seems much more sensible. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa | 1 + inventory/group_vars/openqa_lab | 1 + inventory/group_vars/openqa_servers_common | 6 +++--- playbooks/groups/openqa.yml | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index e6282134f5..b2c03bf5e5 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -8,6 +8,7 @@ openqa_amqp_this_certfile: "{{ openqa_amqp_prod_certfile }}" openqa_amqp_this_keyfile: "{{ openqa_amqp_prod_keyfile }}" openqa_amqp_this_url: "{{ openqa_amqp_prod_url }}" openqa_amqp_this_username: "{{ openqa_amqp_prod_username }}" +openqa_amqp_queue_suffix: openqa_compose_arches: x86_64,aarch64 openqa_dbname: openqa openqa_dbpassword: "{{ prod_openqa_dbpassword }}" diff --git a/inventory/group_vars/openqa_lab b/inventory/group_vars/openqa_lab index 05b957e53f..5a87e44c8b 100644 --- a/inventory/group_vars/openqa_lab +++ b/inventory/group_vars/openqa_lab @@ -22,6 +22,7 @@ openqa_amqp_this_certfile: "{{ openqa_amqp_stg_certfile }}" openqa_amqp_this_keyfile: "{{ openqa_amqp_stg_keyfile }}" openqa_amqp_this_url: "{{ openqa_amqp_stg_url }}" openqa_amqp_this_username: "{{ openqa_amqp_stg_username }}" +openqa_amqp_queue_suffix: "_stg" openqa_assetsize_ppc: 300 openqa_assetsize_updates_ppc: 100 diff --git a/inventory/group_vars/openqa_servers_common b/inventory/group_vars/openqa_servers_common index bb78871676..f57f3f1e02 100644 --- a/inventory/group_vars/openqa_servers_common +++ b/inventory/group_vars/openqa_servers_common @@ -53,7 +53,7 @@ openqa_amqp_publisher_url: "{{ openqa_amqp_this_url }}" # the queue names differs. openqa_amqp_scheduler_cert: "{{ openqa_amqp_prod_certfile }}" openqa_amqp_scheduler_key: "{{ openqa_amqp_prod_keyfile }}" -openqa_amqp_scheduler_queue: "{{ openqa_amqp_this_username }}_scheduler" +openqa_amqp_scheduler_queue: "{{ openqa_amqp_prod_username }}_scheduler{{ openqa_amqp_queue_suffix }}" openqa_amqp_scheduler_routing_keys: ["org.fedoraproject.prod.pungi.compose.status.change", "org.fedoraproject.prod.bodhi.update.request.testing", "org.fedoraproject.prod.bodhi.update.edit", "org.fedoraproject.prod.bodhi.update.status.testing.koji-build-group.build.complete", "org.fedoraproject.prod.coreos.build.state.change", "org.fedoraproject.prod.odcs.compose.state-changed"] openqa_amqp_scheduler_url: "{{ openqa_amqp_prod_url }}" @@ -64,14 +64,14 @@ openqa_amqp_reporter_key: "{{ openqa_amqp_this_keyfile }}" openqa_amqp_reporter_url: "{{ openqa_amqp_this_url }}" # fedora-messaging resultsdb reporter settings -openqa_amqp_resultsdb_reporter_queue: "{{ openqa_amqp_this_username }}_resultsdb_reporter" +openqa_amqp_resultsdb_reporter_queue: "{{ openqa_amqp_prod_username }}_resultsdb_reporter{{ openqa_amqp_queue_suffix }}" 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 wiki reporter settings -openqa_amqp_wiki_reporter_queue: "{{ openqa_amqp_this_username }}_wiki_reporter" +openqa_amqp_wiki_reporter_queue: "{{ openqa_amqp_prod_username }}_wiki_reporter{{ openqa_amqp_queue_suffix }}" openqa_amqp_wiki_reporter_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"] openqa_assetsize: 500 diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 1574b78069..15cfee8541 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -133,6 +133,7 @@ routing_keys: "{{ fedora_nightlies_amqp_routing_keys }}" vars: env: "production" + env_suffix: "" tags: ['rabbit'] when: "fedora_nightlies_amqp_queue is defined"