From f0680c7127883c33442b5dbeb9cc97e7e6ee8ef6 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Thu, 11 Oct 2018 09:44:02 -0500
Subject: [PATCH] Remove x-vrif-minus-2 from gerritbot notifications

This event is currently a noop and a new event name is in the works to
replace its intended functionality. This removes all references to the
non-functional notification. Teams can add the new replacement
notification once it's available if they want to have these.

Change-Id: Iad5fd75bc10924b483a14a449853b6b8e7c4c465
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 gerritbot/channels.yaml | 137 ----------------------------------------
 tools/irc_tests.py      |   2 +-
 2 files changed, 1 insertion(+), 138 deletions(-)

diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index c3178fb080..df3ba0cb2d 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -3,7 +3,6 @@ airshipit:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - ^openstack/airship-.*
   branches:
@@ -13,7 +12,6 @@ ara:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ansible-role-ara
     - openstack/ara
@@ -29,7 +27,6 @@ cloudkitty:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/cloudkitty
     - openstack/cloudkitty-dashboard
@@ -43,7 +40,6 @@ congress:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/congress
     - openstack/congress-dashboard
@@ -57,7 +53,6 @@ fuel-tracker:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - ^openstack/fuel.*
     - openstack/network-checker
@@ -71,7 +66,6 @@ git-upstream:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/fixtures-git
     - openstack/git-upstream
@@ -82,7 +76,6 @@ heat:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-dev/heat-cfnclient
     - openstack/heat
@@ -100,7 +93,6 @@ midonet:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/fuel-plugin-midonet
     - openstack/networking-midonet
@@ -112,7 +104,6 @@ murano:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/murano
     - openstack/murano-agent
@@ -130,7 +121,6 @@ networking-sfc:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/networking-sfc
   branches:
@@ -140,7 +130,6 @@ openstack-ailuropoda:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ailuropoda
   branches:
@@ -150,7 +139,6 @@ openstack-almanach:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/almanach
     - openstack/openstack-ansible-os_almanach
@@ -162,7 +150,6 @@ openstack-ansible:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     # All openstack-ansible projects
     - ^openstack/openstack-ansible.*
@@ -182,7 +169,6 @@ openstack-architecture:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/arch-wg
   branches:
@@ -192,7 +178,6 @@ openstack-barbican:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/barbican
     - openstack/barbican-specs
@@ -206,7 +191,6 @@ openstack-bareon:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/bareon
     - openstack/bareon-allocator
@@ -222,7 +206,6 @@ openstack-bilean:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/bilean
     - openstack/python-bileanclient
@@ -233,7 +216,6 @@ openstack-blazar:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/blazar
     - openstack/blazar-dashboard
@@ -247,7 +229,6 @@ openstack-browbeat:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/browbeat
   branches:
@@ -257,7 +238,6 @@ openstack-charms:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/charm-6wind-virtual-accelerator
     - openstack/charm-aodh
@@ -327,7 +307,6 @@ openstack-chef:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     # all openstack-chef projects
     - ^openstack/cookbook.*
@@ -343,7 +322,6 @@ openstack-cinder:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/cinder
     - openstack/cinder-specs
@@ -359,7 +337,6 @@ openstack-cloudpulse:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/cloudpulse
     - openstack/python-cloudpulseclient
@@ -370,7 +347,6 @@ openstack-coats:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/coats
   branches:
@@ -381,7 +357,6 @@ openstack-cognitive:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/cognitive
     - openstack/python-cognitiveclient
@@ -392,7 +367,6 @@ openstack-containers:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/magnum
     - openstack/magnum-specs
@@ -407,7 +381,6 @@ openstack-cyborg:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/cyborg
     - openstack/cyborg-specs
@@ -420,7 +393,6 @@ openstack-dev:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/governance
     - openstack/openstack-specs
@@ -433,7 +405,6 @@ openstack-dib:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/diskimage-builder
   branches:
@@ -444,7 +415,6 @@ openstack-dns:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/designate
     - openstack/designate-dashboard
@@ -459,7 +429,6 @@ openstack-doc:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/api-site
     - openstack/contributor-guide
@@ -479,7 +448,6 @@ openstack-dpm:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/networking-dpm
     - openstack/nova-dpm
@@ -491,7 +459,6 @@ openstack-dragonflow:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/dragonflow
   branches:
@@ -501,7 +468,6 @@ openstack-ekko:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ekko
   branches:
@@ -511,7 +477,6 @@ openstack-entropy:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/entropy
   branches:
@@ -521,7 +486,6 @@ openstack-fenix:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/fenix
     - openstack/puppet-fenix
@@ -533,7 +497,6 @@ openstack-foxnut:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/foxnut
   branches:
@@ -543,7 +506,6 @@ openstack-freezer:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/freezer
     - openstack/freezer-api
@@ -560,7 +522,6 @@ openstack-functions:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/picasso
     - openstack/python-picassoclient
@@ -571,7 +532,6 @@ openstack-fwaas:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/neutron-fwaas
     - openstack/neutron-fwaas-dashboard
@@ -582,7 +542,6 @@ openstack-gbp:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/group-based-policy
     - openstack/group-based-policy-automation
@@ -596,7 +555,6 @@ openstack-glance:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/glance
     - openstack/glance-specs
@@ -609,7 +567,6 @@ openstack-golang:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/docker-machine-openstack
     - openstack/golang-client
@@ -622,7 +579,6 @@ openstack-ha:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ha-guide
     - openstack/openstack-resource-agents
@@ -634,7 +590,6 @@ openstack-heat-translator:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/heat-translator
   branches:
@@ -644,7 +599,6 @@ openstack-helm:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/openstack-helm
     - openstack/openstack-helm-addons
@@ -656,7 +610,6 @@ openstack-horizon:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/django_openstack_auth
     - openstack/horizon
@@ -703,7 +656,6 @@ openstack-hyper-v:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/compute-hyperv
     - openstack/networking-hyperv
@@ -717,7 +669,6 @@ openstack-i18n:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/i18n
     - openstack/i18n-specs
@@ -728,7 +679,6 @@ openstack-infra:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-dev/cookiecutter
     - openstack-dev/hacking
@@ -912,7 +862,6 @@ openstack-interop:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/interop
   branches:
@@ -922,7 +871,6 @@ openstack-iotronic:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/iotronic
     - openstack/iotronic-lightning-rod
@@ -935,7 +883,6 @@ openstack-ironic:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/bifrost
     - openstack/ironic
@@ -964,7 +911,6 @@ openstack-javascript:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-infra/js-afs-blob-store
     - openstack-infra/js-generator-openstack
@@ -978,7 +924,6 @@ openstack-jjb:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-infra/jenkins-job-builder
     - openstack/python-jenkins
@@ -990,7 +935,6 @@ openstack-karbor:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/karbor
     - openstack/karbor-dashboard
@@ -1002,7 +946,6 @@ openstack-kayobe:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/kayobe
   branches:
@@ -1013,7 +956,6 @@ openstack-keystone:
   events:
     - change-merged
     - patchset-created
-    - x-vrif-minus-2
   projects:
     - openstack/identity-api
     - openstack/keystone
@@ -1033,7 +975,6 @@ openstack-kolla:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/kolla
     - openstack/kolla-ansible
@@ -1046,7 +987,6 @@ openstack-kuryr:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/kuryr
     - openstack/kuryr-kubernetes
@@ -1059,7 +999,6 @@ openstack-lbaas:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/neutron-lbaas
     - openstack/neutron-lbaas-dashboard
@@ -1076,7 +1015,6 @@ openstack-loci:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/loci
   branches:
@@ -1086,7 +1024,6 @@ openstack-manila:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/manila
     - openstack/manila-image-elements
@@ -1104,7 +1041,6 @@ openstack-masakari:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/masakari
     - openstack/masakari-dashboard
@@ -1118,7 +1054,6 @@ openstack-meghdwar:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/meghdwar
   branches:
@@ -1358,7 +1293,6 @@ openstack-merlin:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/merlin
   branches:
@@ -1368,7 +1302,6 @@ openstack-mistral:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/mistral
     - openstack/mistral-dashboard
@@ -1385,7 +1318,6 @@ openstack-mogan:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/mogan
     - openstack/mogan-specs
@@ -1398,7 +1330,6 @@ openstack-monasca:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - ^openstack/monasca-.*
     - openstack/python-monascaclient
@@ -1409,7 +1340,6 @@ openstack-nemesis:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/nemesis
   branches:
@@ -1419,7 +1349,6 @@ openstack-net-bgpvpn:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/networking-bgpvpn
   branches:
@@ -1431,7 +1360,6 @@ openstack-networking-cisco:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/networking-cisco
   branches:
@@ -1442,7 +1370,6 @@ openstack-neutron:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/networking-bagpipe
     - openstack/networking-bgpvpn
@@ -1469,7 +1396,6 @@ openstack-nfv:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/telcowg-usecases
   branches:
@@ -1479,7 +1405,6 @@ openstack-nova:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/gantt
     - openstack/nova
@@ -1497,7 +1422,6 @@ openstack-onos:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/networking-onos
   branches:
@@ -1507,7 +1431,6 @@ openstack-operators:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ha-guide
     - openstack/operations-guide
@@ -1524,7 +1447,6 @@ openstack-oslo:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-dev/cookiecutter
     - openstack-dev/oslo-cookiecutter
@@ -1576,7 +1498,6 @@ openstack-pandaman:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/pandaman
   branches:
@@ -1586,7 +1507,6 @@ openstack-performance:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/osprofiler
     - openstack/performance-docs
@@ -1597,7 +1517,6 @@ openstack-placement:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/nova-specs
     - openstack/os-traits
@@ -1611,7 +1530,6 @@ openstack-poppy:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/poppy
     - openstack/poppy-ui
@@ -1622,7 +1540,6 @@ openstack-powervm:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ceilometer-powervm
     - openstack/networking-powervm
@@ -1635,7 +1552,6 @@ openstack-publiccloud:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/publiccloud-wg
   branches:
@@ -1645,7 +1561,6 @@ openstack-qa:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-dev/bashate
     - openstack-dev/devstack
@@ -1678,7 +1593,6 @@ openstack-qinling:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-qinlingclient
     - openstack/qinling
@@ -1690,7 +1604,6 @@ openstack-quota:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/delimiter
   branches:
@@ -1700,7 +1613,6 @@ openstack-rally:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/rally
     - openstack/rally-openstack
@@ -1711,7 +1623,6 @@ openstack-release:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-infra/releasestatus
     - openstack/release-test
@@ -1724,7 +1635,6 @@ openstack-requirements:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/requirements
   branches:
@@ -1735,7 +1645,6 @@ openstack-rpm-packaging:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/pymod2pkg
     - openstack/renderspec
@@ -1748,7 +1657,6 @@ openstack-sahara:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/openstack-ansible-os_sahara
     - openstack/puppet-sahara
@@ -1768,7 +1676,6 @@ openstack-scalpels:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/scalpels
   branches:
@@ -1806,7 +1713,6 @@ openstack-searchlight:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-searchlightclient
     - openstack/searchlight
@@ -1819,7 +1725,6 @@ openstack-security:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/anchor
     - openstack/security-analysis
@@ -1835,7 +1740,6 @@ openstack-self-healing:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ha-guide
     - openstack/openstack-resource-agents
@@ -1848,7 +1752,6 @@ openstack-service-broker:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/openstack-service-broker
   branches:
@@ -1858,7 +1761,6 @@ openstack-solar:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/solar
     - openstack/solar-resources
@@ -1869,7 +1771,6 @@ openstack-spaceport:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/openstack-spaceport
   branches:
@@ -1879,7 +1780,6 @@ openstack-state-management:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/automaton
     - openstack/taskflow
@@ -1891,7 +1791,6 @@ openstack-steth:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/steth
   branches:
@@ -1901,7 +1800,6 @@ openstack-storlets:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/storlets
   branches:
@@ -1911,7 +1809,6 @@ openstack-swauth:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/swauth
   branches:
@@ -1921,7 +1818,6 @@ openstack-swift:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/liberasurecode
     - openstack/pyeclib
@@ -1939,7 +1835,6 @@ openstack-tc:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/constellations
     - openstack/governance
@@ -1951,7 +1846,6 @@ openstack-telemetry:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/aodh
     - openstack/ceilometer
@@ -1969,7 +1863,6 @@ openstack-third-party-ci:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-infra/ciwatch
     - openstack-infra/project-config-example
@@ -1982,7 +1875,6 @@ openstack-trove:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-troveclient
     - openstack/trove
@@ -1997,7 +1889,6 @@ openstack-uc:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/governance-uc
   branches:
@@ -2007,7 +1898,6 @@ openstack-upstream-institute:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/training-guides
     - openstack/upstream-institute-virtual-environment
@@ -2018,7 +1908,6 @@ openstack-ux:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/openstack-ux
   branches:
@@ -2028,7 +1917,6 @@ openstack-vahana:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/vahana
   branches:
@@ -2038,7 +1926,6 @@ openstack-valence:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-valenceclient
     - openstack/valence
@@ -2050,7 +1937,6 @@ openstack-valet:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/valet
   branches:
@@ -2060,7 +1946,6 @@ openstack-vitrage:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-vitrageclient
     - openstack/vitrage
@@ -2074,7 +1959,6 @@ openstack-vpnaas:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/neutron-vpnaas
     - openstack/neutron-vpnaas-dashboard
@@ -2085,7 +1969,6 @@ openstack-watcher:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/puppet-watcher
     - openstack/python-watcherclient
@@ -2100,7 +1983,6 @@ openstack-windmill:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/ansible-role-bindep
     - openstack/ansible-role-carbon
@@ -2131,7 +2013,6 @@ openstack-zaqar:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-zaqarclient
     - openstack/zaqar
@@ -2145,7 +2026,6 @@ openstack-zun:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-zunclient
     - openstack/zun
@@ -2169,7 +2049,6 @@ puppet-openstack:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/puppet-aodh
     - openstack/puppet-barbican
@@ -2230,7 +2109,6 @@ rdo:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/packstack
   branches:
@@ -2241,7 +2119,6 @@ refstack:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-infra/puppet-refstack
     - openstack/python-tempestconf
@@ -2254,7 +2131,6 @@ senlin:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-senlinclient
     - openstack/senlin
@@ -2267,7 +2143,6 @@ solum:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-solumclient
     - openstack/solum
@@ -2282,7 +2157,6 @@ starlingx:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - ^openstack/stx-.*
   branches:
@@ -2294,7 +2168,6 @@ storyboard:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-infra/python-storyboardclient
     - openstack-infra/storyboard
@@ -2307,7 +2180,6 @@ surveil:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/bansho
     - openstack/puppet-surveil
@@ -2321,7 +2193,6 @@ swift3:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/swift3
   branches:
@@ -2331,7 +2202,6 @@ swiftonfile:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/swiftonfile
   branches:
@@ -2341,7 +2211,6 @@ swiftonhpss:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/swiftonhpss
   branches:
@@ -2351,7 +2220,6 @@ syscompass:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/compass-adapters
     - openstack/compass-core
@@ -2365,7 +2233,6 @@ tacker:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-tackerclient
     - openstack/tacker
@@ -2379,7 +2246,6 @@ tricircle:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/python-tricircleclient
     - openstack/tricircle
@@ -2390,7 +2256,6 @@ tripleo:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - ^openstack/ansible-role-tripleo-.*
     - ^openstack/tripleo.*
@@ -2419,7 +2284,6 @@ wsme:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack/wsme
   branches:
@@ -2429,7 +2293,6 @@ zuul:
   events:
     - patchset-created
     - change-merged
-    - x-vrif-minus-2
   projects:
     - openstack-infra/nodepool
     - openstack-infra/zone-zuul-ci.org
diff --git a/tools/irc_tests.py b/tools/irc_tests.py
index e2c3a804a6..7253651b12 100755
--- a/tools/irc_tests.py
+++ b/tools/irc_tests.py
@@ -35,7 +35,7 @@ def access_gerrit_check():
 
     print("Basic check of gerritbot/channels.yaml")
     REQUIRED_ENTRIES = ("branches", "events", "projects")
-    VALID_EVENTS = ("change-merged", "patchset-created", "x-vrif-minus-2")
+    VALID_EVENTS = ("change-merged", "patchset-created")
     for channel in gerrit_config:
         for entry in REQUIRED_ENTRIES:
             if entry not in gerrit_config[channel]: