openqa: enable dist-git testing in prod

This should enable dist-git PR testing in prod, and make *only*
prod report status back to dist-git (staging no longer should).

Signed-off-by: Adam Williamson <awilliam@redhat.com>

inventory/group_vars/openqa

@@ -14,6 +14,7 @@ openqa_amqp_scheduler_queue: "{{ openqa_amqp_prod_username }}_scheduler"
 openqa_oauth2_secret: "{{ openqa_prod_oidc_secret }}"
 
 openqa_compose_arches: x86_64,aarch64
+openqa_distgit_report: true
 openqa_dbname: openqa
 openqa_dbpassword: "{{ prod_openqa_dbpassword }}"
 openqa_dbuser: openqa

inventory/group_vars/openqa_lab

@@ -24,10 +24,6 @@ openqa_amqp_this_url: "{{ openqa_amqp_stg_url }}"
 openqa_amqp_this_username: "{{ openqa_amqp_stg_username }}"
 openqa_amqp_scheduler_queue: "{{ openqa_amqp_prod_username }}_scheduler_stg"
 
-# fedora-messaging dist-git reporter settings (not enabled on prod yet)
-openqa_amqp_distgit_reporter_queue: "{{ openqa_amqp_this_username }}_distgit_reporter"
-openqa_amqp_distgit_reporter_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
-
 # auth stuff
 openqa_oauth2_secret: "{{ openqa_stg_oidc_secret }}"
 

inventory/group_vars/openqa_servers_common

@@ -73,6 +73,10 @@ openqa_amqp_resultsdb_reporter_routing_keys:
 openqa_amqp_wiki_reporter_queue: "{{ openqa_amqp_this_username }}_wiki_reporter"
 openqa_amqp_wiki_reporter_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
 
+# fedora-messaging dist-git reporter settings
+openqa_amqp_distgit_reporter_queue: "{{ openqa_amqp_this_username }}_distgit_reporter"
+openqa_amqp_distgit_reporter_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
+
 openqa_assetsize: 850
 openqa_assetsize_aarch64: 1
 openqa_assetsize_updates: 500

roles/openqa/dispatcher/defaults/main.yml

@@ -19,3 +19,4 @@ openqa_amqp_wiki_reporter_routing_keys: ["org.fedoraproject.prod.openqa.job.done
 openqa_amqp_distgit_reporter_routing_keys: ["org.fedoraproject.prod.openqa.job.done"]
 openqa_amqp_mailfrom: "root@{{ external_hostname }}"
 openqa_amqp_smtp: localhost
+openqa_distgit_report: false

roles/openqa/dispatcher/tasks/main.yml

@@ -11,6 +11,11 @@
 ##        string - Comma-separated list of arches to schedule compose
 ##                 tests for
 ##        default - x86_64
+# - openqa_distgit_report
+##          bool - If true, will report dist-git PR test results back
+##                 to dist-git. Only one instance in the world should
+##                 have this set true
+##       default - false
 #
 # Optional vars
 # - wikitcms_token

roles/openqa/dispatcher/templates/fedora_openqa_distgit_reporter.toml.j2

@@ -40,7 +40,6 @@ routing_keys = [{% for key in openqa_amqp_distgit_reporter_routing_keys %}"{{ ke
 [consumer_config]
 openqa_hostname = "{{ openqa_hostname }}"
 openqa_baseurl = "https://{{ external_hostname|default(ansible_nodename) }}"
-do_report = true
 
 [qos]
 prefetch_size = 0

roles/openqa/dispatcher/templates/schedule.conf.j2

@@ -19,3 +19,8 @@ arches: {{ openqa_compose_arches }}
 openqa_hostname: {{ openqa_hostname }}
 openqa_baseurl: https://{{ external_hostname|default(ansible_nodename) }}
 dist-git_token: {{ openqa_distgit_token }}
+{% if openqa_distgit_report %}
+do_distgit_report: true
+{% else %}
+do_distgit_report: false
+{% endif %}