Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

resultsdb: clean up and simplifications

Browse source 
- Simplify the topic that are listened to in staging, no need to repeat them
  when we can use * instead.
- Drop rdbsync since we're moving to fedora-messaging
- Adjust the playbook to install ci-resultsdb-listener

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2019-11-07 10:33:30 +01:00
parent 74dd4d96ac
commit 42a0bafb83
1 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
playbooks/groups/resultsdb.yml
View file

@ -54,24 +54,15 @@
username: "resultsdb{{ env_suffix }}" username: "resultsdb{{ env_suffix }}"
queue_name: "resultsdb{{ env_suffix }}_ci_listener" queue_name: "resultsdb{{ env_suffix }}_ci_listener"
routing_keys: routing_keys:
- "org.centos.prod.ci.pipeline.allpackages-build.complete" - "org.centos.*.ci.pipeline.allpackages-build.complete"
- "org.centos.prod.ci.pipeline.allpackages-build.image.complete" - "org.centos.*.ci.pipeline.allpackages-build.image.complete"
- "org.centos.prod.ci.pipeline.allpackages-build.package.test.functional.complete" - "org.centos.*.ci.pipeline.allpackages-build.package.test.functional.complete"
- "org.centos.prod.ci.pipeline.allpackages-build.package.complete" - "org.centos.*.ci.pipeline.allpackages-build.package.complete"
- "org.centos.prod.ci.pipeline.allpackages-build.package.ignored" - "org.centos.*.ci.pipeline.allpackages-build.package.ignored"
- "org.centos.prod.ci.koji-build.test.queued" - "org.centos.*.ci.koji-build.test.queued"
- "org.centos.prod.ci.koji-build.test.running" - "org.centos.*.ci.koji-build.test.running"
- "org.centos.prod.ci.koji-build.test.complete" - "org.centos.*.ci.koji-build.test.complete"
- "org.centos.prod.ci.koji-build.test.error" - "org.centos.*.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" when: deployment_type == "stg"
tasks: tasks:
@ -102,7 +93,7 @@
handlers: handlers:
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: Install rdbsync - name: Install ci-resultsdb-listener
hosts: resultsdb_stg:resultsdb_prod hosts: resultsdb_stg:resultsdb_prod
user: root user: root
gather_facts: True gather_facts: True
@ -116,5 +107,4 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- { role: rdbsync, tags: ['rdbsync'], when: deployment_type == "prod" } - { role: ci_resultsdb, tags: ['ci_resultsdb'] }
- { role: ci_resultsdb, tags: ['ci_resultsdb'], when: deployment_type == "stg" }