ovsdb openstack tempest: tweak DEVSTACK_GATE_TEMPEST_REGEX (part 2)

Reduce tempest tests to a minimal set that is known to work with ODL.
By lowering the bar, we are making an attempt to have ci in the passing
state once again.

Change-Id: I9504ba05c7f458e81c9b17f03aed3a0ba77762cc
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/jjb/ovsdb/include-raw-openstack-ci.sh b/jjb/ovsdb/include-raw-openstack-ci.sh
index 9ed1cd2881609e33cb7f70859d87c274056387f9..f816b7ea19c5135a0cfebb29f38458ac93255665 100644 (file)
--- a/jjb/ovsdb/include-raw-openstack-ci.sh
+++ b/jjb/ovsdb/include-raw-openstack-ci.sh
@@ -63,6 +63,9 @@ DEVSTACK_LOCAL_CONFIG+="ODL_JAVA_MIN_MEM=512m;"
 DEVSTACK_LOCAL_CONFIG+="ODL_JAVA_MAX_MEM=784m;"
 DEVSTACK_LOCAL_CONFIG+="ODL_JAVA_MAX_PERM_MEM=784m;"
 
+## # Trim down the boot wait time
+## export ODL_BOOT_WAIT=30
+
 # And this runs devstack-gate
 export PYTHONUNBUFFERED=true
 export DEVSTACK_GATE_TIMEOUT=120
@@ -93,16 +96,11 @@ export KEEP_LOCALRC=1
 unset GIT_BASE
 
 # Only run certain tempest tests
-export DEVSTACK_GATE_TEMPEST_REGEX="tempest.api.network.test_networks.NetworksIpV6TestJSON \
-                                    tempest.api.network.test_networks.NetworksTestJSON \
-                                    tempest.api.network.test_networks_negative"
+export DEVSTACK_GATE_TEMPEST_REGEX="tempest.api.network.test_networks_negative tempest.api.network.test_networks.NetworksTestJSON"
 
 # Specifically set the services we want
 #OVERRIDE_ENABLED_SERVICES=q-svc,q-dhcp,q-l3,q-meta,quantum,key,g-api,g-reg,n-api,n-crt,n-obj,n-cpu,n-cond,n-sch,n-xvnc,n-cauth,h-eng,h-api,h-api-cfn,h-api-cw,rabbit,tempest,mysql
 
-# Trim down the boot wait time
-export ODL_BOOT_WAIT=30
-
 echo "Copying devstack-vm-gate-wrap.sh"
 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
 echo "Running safe-devstack-vm-gate-wrap.sh"