openstack/neutron
Code Issues Proposed changes

Prepare for full stack CI job

Browse Source 
Related-Bug: #1467275

Change-Id: I90f4794f48ae151a888f37df26c087a7fdcd9d31
This commit is contained in:
Assaf Muller 2015-06-21 15:34:21 -04:00
parent d9cb1e832f
commit 408af3f7da
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TESTING.rst
View File

@ -242,10 +242,7 @@ dependencies as the functional tests, using the configuration script
tools/configure_for_func_testing.sh is advised (as described above). tools/configure_for_func_testing.sh is advised (as described above).
When running full-stack tests on a clean VM for the first time, we When running full-stack tests on a clean VM for the first time, we
advise to run ./stack.sh successfully to make sure all Neutron's advise to run ./stack.sh successfully to make sure all Neutron's
dependencies are met. Also note that in order to preserve resources dependencies are met. Full-stack based Neutron daemons produce logs to a
on the gate, running the dsvm-functional suite will also run all
full-stack tests (and a new worker won't be assigned specifically for
dsvm-fullstack). Full-stack based Neutron daemons produce logs to a
sub-folder in /tmp/fullstack-logs (for example, a test named sub-folder in /tmp/fullstack-logs (for example, a test named
"test_example" will produce logs to /tmp/fullstack-logs/test_example/), "test_example" will produce logs to /tmp/fullstack-logs/test_example/),
so that will be a good place to look if your test is failing. so that will be a good place to look if your test is failing.

2
neutron/tests/contrib/gate_hook.sh
View File

@ -7,7 +7,7 @@ set -ex
VENV=${1:-"dsvm-functional"} VENV=${1:-"dsvm-functional"}
if [ "$VENV" == "dsvm-functional" ] if [ "$VENV" == "dsvm-functional" ] || [ "$VENV" == "dsvm-fullstack" ]
then then
# The following need to be set before sourcing # The following need to be set before sourcing
# configure_for_func_testing. # configure_for_func_testing.

4
neutron/tests/contrib/post_test_hook.sh
View File

@ -24,13 +24,13 @@ function generate_testr_results {
# holding those files to /opt/stack/logs. Files with .log suffix have their # holding those files to /opt/stack/logs. Files with .log suffix have their
# suffix changed to .txt (so browsers will know to open the compressed # suffix changed to .txt (so browsers will know to open the compressed
# files and not download them). # files and not download them).
if [ -d /tmp/fullstack-logs/ ]; then if [ "$venv" == "dsvm-fullstack" ] && [ -d /tmp/fullstack-logs/ ]; then
sudo find /tmp/fullstack-logs -iname "*.log" -type f -exec mv {} {}.txt \; -exec gzip -9 {}.txt \; sudo find /tmp/fullstack-logs -iname "*.log" -type f -exec mv {} {}.txt \; -exec gzip -9 {}.txt \;
sudo mv /tmp/fullstack-logs/* /opt/stack/logs/ sudo mv /tmp/fullstack-logs/* /opt/stack/logs/
fi fi
} }
if [ "$venv" == "dsvm-functional" ] if [ "$venv" == "dsvm-functional" ] || [ "$venv" == "dsvm-fullstack" ]
then then
owner=stack owner=stack
sudo_env= sudo_env=

1
neutron/tests/functional/__init__.py
View File

@ -27,7 +27,6 @@ def load_tests(loader, tests, pattern):
target_dirs = [ target_dirs = [
this_dir, this_dir,
os.path.join(parent_dir, 'retargetable'), os.path.join(parent_dir, 'retargetable'),
os.path.join(parent_dir, 'fullstack'),
] ]
for start_dir in target_dirs: for start_dir in target_dirs:
new_tests = loader.discover(start_dir=start_dir, pattern=pattern) new_tests = loader.discover(start_dir=start_dir, pattern=pattern)