From db8472489ab9e5c3eda72a31f985cda4133562b5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 18 Jan 2018 12:07:54 -0600 Subject: [PATCH] Remove feature/zuulv3 branch references Change-Id: I8da648011ae7b680e99fc137fc0e34296c1e432c --- gerritbot/channels.yaml | 2 -- tox.ini | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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 5008fbe568..db6bf1f4f3 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