openstack/devstack-gate
Code Issues Proposed changes

Run heat by default.

Browse Source 
Change-Id: Ibaa32f3eb92bcf0a91ca87a054f75bd1a09a6cd4
This commit is contained in:
Steve Baker
2013-06-19 10:19:13 +12:00
parent 2553ecdc2b
commit 1cd5517f73
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@@ -20,9 +20,11 @@ change to the following projects must pass the devstack gate test::
nova
glance
keystone
heat
horizon
quantum
python-novaclient
python-heatclient
python-keystoneclient
python-quantumclient
devstack

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

@@ -291,7 +291,7 @@ function cleanup_host {
set +o xtrace
}
PROJECTS="openstack-dev/devstack openstack-dev/grenade openstack-dev/pbr openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient ${PROJECTS}"
PROJECTS="openstack-dev/devstack openstack-dev/grenade openstack-dev/pbr openstack/nova openstack/glance openstack/heat openstack/keystone openstack/python-novaclient openstack/python-heatclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient ${PROJECTS}"
# Set this variable to skip updating the devstack-gate project itself.
# Useful in development so you can edit scripts in place and run them
@@ -349,10 +349,6 @@ export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0}
# Only applicable to master branch
export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
# Set to 1 to run heat
# Only applicable to master branch
export DEVSTACK_GATE_HEAT=${DEVSTACK_GATE_HEAT:-0}
# Set to 1 to run grenade.
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0}

11
devstack-vm-gate.sh
View File

@@ -54,7 +54,7 @@ function setup_localrc() {
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-vol
fi
else # master
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng
if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
echo "Q_USE_DEBUG_COMMAND=True" >>localrc
@@ -62,12 +62,9 @@ function setup_localrc() {
else
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
fi
if [ "$DEVSTACK_GATE_HEAT" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,heat,h-api,h-api-cfn,h-api-cw,h-eng
# 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
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
fi
cat <<EOF >>localrc

2
devstack-vm-update-image.py
View File

@@ -48,6 +48,7 @@ else:
PROJECTS = ['openstack/nova',
'openstack/glance',
'openstack/keystone',
'openstack/heat',
'openstack/horizon',
'openstack/cinder',
'openstack/python-cinderclient',
@@ -56,6 +57,7 @@ PROJECTS = ['openstack/nova',
'openstack/quantum',
'openstack/python-glanceclient',
'openstack/python-keystoneclient',
'openstack/python-heatclient',
'openstack/python-novaclient',
'openstack/python-openstackclient',
'openstack/python-quantumclient',