X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Finclude-raw-openstack-ci.sh;h=f2c0cad47b92d9c8f03cea1ff4484bd4b97777bb;hb=29138b625c035edf31267669285141bf1d2f7241;hp=948b5ec8bc1306ad9ab19e3e79c5343e6d9116f9;hpb=b1778c91dcc04d8cc5d927a5d31959bb80365355;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/include-raw-openstack-ci.sh b/jjb/ovsdb/include-raw-openstack-ci.sh
index 948b5ec8b..f2c0cad47 100644
--- a/jjb/ovsdb/include-raw-openstack-ci.sh
+++ b/jjb/ovsdb/include-raw-openstack-ci.sh
@@ -16,6 +16,14 @@ sudo mkdir -p /opt/stack/new
 sudo chown -R jenkins:jenkins /opt/stack/new
 sudo bash -c 'echo "stack ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers'
 
+# We need to install some scripts from openstack-infra/project-config
+cd ~
+echo "Setting up infra scripts"
+sudo mkdir -p /usr/local/jenkins/slave_scripts
+git clone https://git.openstack.org/openstack-infra/project-config
+cd project-config
+sudo cp jenkins/scripts/subunit2html.py /usr/local/jenkins/slave_scripts
+
 # Save existing WORKSPACE
 SAVED_WORKSPACE=$WORKSPACE
 export WORKSPACE=~/workspace
@@ -63,6 +71,14 @@ 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;"
 
+# Set ODL_URL_PREFIX if "nexus proxy" is provided
+if [ -n "$ODLNEXUSPROXY" ] ; then
+    DEVSTACK_LOCAL_CONFIG+="ODL_URL_PREFIX=$ODLNEXUSPROXY;"
+fi
+
+## # 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,15 +109,11 @@ export KEEP_LOCALRC=1
 unset GIT_BASE
 
 # Only run certain tempest tests
-export DEVSTACK_GATE_TEMPEST_REGEX="tempest.api.network.test_networks \
-                                    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"