Use the networking-l2gw project new location
networking-l2gw and networking-l2gw-tempest-plugin are imported to new location now and supposed to be retired from openstack/namespace[1]. -https://review.opendev.org/#/c/744110/ Change-Id: I902ea79cdd3a8e56540ab44a7bd2f986f5d18bca
This commit is contained in:
parent
21c5fb8562
commit
a3b61c2d27
20
.zuul.yaml
20
.zuul.yaml
@ -11,7 +11,7 @@
|
|||||||
- openstack-tox-pep8:
|
- openstack-tox-pep8:
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -23,7 +23,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -35,7 +35,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -47,7 +47,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -59,7 +59,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -75,7 +75,7 @@
|
|||||||
- openstack-tox-pep8:
|
- openstack-tox-pep8:
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -87,7 +87,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -99,7 +99,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -111,7 +111,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
@ -126,7 +126,7 @@
|
|||||||
timeout: 5400
|
timeout: 5400
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/networking-l2gw
|
- x/networking-l2gw
|
||||||
- openstack/networking-sfc
|
- openstack/networking-sfc
|
||||||
- x/vmware-nsxlib
|
- x/vmware-nsxlib
|
||||||
- openstack/neutron-fwaas
|
- openstack/neutron-fwaas
|
||||||
|
@ -31,7 +31,7 @@ function _nsxv_ini_set {
|
|||||||
|
|
||||||
|
|
||||||
function install_neutron_projects {
|
function install_neutron_projects {
|
||||||
pkg_list="networking-l2gw networking-sfc neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
|
pkg_list="networking-sfc neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
|
||||||
for pkg in `echo $pkg_list`
|
for pkg in `echo $pkg_list`
|
||||||
do
|
do
|
||||||
pkg_renamed=`echo $pkg | sed 's/-/_/g'`
|
pkg_renamed=`echo $pkg | sed 's/-/_/g'`
|
||||||
@ -47,6 +47,23 @@ function install_neutron_projects {
|
|||||||
sudo chown -R ${USER}:${USER} src/${pkg}
|
sudo chown -R ${USER}:${USER} src/${pkg}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
# same for packages out of stadium
|
||||||
|
pkg_list="networking-l2gw"
|
||||||
|
for pkg in `echo $pkg_list`
|
||||||
|
do
|
||||||
|
pkg_renamed=`echo $pkg | sed 's/-/_/g'`
|
||||||
|
sudo rm -rf /usr/local/lib/python2.7/dist-packages/${pkg_renamed}*
|
||||||
|
sudo rm -rf /usr/local/lib/python3.5/dist-packages/${pkg_renamed}*
|
||||||
|
sudo rm -rf ./src/${pkg_renamed}*
|
||||||
|
if is_plugin_enabled $pkg; then
|
||||||
|
echo "Plugin $pkg enabled explicitly with enable_plugin"
|
||||||
|
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 chown -R ${USER}:${USER} src/${pkg}
|
||||||
|
fi
|
||||||
|
done
|
||||||
# install neutron and octavia separately to not delete neutron-lib & octavia-lib
|
# install neutron and octavia separately to not delete neutron-lib & octavia-lib
|
||||||
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
|
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
|
||||||
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
|
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
|
||||||
|
2
tox.ini
2
tox.ini
@ -29,7 +29,7 @@ commands = false
|
|||||||
# https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
|
# https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
|
||||||
# note that order is important to ensure dependencies don't override
|
# note that order is important to ensure dependencies don't override
|
||||||
commands =
|
commands =
|
||||||
pip install -q -e "git+https://opendev.org/openstack/networking-l2gw#egg=networking_l2gw"
|
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/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-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/neutron-vpnaas#egg=neutron_vpnaas"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user