X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Finclude-raw-openstack-ci.sh;h=1b4277baa426dae1893f159e4134b3be67b57fd6;hb=62c377b70ec4cefe3c64c5e7c74d4d65b3a7852c;hp=201e340726f5c2b5bae725344f0d2825fd6b1fc3;hpb=2b5633a19fdb7131d9580ad9ee246ed6a8621a50;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/include-raw-openstack-ci.sh b/jjb/ovsdb/include-raw-openstack-ci.sh
index 201e34072..1b4277baa 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
@@ -64,6 +72,7 @@ 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
+URL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 if [ -n "$ODLNEXUSPROXY" ] ; then
     DEVSTACK_LOCAL_CONFIG+="ODL_URL_PREFIX=$ODLNEXUSPROXY;"
 fi
@@ -71,6 +80,13 @@ fi
 ## # Trim down the boot wait time
 ## export ODL_BOOT_WAIT=30
 
+# Use specific build, if asked to do so
+if [ "${ODL_VERSION}" == "lithium-latest" ] ; then
+    DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot;"
+elif [ "${ODL_VERSION}" == "helium" ] ; then
+    DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=helium;"
+fi
+
 # And this runs devstack-gate
 export PYTHONUNBUFFERED=true
 export DEVSTACK_GATE_TIMEOUT=120
@@ -100,8 +116,8 @@ export KEEP_LOCALRC=1
 # Unset this because it's set by the underlying Jenkins node ...
 unset GIT_BASE
 
-# Only run certain tempest tests
-export DEVSTACK_GATE_TEMPEST_REGEX="tempest.api.network.test_networks_negative tempest.api.network.test_networks.NetworksTestJSON"
+# By default, only run certain tempest tests
+export DEVSTACK_GATE_TEMPEST_REGEX=${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