This is a combination of 10 commits that are needed to have successful
check, gate and periodic stable job runs.
Note: All the tempest related fixes are due to the fact that we can't
pin the version of tempest that we are using, and hence need to adjust
things when tempest evolves.
1. Fix sphinx-docs job for stable branch
build-openstack-sphinx-docs jobs fail on stable branches due to the new
pip version 10 introduces some previously Warning as Error: in case of
calling "pip install" without any package name, the command fails.
tox_install.sh is called during docs job without any package passed to
pip.
Also some tests still needs networking-odl package to be installed, however
it is removed from the required-projects of networking-bgpvpn, so they
fails now. To fix this, the easiest solution is to add networking-odl
to .zuul.yaml on stable/* branch as required project.
2. Add networking-odl for periodic-stable jobs
periodic-stable jobs fail: networking-odl is required for jobs on queens
and older stable branches. From rocky, there is no tox_install.sh any
more, so this is not needed there.
3. (stestr change removed)
4. use networking-odl from pypi instead of git master
Two reasons:
- no point in tracking master, now that development is done
on odl bgpvpn v2 driver, which does not sit in n8g-bgpvpn tree
- odl master is sometimes broken [1], which impacts our CI
* When installing git repos into tox venv, there is no need to
use full clone. Shallow clone like --depth 1 is sufficient.
It speeds up tox venv creation.
* Fix import check for networking-bagpipe and networking-odl.
Python module names use underscores instead of hyphens,
so the current iport check always returns false.
As a result, installation of these projects are run multiple times.
* Allow to specify GIT_BASE for local testing.
Previously PIP_LOCATION exists, but the tox_install.sh installs
four repositories so PIP_LOCATION actually cannot be used.
In my local env, the time to prepare tox env was reduced from 4m52s
to 2m39s for the first run and from 42s to 19s for the second run
or later (after applying the first two points above).
Note(elod.illes): some changes of tox_install.sh didn't seem trivial to
git so it needed some manual intervention...
Closes-Bug: 1716746
6. Change sourcing neutron l2 agent script for devstack
Source the l2 agent script only in case and in place where functions
from this are going to be used.
7. unbreak tempest tests
The initialization of the self.networks variable was missing.
I don't know yet why this wasn't showing up before, possibly
because the tempest test suite was not in CI before (?).
8. tempest: unbreak scenario test
The initialization of the self.subnets variable was missing.
I don't know yet why this wasn't showing up before, possibly
because the tempest test suite was not in CI before (?).
9. tempest: Switch to local copy of tempset/scenario/manager.py
The manager.py file was literally copied from
tempest as of today. [1]
tempest/scenario/manager.py is not a part of tempest stable
interface for plugins. [2]
This was suggested on openstack-dev as a preparation for
the coming refactoring in tempest. [3]
As tempest is branchless, this change needs to be backported
to all relevant stable branches.
10. Register query hooks at BGPVPNPluginDb object creation
This change also modifies the expected exception raised in tempest
while testing a delete of a bgpvpn by a regular tenant :
the Forbidden exception is now raised instead of the NotFound one.
Note(elod.illes): only the exception change is cherry-picked from
this commit, the networking_bgpvpn/neutron/db/bgpvpn_db.py change
is skipped.
Closes-bug: 1685930
(cherry picked from commit ff84e5a105cdc8e70693bcb0a7b3e542d5b4f12d)
(cherry picked from commit d0c1a6b58267bb1e1346cfe35a61f5b57d9cc672)
(cherry picked from commit 8f576a2ccb2aa16ff1585b93c4fbb58247d209bd)
(cherry picked from commit 9c3494339cd5ee22b03f427fd8c2870335e7f900)
(cherry picked from commit 650c37b1429d262cf2bc26036828999fc0b38e7e)
(cherry picked from commit f24f9ce37f55d4a59f097064a80e8e46a7c20bc0)
(cherry picked from commit d6baa9cdde0548072b06a7d5147d1e53515cf628)
(cherry picked from commit fe90ea22d604ac3bc81a693e469796a65d84f98e)
(cherry picked from commit a62d8c64724fd0cc27ada7c4a91d2806bf87bb58)
(cherry picked from commit 0bb5a67dcf1bf103a8df321b861049515c946134)
(cherry picked from commit c7211ed718f9b18e186bc66eb460b1526dba40f2)
Reviewed: https:/ /review. openstack. org/596852 /git.openstack. org/cgit/ openstack/ networking- bgpvpn/ commit/ ?id=99ab547770a 9662ee63851f9ce 13b908376a453a
Committed: https:/
Submitter: Zuul
Branch: stable/ocata
commit 99ab547770a9662 ee63851f9ce13b9 08376a453a
Author: Elod Illes <email address hidden>
Date: Tue Jun 5 14:16:56 2018 +0200
Fix check, gate and periodic jobs
This is a combination of 10 commits that are needed to have successful
check, gate and periodic stable job runs.
Note: All the tempest related fixes are due to the fact that we can't
pin the version of tempest that we are using, and hence need to adjust
things when tempest evolves.
1. Fix sphinx-docs job for stable branch
build- openstack- sphinx- docs jobs fail on stable branches due to the new
pip version 10 introduces some previously Warning as Error: in case of
calling "pip install" without any package name, the command fails.
tox_install.sh is called during docs job without any package passed to
pip.
Also some tests still needs networking-odl package to be installed, however
it is removed from the required-projects of networking-bgpvpn, so they
fails now. To fix this, the easiest solution is to add networking-odl
to .zuul.yaml on stable/* branch as required project.
2. Add networking-odl for periodic-stable jobs
periodic-stable jobs fail: networking-odl is required for jobs on queens
and older stable branches. From rocky, there is no tox_install.sh any
more, so this is not needed there.
3. (stestr change removed)
4. use networking-odl from pypi instead of git master
Two reasons:
- no point in tracking master, now that development is done
on odl bgpvpn v2 driver, which does not sit in n8g-bgpvpn tree
- odl master is sometimes broken [1], which impacts our CI
[1] http:// logs.openstack. org/70/ 470470/ 2/check/ gate-networking -bgpvpn- dsvm-functional -ubuntu- xenial/ febf152/ console. html#_2017- 06-05_12_ 56_21_302481
5. Speed up tox_install.sh
* When installing git repos into tox venv, there is no need to
use full clone. Shallow clone like --depth 1 is sufficient.
It speeds up tox venv creation.
* Fix import check for networking-bagpipe and networking-odl.
Python module names use underscores instead of hyphens,
so the current iport check always returns false.
As a result, installation of these projects are run multiple times.
* Allow to specify GIT_BASE for local testing.
Previously PIP_LOCATION exists, but the tox_install.sh installs
four repositories so PIP_LOCATION actually cannot be used.
In my local env, the time to prepare tox env was reduced from 4m52s
to 2m39s for the first run and from 42s to 19s for the second run
or later (after applying the first two points above).
Note( elod.illes) : some changes of tox_install.sh didn't seem trivial to
git so it needed some manual intervention...
Closes-Bug: 1716746
6. Change sourcing neutron l2 agent script for devstack
Source the l2 agent script only in case and in place where functions
from this are going to be used.
7. unbreak tempest tests
The initialization of the self.networks variable was missing.
I don't know yet why this wasn't showing up before, possibly
because the tempest test suite was not in CI before (?).
8. tempest: unbreak scenario test
The initialization of the self.subnets variable was missing.
I don't know yet why this wasn't showing up before, possibly
because the tempest test suite was not in CI before (?).
9. tempest: Switch to local copy of tempset/ scenario/ manager. py
The manager.py file was literally copied from
tempest as of today. [1]
tempest/ scenario/ manager. py is not a part of tempest stable
interface for plugins. [2]
This was suggested on openstack-dev as a preparation for
the coming refactoring in tempest. [3]
As tempest is branchless, this change needs to be backported
to all relevant stable branches.
[1] d184d619d7adc6a b60055884515055 a7f3cf7770 /docs.openstack .org/developer/ tempest/ plugin. html#stable- tempest- apis-plugins- may-use lists.openstack .org/pipermail/ openstack- dev/2017- February/ 112938. html
[2] https:/
[3] http://
10. Register query hooks at BGPVPNPluginDb object creation
This change also modifies the expected exception raised in tempest
while testing a delete of a bgpvpn by a regular tenant :
the Forbidden exception is now raised instead of the NotFound one.
Note( elod.illes) : only the exception change is cherry-picked from bgpvpn/ neutron/ db/bgpvpn_ db.py change
this commit, the networking_
is skipped.
Closes-bug: 1685930
(cherry picked from commit ff84e5a105cdc8e 70693bcb0a7b3e5 42d5b4f12d) e1346cfe35a61f5 b57d9cc672) ff1585b93c4fbb5 8247d209bd) 2b03f427fd8c287 0335e7f900) cf2bc2603682899 9fc0b38e7e) 59f097064a80e8e 46a7c20bc0) 72b06a7d5147d1e 53515cf628) bc81a693e469796 a65d84f98e) c27ada7c4a91d28 06bf87bb58) 3a8df321b861049 515c946134) e186bc66eb460b1 526dba40f2)
(cherry picked from commit d0c1a6b58267bb1
(cherry picked from commit 8f576a2ccb2aa16
(cherry picked from commit 9c3494339cd5ee2
(cherry picked from commit 650c37b1429d262
(cherry picked from commit f24f9ce37f55d4a
(cherry picked from commit d6baa9cdde05480
(cherry picked from commit fe90ea22d604ac3
(cherry picked from commit a62d8c64724fd0c
(cherry picked from commit 0bb5a67dcf1bf10
(cherry picked from commit c7211ed718f9b18
Change-Id: I93aea1800b6403 482a7e15116610e feed02c28a1