From f1c501ccf6f642927953469b2c7e79f8e73b2f33 Mon Sep 17 00:00:00 2001
From: Boden R <bodenvmw@gmail.com>
Date: Mon, 23 Jul 2018 07:24:36 -0600
Subject: [PATCH] update requirements for neutron-lib 1.18.0

Neutron-lib 1.18.0 is our Rocky RC and is already being used by neutron
[1]. This patch updates the neutron-lib required version to match
neutron [1] in prep for the Rocky release.

It also updates the project zuul jobs to pull in openstack/neutron from
git for the lower constraints job (see failure in PS1).

[1] https://review.openstack.org/#/c/583671/

Change-Id: Ieed673b74d8fef81db57e9e4c26f85207b39e6d6
---
 lower-constraints.txt | 2 +-
 requirements.txt      | 2 +-
 zuul.d/jobs.yaml      | 6 ++++++
 zuul.d/projects.yaml  | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index fb3175cb7..7eb982743 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -52,7 +52,7 @@ msgpack-python==0.4.0
 munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
-neutron-lib==1.14.0
+neutron-lib==1.18.0
 neutron==12.0.0
 openstackdocstheme==1.18.1
 openstacksdk==0.11.2
diff --git a/requirements.txt b/requirements.txt
index 85a62328f..fa70a6f82 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 requests>=2.14.2 # Apache-2.0
 netaddr>=0.7.18 # BSD
-neutron-lib>=1.14.0 # Apache-2.0
+neutron-lib>=1.18.0 # Apache-2.0
 neutron>=12.0.0 # Apache-2.0
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 alembic>=0.8.10 # MIT
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3f181d8cc..e36e7c82b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -161,3 +161,9 @@
       devstack_plugins:
         octavia: https://github.com/openstack/octavia.git
         neutron-lbaas: https://github.com/openstack/neutron-lbaas.git
+
+- job:
+    name: lbaas-tox-lower-constraints
+    parent: openstack-tox-lower-constraints
+    required-projects:
+      - openstack/neutron
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 45ad562ad..36effccc6 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -1,7 +1,7 @@
 - project:
     check:
       jobs:
-        - openstack-tox-lower-constraints
+        - lbaas-tox-lower-constraints
         - neutron-lbaasv2-dsvm-api
         - neutron-lbaasv2-dsvm-py3x-api:
             branches: ^(?!stable/ocata).*$
@@ -19,7 +19,7 @@
     gate:
       queue: neutron-lbaas
       jobs:
-        - openstack-tox-lower-constraints
+        - lbaas-tox-lower-constraints
         - neutron-lbaasv2-dsvm-api
         - neutron-lbaasv2-dsvm-py3x-api:
             branches: ^(?!stable/ocata).*$