Merge "Add Savanna testing support"

devstack-vm-gate-wrap.sh

@@ -409,8 +409,11 @@ PROJECTS="openstack/python-keystoneclient $PROJECTS"
 PROJECTS="openstack/python-neutronclient $PROJECTS"
 PROJECTS="openstack/python-novaclient $PROJECTS"
 PROJECTS="openstack/python-openstackclient $PROJECTS"
+PROJECTS="openstack/python-savannaclient $PROJECTS"
 PROJECTS="openstack/python-swiftclient $PROJECTS"
 PROJECTS="openstack/requirements $PROJECTS"
+PROJECTS="openstack/savanna $PROJECTS"
+PROJECTS="openstack/savanna-dashboard $PROJECTS"
 PROJECTS="openstack/swift $PROJECTS"
 PROJECTS="openstack/tempest $PROJECTS"
 
@@ -488,6 +491,9 @@ export DEVSTACK_GATE_CELLS=${DEVSTACK_GATE_CELLS:-0}
 # Set to 1 to run ironic baremetal provisioning service.
 export DEVSTACK_GATE_IRONIC=${DEVSTACK_GATE_IRONIC:-0}
 
+# Set to 1 to run savanna
+export DEVSTACK_GATE_SAVANNA=${DEVSTACK_GATE_SAVANNA:-0}
+
 # The following variables are set for different directions of Grenade updating
 # for a stable branch we want to both try to upgrade forward n => n+1 as
 # well as upgrade from last n-1 => n.

devstack-vm-gate.sh

@@ -85,6 +85,9 @@ function setup_localrc() {
         if [ "$DEVSTACK_GATE_IRONIC" -eq "1" ]; then
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,ir-api,ir-cond
         fi
+        if [ "$DEVSTACK_GATE_SAVANNA" -eq "1" ]; then
+            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,savanna
+        fi
         # When uncommented this will download and register the most recent successfully built
         # ubuntu-vm-heat-cfntools image from jenkins.tripleo.org
         # echo "IMAGE_URLS+=,\"http://jenkins.tripleo.org:8080/job/autobuilt-images/elements=ubuntu%20vm%20heat-cfntools/lastSuccessfulBuild/artifact/ubuntu-vm-heat-cfntools.qcow2\"" >>localrc