From 11d8c01162dfc6f66e085ae2d59c47362d9a1a0f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 12 Jul 2018 20:37:53 +0000 Subject: [PATCH] Fix a ton of fedmsg routing/policy. --- inventory/group_vars/centos-ci | 59 +++++++++++++------ inventory/group_vars/centos-ci-stg | 59 +++++++++++++------ inventory/group_vars/github2fedmsg | 26 +++++--- inventory/group_vars/github2fedmsg-stg | 26 +++++--- inventory/group_vars/pagure | 8 ++- inventory/group_vars/pagure-stg | 9 ++- inventory/group_vars/pkgs | 5 +- inventory/group_vars/pkgs-stg | 5 +- inventory/group_vars/releng-compose | 22 +++---- .../compose-iot-01.phx2.fedoraproject.org | 2 + 10 files changed, 144 insertions(+), 77 deletions(-) diff --git a/inventory/group_vars/centos-ci b/inventory/group_vars/centos-ci index b2d49d660d..47921caa1c 100644 --- a/inventory/group_vars/centos-ci +++ b/inventory/group_vars/centos-ci @@ -10,30 +10,53 @@ fedmsg_certs: owner: root group: root can_send: + - ci.pipeline.allpackages-build.complete + - ci.pipeline.allpackages-build.image.complete + - ci.pipeline.allpackages-build.image.queued + - ci.pipeline.allpackages-build.image.running + - ci.pipeline.allpackages-build.package.complete + - ci.pipeline.allpackages-build.package.ignore + - ci.pipeline.allpackages-build.package.ignored - ci.pipeline.allpackages-build.package.queued - ci.pipeline.allpackages-build.package.running - - ci.pipeline.allpackages-build.package.complete - - ci.pipeline.allpackages-build.package.ignored - - ci.pipeline.allpackages-pr.package.ignore - - ci.pipeline.allpackages-pr.package.queued - - ci.pipeline.allpackages-pr.package.running - - ci.pipeline.allpackages-pr.package.complete - - ci.pipeline.allpackages-pr.image.queued - - ci.pipeline.allpackages-pr.image.running - - ci.pipeline.allpackages-pr.image.complete - - ci.pipeline.allpackages-pr.image.ignore - - ci.pipeline.allpackages-pr.package.test.functional.queued - - ci.pipeline.allpackages-pr.package.test.functional.running - - ci.pipeline.allpackages-pr.package.test.functional.complete - - ci.pipeline.allpackages-pr.package.test.functional.ignore - - ci.pipeline.allpackages-pr.queued - - ci.pipeline.allpackages-pr.running + - ci.pipeline.allpackages-build.package.test.functional.complete + - ci.pipeline.allpackages-build.package.test.functional.queued + - ci.pipeline.allpackages-build.package.test.functional.running - ci.pipeline.allpackages-pr.complete - ci.pipeline.allpackages-pr.ignore - - ci.pipeline.package.queued - - ci.pipeline.package.running + - ci.pipeline.allpackages-pr.ignored + - ci.pipeline.allpackages-pr.image.complete + - ci.pipeline.allpackages-pr.image.ignore + - ci.pipeline.allpackages-pr.image.ignored + - ci.pipeline.allpackages-pr.image.queued + - ci.pipeline.allpackages-pr.image.running + - ci.pipeline.allpackages-pr.package.complete + - ci.pipeline.allpackages-pr.package.ignore + - ci.pipeline.allpackages-pr.package.ignored + - ci.pipeline.allpackages-pr.package.queued + - ci.pipeline.allpackages-pr.package.running + - ci.pipeline.allpackages-pr.package.test.functional.complete + - ci.pipeline.allpackages-pr.package.test.functional.ignore + - ci.pipeline.allpackages-pr.package.test.functional.ignored + - ci.pipeline.allpackages-pr.package.test.functional.queued + - ci.pipeline.allpackages-pr.package.test.functional.running + - ci.pipeline.allpackages-pr.queued + - ci.pipeline.allpackages-pr.running + - ci.pipeline.complete + - ci.pipeline.compose.complete + - ci.pipeline.compose.running + - ci.pipeline.compose.test.integration.complete + - ci.pipeline.compose.test.integration.queued + - ci.pipeline.compose.test.integration.running + - ci.pipeline.image.complete + - ci.pipeline.image.running + - ci.pipeline.image.test.smoke.complete + - ci.pipeline.image.test.smoke.running - ci.pipeline.package.complete - ci.pipeline.package.ignore + - ci.pipeline.package.ignored + - ci.pipeline.package.queued + - ci.pipeline.package.running fedmsg_prefix: org.centos fedmsg_env: prod diff --git a/inventory/group_vars/centos-ci-stg b/inventory/group_vars/centos-ci-stg index 1c942e1ddd..2c366266db 100644 --- a/inventory/group_vars/centos-ci-stg +++ b/inventory/group_vars/centos-ci-stg @@ -10,30 +10,53 @@ fedmsg_certs: owner: root group: root can_send: + - ci.pipeline.allpackages-build.complete + - ci.pipeline.allpackages-build.image.complete + - ci.pipeline.allpackages-build.image.queued + - ci.pipeline.allpackages-build.image.running + - ci.pipeline.allpackages-build.package.complete + - ci.pipeline.allpackages-build.package.ignore + - ci.pipeline.allpackages-build.package.ignored - ci.pipeline.allpackages-build.package.queued - ci.pipeline.allpackages-build.package.running - - ci.pipeline.allpackages-build.package.complete - - ci.pipeline.allpackages-build.package.ignored - - ci.pipeline.allpackages-pr.package.ignore - - ci.pipeline.allpackages-pr.package.queued - - ci.pipeline.allpackages-pr.package.running - - ci.pipeline.allpackages-pr.package.complete - - ci.pipeline.allpackages-pr.image.queued - - ci.pipeline.allpackages-pr.image.running - - ci.pipeline.allpackages-pr.image.complete - - ci.pipeline.allpackages-pr.image.ignore - - ci.pipeline.allpackages-pr.package.test.functional.queued - - ci.pipeline.allpackages-pr.package.test.functional.running - - ci.pipeline.allpackages-pr.package.test.functional.complete - - ci.pipeline.allpackages-pr.package.test.functional.ignore - - ci.pipeline.allpackages-pr.queued - - ci.pipeline.allpackages-pr.running + - ci.pipeline.allpackages-build.package.test.functional.complete + - ci.pipeline.allpackages-build.package.test.functional.queued + - ci.pipeline.allpackages-build.package.test.functional.running - ci.pipeline.allpackages-pr.complete - ci.pipeline.allpackages-pr.ignore - - ci.pipeline.package.queued - - ci.pipeline.package.running + - ci.pipeline.allpackages-pr.ignored + - ci.pipeline.allpackages-pr.image.complete + - ci.pipeline.allpackages-pr.image.ignore + - ci.pipeline.allpackages-pr.image.ignored + - ci.pipeline.allpackages-pr.image.queued + - ci.pipeline.allpackages-pr.image.running + - ci.pipeline.allpackages-pr.package.complete + - ci.pipeline.allpackages-pr.package.ignore + - ci.pipeline.allpackages-pr.package.ignored + - ci.pipeline.allpackages-pr.package.queued + - ci.pipeline.allpackages-pr.package.running + - ci.pipeline.allpackages-pr.package.test.functional.complete + - ci.pipeline.allpackages-pr.package.test.functional.ignore + - ci.pipeline.allpackages-pr.package.test.functional.ignored + - ci.pipeline.allpackages-pr.package.test.functional.queued + - ci.pipeline.allpackages-pr.package.test.functional.running + - ci.pipeline.allpackages-pr.queued + - ci.pipeline.allpackages-pr.running + - ci.pipeline.complete + - ci.pipeline.compose.complete + - ci.pipeline.compose.running + - ci.pipeline.compose.test.integration.complete + - ci.pipeline.compose.test.integration.queued + - ci.pipeline.compose.test.integration.running + - ci.pipeline.image.complete + - ci.pipeline.image.running + - ci.pipeline.image.test.smoke.complete + - ci.pipeline.image.test.smoke.running - ci.pipeline.package.complete - ci.pipeline.package.ignore + - ci.pipeline.package.ignored + - ci.pipeline.package.queued + - ci.pipeline.package.running fedmsg_prefix: org.centos fedmsg_env: stg diff --git a/inventory/group_vars/github2fedmsg b/inventory/group_vars/github2fedmsg index ebb943e7a0..43243987f2 100644 --- a/inventory/group_vars/github2fedmsg +++ b/inventory/group_vars/github2fedmsg @@ -34,26 +34,34 @@ fedmsg_certs: - github.create - github.delete - github.fork + - github.gollum + - github.issue.assigned + - github.issue.closed - github.issue.comment + - github.issue.edited + - github.issue.labeled + - github.issue.milestone - github.issue.opened - github.issue.reopened - - github.issue.closed - - github.issue.assigned - - github.issue.labeled + - github.issue.unassigned + - github.issue.unlabeled + - github.label - github.member - github.page_build - - github.pull_request.opened - - github.pull_request.closed - - github.pull_request.synchronize - - github.pull_request_review_comment - - github.pull_request_review - github.pull_request.assigned + - github.pull_request.closed + - github.pull_request.edited - github.pull_request.labeled + - github.pull_request.opened + - github.pull_request_review + - github.pull_request_review_comment + - github.pull_request.review_requested + - github.pull_request.synchronize - github.pull_request.unlabeled - github.push - github.release + - github.repository_vulnerability_alert - github.star - github.status - github.team_add - github.webhook - - github.gollum diff --git a/inventory/group_vars/github2fedmsg-stg b/inventory/group_vars/github2fedmsg-stg index c1c34bfd91..189a55d7fd 100644 --- a/inventory/group_vars/github2fedmsg-stg +++ b/inventory/group_vars/github2fedmsg-stg @@ -34,26 +34,34 @@ fedmsg_certs: - github.create - github.delete - github.fork + - github.gollum + - github.issue.assigned + - github.issue.closed - github.issue.comment + - github.issue.edited + - github.issue.labeled + - github.issue.milestone - github.issue.opened - github.issue.reopened - - github.issue.closed - - github.issue.assigned - - github.issue.labeled + - github.issue.unassigned + - github.issue.unlabeled + - github.label - github.member - github.page_build - - github.pull_request.opened - - github.pull_request.closed - - github.pull_request.synchronize - - github.pull_request_review_comment - - github.pull_request_review - github.pull_request.assigned + - github.pull_request.closed + - github.pull_request.edited - github.pull_request.labeled + - github.pull_request.opened + - github.pull_request_review + - github.pull_request_review_comment + - github.pull_request.review_requested + - github.pull_request.synchronize - github.pull_request.unlabeled - github.push - github.release + - github.repository_vulnerability_alert - github.star - github.status - github.team_add - github.webhook - - github.gollum diff --git a/inventory/group_vars/pagure b/inventory/group_vars/pagure index 77d5b8a69a..afa936a6f1 100644 --- a/inventory/group_vars/pagure +++ b/inventory/group_vars/pagure @@ -28,22 +28,26 @@ fedmsg_certs: owner: git group: apache can_send: + - pagure.git.receive - pagure.issue.assigned.added - pagure.issue.assigned.reset - pagure.issue.comment.added + - pagure.issue.comment.edited - pagure.issue.dependency.added - pagure.issue.dependency.removed + - pagure.issue.drop - pagure.issue.edit - pagure.issue.new - - pagure.issue.drop - pagure.issue.tag.added - pagure.issue.tag.removed + - pagure.project.deleted - pagure.project.edit - pagure.project.forked - pagure.project.group.added - pagure.project.new - pagure.project.tag.edited - pagure.project.tag.removed + - pagure.project.user.access.updated - pagure.project.user.added - pagure.pull-request.closed - pagure.pull-request.comment.added @@ -51,8 +55,6 @@ fedmsg_certs: - pagure.pull-request.flag.updated - pagure.pull-request.new - pagure.request.assigned.added - - pagure.git.receive - fedmsg_prefix: io.pagure fedmsg_env: prod diff --git a/inventory/group_vars/pagure-stg b/inventory/group_vars/pagure-stg index 3c54e5b460..8474e050b7 100644 --- a/inventory/group_vars/pagure-stg +++ b/inventory/group_vars/pagure-stg @@ -28,28 +28,33 @@ fedmsg_certs: owner: git group: apache can_send: + - pagure.git.receive - pagure.issue.assigned.added - pagure.issue.assigned.reset - pagure.issue.comment.added + - pagure.issue.comment.edited - pagure.issue.dependency.added - pagure.issue.dependency.removed + - pagure.issue.drop - pagure.issue.edit - pagure.issue.new - - pagure.issue.drop - pagure.issue.tag.added - pagure.issue.tag.removed + - pagure.project.deleted - pagure.project.edit - pagure.project.forked + - pagure.project.group.added - pagure.project.new - pagure.project.tag.edited - pagure.project.tag.removed + - pagure.project.user.access.updated - pagure.project.user.added - pagure.pull-request.closed - pagure.pull-request.comment.added - pagure.pull-request.flag.added - pagure.pull-request.flag.updated - - pagure.request.assigned.added - pagure.pull-request.new + - pagure.request.assigned.added fedmsg_prefix: io.pagure fedmsg_env: stg diff --git a/inventory/group_vars/pkgs b/inventory/group_vars/pkgs index cecbbd5c06..b81f9d8c78 100644 --- a/inventory/group_vars/pkgs +++ b/inventory/group_vars/pkgs @@ -77,6 +77,7 @@ fedmsg_certs: owner: pagure group: apache can_send: + - pagure.git.receive - pagure.issue.assigned.added - pagure.issue.assigned.reset - pagure.issue.comment.added @@ -93,11 +94,11 @@ fedmsg_certs: - pagure.project.tag.edited - pagure.project.tag.removed - pagure.project.user.added + - pagure.project.user.removed - pagure.pull-request.closed - pagure.pull-request.comment.added + - pagure.pull-request.comment.edited - pagure.pull-request.flag.added - pagure.pull-request.flag.updated - pagure.pull-request.new - pagure.request.assigned.added - - pagure.git.receive - diff --git a/inventory/group_vars/pkgs-stg b/inventory/group_vars/pkgs-stg index d880ea69a4..0520b67987 100644 --- a/inventory/group_vars/pkgs-stg +++ b/inventory/group_vars/pkgs-stg @@ -78,6 +78,7 @@ fedmsg_certs: owner: pagure group: apache can_send: + - pagure.git.receive - pagure.issue.assigned.added - pagure.issue.assigned.reset - pagure.issue.comment.added @@ -94,11 +95,11 @@ fedmsg_certs: - pagure.project.tag.edited - pagure.project.tag.removed - pagure.project.user.added + - pagure.project.user.removed - pagure.pull-request.closed - pagure.pull-request.comment.added + - pagure.pull-request.comment.edited - pagure.pull-request.flag.added - pagure.pull-request.flag.updated - pagure.pull-request.new - pagure.request.assigned.added - - pagure.git.receive - diff --git a/inventory/group_vars/releng-compose b/inventory/group_vars/releng-compose index 752a1e1070..2358f9c119 100644 --- a/inventory/group_vars/releng-compose +++ b/inventory/group_vars/releng-compose @@ -49,17 +49,11 @@ fedmsg_certs: - pungi.compose.createiso.imagefail - pungi.compose.createiso.imagedone - pungi.compose.ostree - # Then there are *all these* make-updates things from releng+cloudsig - - compose.23.make-updates.start - - compose.23.make-updates.done - - compose.23.cloudimg-build.start - - compose.23.cloudimg-build.done - - compose.23.mash-atomic.start - - compose.23.mash-atomic.stop - - compose.23.atomic-lorax.start - - compose.23.atomic-lorax.done - - compose.23.cloudimg-checksum.start - - compose.23.cloudimg-checksum.done - - compose.23.cloudimg-staging.start - - compose.23.cloudimg-staging.done - + - compose.27.complete + - compose.27.start + - compose.28.complete + - compose.28.rsync.complete + - compose.28.rsync.start + - compose.28.start + - compose.29.complete + - compose.29.start diff --git a/inventory/host_vars/compose-iot-01.phx2.fedoraproject.org b/inventory/host_vars/compose-iot-01.phx2.fedoraproject.org index 05d1644c50..4bfa20d70d 100644 --- a/inventory/host_vars/compose-iot-01.phx2.fedoraproject.org +++ b/inventory/host_vars/compose-iot-01.phx2.fedoraproject.org @@ -33,3 +33,5 @@ fedmsg_certs: - pungi.compose.createiso.imagefail - pungi.compose.createiso.imagedone - pungi.compose.ostree + - compose.29.complete + - compose.29.start