From 53d8ab59be992e6a06668cd3c37aed9d789c7a3a Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 21 Jun 2012 09:30:55 -0700 Subject: [PATCH] Add swift. Change-Id: Ibc0d1fdac4d1705f14c39d727d82780163ea6262 --- devstack-vm-gate-wrap.sh | 2 +- devstack-vm-gate.sh | 7 +++++-- devstack-vm-update-image.py | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 5ef08f12..ccc85fb3 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -19,7 +19,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/tempest openstack/cinder openstack/python-cinderclient" +PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient" # Set to 1 to run the Tempest test suite export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0} diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index f7732ba9..0323bdc3 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -35,9 +35,11 @@ fi if [ "$GERRIT_BRANCH" != "stable/diablo" ] && [ "$GERRIT_BRANCH" != "stable/essex" ]; then - ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch + ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch,swift + SKIP_EXERCISES=boot_from_volume,client-env else ENABLED_SERVICES=$ENABLED_SERVICES,n-vol + SKIP_EXERCISES=boot_from_volume,client-env,swift fi cat <localrc @@ -53,13 +55,14 @@ SWIFT_HASH=1234123412341234 ROOTSLEEP=0 ERROR_ON_CLONE=True ENABLED_SERVICES=$ENABLED_SERVICES -SKIP_EXERCISES=boot_from_volume,client-env,swift +SKIP_EXERCISES=$SKIP_EXERCISES SERVICE_HOST=127.0.0.1 SYSLOG=True SCREEN_LOGDIR=$DEST/screen-logs FIXED_RANGE=10.1.0.0/24 FIXED_NETWORK_SIZE=256 VIRT_DRIVER=$DEVSTACK_GATE_VIRT_DRIVER +SWIFT_REPLICAS=1 export OS_NO_CACHE=True EOF diff --git a/devstack-vm-update-image.py b/devstack-vm-update-image.py index 53f63b45..0d24828a 100755 --- a/devstack-vm-update-image.py +++ b/devstack-vm-update-image.py @@ -49,6 +49,7 @@ PROJECTS = ['openstack/nova', 'openstack/horizon', 'openstack/cinder', 'openstack/python-cinderclient', + 'openstack/swift', 'openstack/tempest', 'openstack/python-glanceclient', 'openstack/python-keystoneclient',