commit c3d81b8cb833215fda75b55f391577fcb2ea59c7
Author: asarfaty <asarfaty@vmware.com>
Date:   Thu Oct 15 07:08:19 2020 +0200

    Prepare victoria branch
    
    Change-Id: Idad0a534181023f3787ab73776d7d80448886712

diff --git a/.gitreview b/.gitreview
index 41ffb2f..946fdc1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=x/vmware-nsx.git
+branch=stable/victoria
+defaultbranch=stable/victoria
diff --git a/devstack/lib/nsx_common b/devstack/lib/nsx_common
index 14e09b9..c157282 100644
--- a/devstack/lib/nsx_common
+++ b/devstack/lib/nsx_common
@@ -47,7 +47,7 @@ function install_neutron_projects {
             sudo chown -R ${USER}:${USER} src/${pkg}
         fi
     done
-    # same for packages out of stadium
+    # same for l2wg which is out of stadium (last stable branch is ussuri)
     pkg_list="networking-l2gw"
     for pkg in `echo $pkg_list`
     do
@@ -60,7 +60,7 @@ function install_neutron_projects {
         elif use_library_from_git $pkg; then
             echo "Project $pkg enabled explicitly from LIBS_FROM_GIT"
         else
-            sudo -H ${PIP} install -e "git+https://opendev.org/x/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}"
+            sudo -H ${PIP} install -e "git+https://opendev.org/x/${pkg}@stable/ussuri#egg=${pkg_renamed}"
             sudo chown -R ${USER}:${USER} src/${pkg}
         fi
     done
diff --git a/requirements.txt b/requirements.txt
index f554576..2ec6e2b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,15 +32,15 @@ decorator>=4.4.1 # BSD
 
 # These repos are installed from git in OpenStack CI if the job
 # configures them as required-projects:
-neutron>=16.0.0.0 # Apache-2.0
+neutron>=17.0.0.0 # Apache-2.0
 networking-l2gw>=16.0.0 # Apache-2.0
-networking-sfc>=9.0.0.0 # Apache-2.0
+networking-sfc>=10.0.0.0 # Apache-2.0
 neutron-fwaas>=16.0.0.0 # Apache-2.0
-neutron-vpnaas>=16.0.0.0 # Apache-2.0
+neutron-vpnaas>=17.0.0.0 # Apache-2.0
 neutron-dynamic-routing>=16.0.0.0 # Apache-2.0
 vmware-nsxlib>=16.0.0 # Apache-2.0
-# NOTE: we require octavia but can't depend on it for Stein
-# octavia>=6.0.0.0 # Apache-2.0
+# NOTE: we require octavia but can't depend on it
+# octavia>=7.0.0.0 # Apache-2.0
 
 # The comment below indicates this project repo is current with neutron-lib
 # and should receive neutron-lib consumption patches as they are released
diff --git a/tox.ini b/tox.ini
index db07d1d..bcbe839 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,13 +29,14 @@ commands = false
 # https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
 # note that order is important to ensure dependencies don't override
 commands =
-    pip install -q -e "git+https://opendev.org/x/networking-l2gw#egg=networking_l2gw"
-    pip install -q -e "git+https://opendev.org/openstack/networking-sfc#egg=networking_sfc"
-    pip install -q -e "git+https://opendev.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
-    pip install -q -e "git+https://opendev.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
-    pip install -q -e "git+https://opendev.org/openstack/octavia#egg=octavia"
-    pip install -q -e "git+https://opendev.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
-    pip install -q -e "git+https://opendev.org/openstack/neutron#egg=neutron"
+    pip install -q -e "git+https://opendev.org/x/networking-l2gw@stable/ussuri#egg=networking_l2gw"
+    pip install -q -e "git+https://opendev.org/openstack/networking-sfc@stable/victoria#egg=networking_sfc"
+    pip install -q -e "git+https://opendev.org/openstack/neutron-fwaas@stable/ussuri#egg=neutron_fwaas"
+    pip install -q -e "git+https://opendev.org/openstack/neutron-dynamic-routing@stable/victoria#egg=neutron_dynamic_routing"
+    pip install -q -e "git+https://opendev.org/openstack/neutron-vpnaas@stable/victoria#egg=neutron_vpnaas"
+    pip install -q -e "git+https://opendev.org/openstack/octavia@stable/victoria#egg=octavia"
+    pip install -q -e "git+https://opendev.org/openstack/vmware-nsxlib@stable/victoria#egg=vmware_nsxlib"
+    pip install -q -e "git+https://opendev.org/openstack/neutron@stable/victoria#egg=neutron"
 
 
 [testenv:functional]