openstack/devstack-gate
Code Issues Proposed changes

Add a switch to run n-vol or cinder.

Browse Source 
Both will be supported in Folsom, so we will need a job to test
each.

Change-Id: Ifd7215a49409d471ce090456aa4a62c1f4a85d32
This commit is contained in:
James E. Blair
2012-08-28 16:55:32 -07:00
parent 177e7ab006
commit 1b367a87fa
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devstack-vm-gate-wrap.sh
View File

@@ -24,6 +24,9 @@ PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keyst
# Set to 1 to run the Tempest test suite
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}
# Set the virtualization driver to: libvirt, openvz
export DEVSTACK_GATE_VIRT_DRIVER=${DEVSTACK_GATE_VIRT_DRIVER:-libvirt}

17
devstack-vm-gate.sh
View File

@@ -33,13 +33,20 @@ if [ "$ZUUL_BRANCH" == "stable/diablo" ]; then
export DEVSTACK_GATE_TEMPEST=0
fi
if [ "$ZUUL_BRANCH" != "stable/diablo" ] &&
[ "$ZUUL_BRANCH" != "stable/essex" ]; then
ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch,swift
SKIP_EXERCISES=boot_from_volume,client-env
SKIP_EXERCISES=boot_from_volume,client-env
if [ "$GERRIT_BRANCH" != "stable/diablo" ] &&
[ "$GERRIT_BRANCH" != "stable/essex" ]; then
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
ENABLED_SERVICES=$ENABLED_SERVICES,swift
else
ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
SKIP_EXERCISES=boot_from_volume,client-env,swift
SKIP_EXERCISES=$SKIP_EXERCISES,swift
fi
cat <<EOF >localrc