From ee9b3796d03170c370aa9a44f2f3840c42240f9a Mon Sep 17 00:00:00 2001 From: Jan Kaluža Date: Apr 24 2020 19:34:27 +0000 Subject: ODCS: Configure routing of prod composes so releng compose are handled by releng backend. --- diff --git a/inventory/group_vars/odcs b/inventory/group_vars/odcs new file mode 100644 index 0000000..0c53144 --- /dev/null +++ b/inventory/group_vars/odcs @@ -0,0 +1,28 @@ +# Configs executed on releng backends must have "releng_" prefix. +odcs_raw_config_urls: + releng_fmc: + url: https://pagure.io/releng/fmc.git + config_filename: fedora-minimal-compose.conf + releng_jkaluza_test_config: + url: https://pagure.io/jkaluza-test-compose.git + config_filename: test.conf + +# Default queues for general ODCS backends. +odcs_celery_queues: +- pungi_composes +- releng_raw_pungi_composes +- releng_pungi_composes +- cleanup + +odcs_celery_router_config: + routing_rules: + odcs.server.celery_tasks.generate_pungi_compose: + releng_raw_pungi_composes: + source_type: 5 # "raw_config" + source: "releng_.*" + releng_pungi_composes: + source_type: [1, 2, 6, 7] # "tag", "module", "build", "pungi_compose" + owner: ["jkaluza", "mohanboddu", "humaton"] + cleanup_task: odcs.server.celery_tasks.run_cleanup + default_queue: pungi_composes + diff --git a/inventory/group_vars/odcs_backend_releng b/inventory/group_vars/odcs_backend_releng new file mode 100644 index 0000000..def1a58 --- /dev/null +++ b/inventory/group_vars/odcs_backend_releng @@ -0,0 +1,2 @@ +odcs_celery_queues: ["releng_raw_pungi_composes", "releng_pungi_composes", "cleanup"] + diff --git a/inventory/inventory b/inventory/inventory index f0bf724..499bf08 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -470,8 +470,14 @@ odcs-frontend01.phx2.fedoraproject.org [odcs_frontend_stg] odcs-frontend01.stg.phx2.fedoraproject.org -[odcs_backend] +[odcs_backend:children] +odcs_backend_general +odcs_backend_releng + +[odcs_backend_general] odcs-backend01.phx2.fedoraproject.org + +[odcs_backend_releng] odcs-backend-releng01.phx2.fedoraproject.org [odcs_backend_stg] diff --git a/roles/odcs/base/defaults/main.yml b/roles/odcs/base/defaults/main.yml index f1be428..8463c41 100644 --- a/roles/odcs/base/defaults/main.yml +++ b/roles/odcs/base/defaults/main.yml @@ -40,7 +40,7 @@ odcs_celery_broker_password: null odcs_celery_broker_host: null odcs_celery_broker_port: null odcs_celery_broker_vhost: rabbitmq -odcs_celery_queues: ["pungi_composes", "pulp_composes", "cleanup"] +odcs_celery_queues: ["pungi_composes", "cleanup"] odcs_celery_router_config: null odcs_runroot_ssh_hostnames: {"x86_64": "localhost"} # The default is 24 hours