From 9a4027b09683d069b9faccad68373062311a679b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 20 Jan 2022 15:21:38 -0800 Subject: [PATCH] Re-enable openQA-related wiki writing services in staging Staging wiki auth from openqa-lab01 works again now (thanks to Aurelien) so we can re-enable these. Also fix the grouping in openqa_lab that was broken by the sorting done in 580cd25. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa_lab | 8 +++----- inventory/group_vars/relvalconsumer_test | 5 ----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/inventory/group_vars/openqa_lab b/inventory/group_vars/openqa_lab index dcc7805c79..07c0a675a9 100644 --- a/inventory/group_vars/openqa_lab +++ b/inventory/group_vars/openqa_lab @@ -10,15 +10,14 @@ # be stg.fedoraproject.org # this is to enable nested virt, which we need for disk image creation +virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough,+vmx" + deployment_type: stg external_hostname: openqa.stg.fedoraproject.org # makes sure it sends stg not prod fedmsgs fedmsg_env: stg freezes: false -# 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: + openqa_assetsize_ppc: 300 openqa_compose_arches: x86_64,aarch64,ppc64le openqa_dbname: openqa-stg @@ -42,5 +41,4 @@ openqa_secret: "{{ stg_openqa_apisecret }}" openqa_update_arches: ['x86_64', 'ppc64le'] openqa_webapi_plugins: FedoraMessaging FedoraUpdateRestart openqa_wikitcms_hostname: stg.fedoraproject.org -virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough,+vmx" wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json" diff --git a/inventory/group_vars/relvalconsumer_test b/inventory/group_vars/relvalconsumer_test index be348e3ac9..b65d39298f 100644 --- a/inventory/group_vars/relvalconsumer_test +++ b/inventory/group_vars/relvalconsumer_test @@ -1,7 +1,2 @@ -relvalamiconsumer_disabled: true -# FIXME: disable consumers that write to wiki until auth key -# is working again: -# https://pagure.io/fedora-infrastructure/issue/8381 -relvalconsumer_disabled: true relvalconsumer_env_suffix: .test relvalconsumer_prod: false