diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 250305c595..fb9286d6e8 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -1043,7 +1043,6 @@ openstack-infra: - feature/development #askbot-theme repo - feature/openid #openstackid repo - feature/gearman-zk-shim # nodepool - - feature/zuulv3 # zuul / nodepool - openstack/2.10.2 #gerrit repo - results #gitdm repo # Branches for publications repo @@ -2580,4 +2579,3 @@ zuul: branches: - master - feature/gearman-zk-shim - - feature/zuulv3 diff --git a/tox.ini b/tox.ini index 74bac322ff..08d040c813 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ passenv = # python3. deps = # Zuul is required to supply the zuul ansible modules for ansible-lint - -egit+https://git.openstack.org/openstack-infra/zuul@feature/zuulv3#egg=zuul + -egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul ansible<2.4.0 ansible-lint hacking>=0.10,<0.11