From 6483485c8a102629a60abd14dd05b571ca99c6be Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 8 Jan 2020 12:59:31 -0800 Subject: [PATCH] openqa/dispatcher: handle update test arch config, ppc64le on stg I enhanced the fedora_openqa job scheduling consumer to have a setting for which arches update tests should be run on. This change adds that new setting to the config we write, and enables ppc64le update tests in staging. If this goes well we will also enable them in production, and later enable aarch64 as well when we have more workers. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa | 1 + inventory/group_vars/openqa_stg | 1 + roles/openqa/dispatcher/tasks/main.yml | 6 +++++- .../dispatcher/templates/fedora_openqa_scheduler.toml.j2 | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index f292753913..55221e9e78 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -23,6 +23,7 @@ openqa_env: production wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json" openqa_wikitcms_hostname: fedoraproject.org openqa_resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ +openqa_update_arches: ['x86_64'] deployment_type: prod freezes: false diff --git a/inventory/group_vars/openqa_stg b/inventory/group_vars/openqa_stg index ae72f6e344..5bb19e4460 100644 --- a/inventory/group_vars/openqa_stg +++ b/inventory/group_vars/openqa_stg @@ -39,6 +39,7 @@ openqa_extraarches: true 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/ +openqa_update_arches: ['x86_64', 'ppc64le'] # FIXME: disable consumers that write to wiki until auth key # is working again: diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index 85d16b993b..e19439a34b 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -45,6 +45,9 @@ ## fedora_openqa config file and fedora-messaging config ## will be set appropriately for infra deployments if ## this is set, so don't set it for private deployments +# - openqa_update_arches +## list - List of arches to schedule update tests for. Must be +## set if openqa_amqp_scheduler_queue is set. # - openqa_amqp_passive ## bool - If true, passive_declares will be set true in all the ## fedora-messaging consumer configuration files. This @@ -78,7 +81,8 @@ ## broker (which is what you'd typically want), you only ## need to set this. This should be a unique and private ## string; the official recommendation is to use a -## random UUID generated by uuidgen. +## random UUID generated by uuidgen. If set, you must +## also set openqa_update_arches. # - openqa_amqp_scheduler_routing_keys ## list - List of routing key names for the fedora-messaging ## scheduler to subscribe to. The role default for this diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 index 44ab922ceb..894beb17cc 100644 --- a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 +++ b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 @@ -44,6 +44,7 @@ routing_keys = [{% for key in openqa_amqp_scheduler_routing_keys %}"{{ key }}",{ [consumer_config] openqa_hostname = "{{ openqa_hostname }}" +update_arches = [{% for arch in openqa_update_arches %}"{{ arch }}",{% endfor %}] [qos] prefetch_size = 0