Use only cinder on master.

Change-Id: I2fa6aa941df8b8d40f2f4bb81fc7a16611aed445

devstack-vm-gate-wrap.sh

@@ -25,9 +25,11 @@ PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keyst
 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
 
 # Set to 1 to run cinder instead of nova volume
-export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-1}
+# Only applicable to stable/folsom branch
+export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-0}
 
 # Set to 1 to run quantum instead of nova network
+# Only applicable to master branch
 export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
 
 # Set the virtualization driver to: libvirt, openvz

devstack-vm-gate.sh

@@ -37,13 +37,19 @@ fi
 
 SKIP_EXERCISES=boot_from_volume,client-env
 
-if [ "$GERRIT_BRANCH" != "stable/diablo" ] && 
-   [ "$GERRIT_BRANCH" != "stable/essex" ]; then
+if [ "$ZUUL_BRANCH" == "stable/diablo" ] ||
+   [ "$ZUUL_BRANCH" == "stable/essex" ]; then
+    ENABLED_SERVICES=$ENABLED_SERVICES,n-vol,n-net
+    SKIP_EXERCISES=$SKIP_EXERCISES,swift
+elif [ "$ZUUL_BRANCH" == "stable/folsom" ]; then
+    ENABLED_SERVICES=$ENABLED_SERVICES,n-net,swift
     if [ "$DEVSTACK_GATE_CINDER" -eq "1" ]; then
 	ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
     else
 	ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
     fi
+else # master
+    ENABLED_SERVICES=$ENABLED_SERVICES,swift,cinder,c-api,c-vol,c-sch
     if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then
 	ENABLED_SERVICES=$ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3
 	cat <<EOF >>localrc
@@ -53,10 +59,6 @@ EOF
     else
 	ENABLED_SERVICES=$ENABLED_SERVICES,n-net
     fi
-    ENABLED_SERVICES=$ENABLED_SERVICES,swift
-else
-    ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
-    SKIP_EXERCISES=$SKIP_EXERCISES,swift
 fi
 
 cat <<EOF >>localrc