Prepare for full stack CI job

Related-Bug: #1467275

Change-Id: I90f4794f48ae151a888f37df26c087a7fdcd9d31

diff --git a/TESTING.rst b/TESTING.rst
index c05018e558dd83caf000ec80e5e21e9cc2c6b5bc..ca71c0f5762266685a446cdadbd086bee0acc95f 100644 (file)
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -242,10 +242,7 @@ dependencies as the functional tests, using the configuration script
 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
 advise to run ./stack.sh successfully to make sure all Neutron's
-dependencies are met.  Also note that in order to preserve resources
-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
+dependencies are met. Full-stack based Neutron daemons produce logs to a
 sub-folder in /tmp/fullstack-logs (for example, a test named
 "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.

diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index dc31d2f68179361501c1af47a89b5155d35f11bd..c5399e82b4b597e4e6d1d812d4d5b66266d43e5a 100644 (file)
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -7,7 +7,7 @@ set -ex
 VENV=${1:-"dsvm-functional"}
 
 
-if [ "$VENV" == "dsvm-functional" ]
+if [ "$VENV" == "dsvm-functional" ] || [ "$VENV" == "dsvm-fullstack" ]
 then
     # The following need to be set before sourcing
     # configure_for_func_testing.

diff --git a/neutron/tests/contrib/post_test_hook.sh b/neutron/tests/contrib/post_test_hook.sh
index 62d47ce01a82fd1aea23ba7ab98e99b223b79ee8..19f72b8c767054f46cb03e0ff577262bb69dfbbc 100644 (file)
--- a/neutron/tests/contrib/post_test_hook.sh
+++ b/neutron/tests/contrib/post_test_hook.sh
@@ -24,13 +24,13 @@ function generate_testr_results {
     # 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
     # 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 mv /tmp/fullstack-logs/* /opt/stack/logs/
     fi
 }
 
-if [ "$venv" == "dsvm-functional" ]
+if [ "$venv" == "dsvm-functional" ] || [ "$venv" == "dsvm-fullstack" ]
 then
     owner=stack
     sudo_env=

diff --git a/neutron/tests/functional/__init__.py b/neutron/tests/functional/__init__.py
index 86c037e23ad6dc6e733532c71365e27da825f860..a2a87e23b26e1544d8a0700bd36cb233db17b708 100644 (file)
--- a/neutron/tests/functional/__init__.py
+++ b/neutron/tests/functional/__init__.py
@@ -27,7 +27,6 @@ def load_tests(loader, tests, pattern):
     target_dirs = [
         this_dir,
         os.path.join(parent_dir, 'retargetable'),
-        os.path.join(parent_dir, 'fullstack'),
     ]
     for start_dir in target_dirs:
         new_tests = loader.discover(start_dir=start_dir, pattern=pattern)