From 45d1e86166a1f0eb76ee9e6420f09b08a270b3b3 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 18 Oct 2019 17:20:27 +0200 Subject: [PATCH] resultsdb: listen to the stage topic in staging Signed-off-by: Pierre-Yves Chibon --- playbooks/groups/resultsdb.yml | 34 +++++++++++++++++------- roles/ci_resultsdb/templates/config.toml | 11 ++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/playbooks/groups/resultsdb.yml b/playbooks/groups/resultsdb.yml index d6b1592dd4..fb01a9bdbc 100644 --- a/playbooks/groups/resultsdb.yml +++ b/playbooks/groups/resultsdb.yml @@ -48,15 +48,31 @@ - "org.centos.prod.ci.koji-build.test.running" - "org.centos.prod.ci.koji-build.test.complete" - "org.centos.prod.ci.koji-build.test.error" - write_queues: - - "ci" - - "openqa" - vars: - # yes, even the staging scheduler listens to production, it - # has to or else it wouldn't schedule any jobs - # env: "production" - # env_suffix: "" - tags: ['rabbit'] + when: deployment_type == "prod" + + - role: rabbit/queue + username: "resultsdb{{ env_suffix }}" + queue_name: "resultsdb{{ env_suffix }}_ci_listener" + routing_keys: + - "org.centos.prod.ci.pipeline.allpackages-build.complete" + - "org.centos.prod.ci.pipeline.allpackages-build.image.complete" + - "org.centos.prod.ci.pipeline.allpackages-build.package.test.functional.complete" + - "org.centos.prod.ci.pipeline.allpackages-build.package.complete" + - "org.centos.prod.ci.pipeline.allpackages-build.package.ignored" + - "org.centos.prod.ci.koji-build.test.queued" + - "org.centos.prod.ci.koji-build.test.running" + - "org.centos.prod.ci.koji-build.test.complete" + - "org.centos.prod.ci.koji-build.test.error" + - "org.centos.stage.ci.pipeline.allpackages-build.complete" + - "org.centos.stage.ci.pipeline.allpackages-build.image.complete" + - "org.centos.stage.ci.pipeline.allpackages-build.package.test.functional.complete" + - "org.centos.stage.ci.pipeline.allpackages-build.package.complete" + - "org.centos.stage.ci.pipeline.allpackages-build.package.ignored" + - "org.centos.stage.ci.koji-build.test.queued" + - "org.centos.stage.ci.koji-build.test.running" + - "org.centos.stage.ci.koji-build.test.complete" + - "org.centos.stage.ci.koji-build.test.error" + when: deployment_type == "stg" tasks: # this is how you include other task lists diff --git a/roles/ci_resultsdb/templates/config.toml b/roles/ci_resultsdb/templates/config.toml index fcfea9486b..74e14b022f 100644 --- a/roles/ci_resultsdb/templates/config.toml +++ b/roles/ci_resultsdb/templates/config.toml @@ -38,6 +38,17 @@ routing_keys = [ 'org.centos.prod.ci.koji-build.test.running', 'org.centos.prod.ci.koji-build.test.complete', 'org.centos.prod.ci.koji-build.test.error', + {% if env == "stg -%} + 'org.centos.stage.ci.pipeline.allpackages-build.complete', + 'org.centos.stage.ci.pipeline.allpackages-build.image.complete', + 'org.centos.stage.ci.pipeline.allpackages-build.package.test.functional.complete', + 'org.centos.stage.ci.pipeline.allpackages-build.package.complete', + 'org.centos.stage.ci.pipeline.allpackages-build.package.ignored', + 'org.centos.stage.ci.koji-build.test.queued', + 'org.centos.stage.ci.koji-build.test.running', + 'org.centos.stage.ci.koji-build.test.complete', + 'org.centos.stage.ci.koji-build.test.error', + {%- endif %} ] [tls]