Merge "Enable zaqar for senlin integration test"

This commit is contained in:
Jenkins 2016-09-05 08:36:28 +00:00 committed by Gerrit Code Review
commit 5370f10219

View File

@ -16,7 +16,6 @@
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/senlin $PROJECTS"
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.{test_type}"
@ -27,17 +26,21 @@
export SENLIN_BACKEND="openstack_test"
else
export SENLIN_BACKEND="openstack"
ENABLED_SERVICES=key,
ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond,
ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,c-bak,
ENABLED_SERVICES+=g-api,g-reg,
ENABLED_SERVICES+=heat,h-api,h-api-cfn,h-api-cw,h-eng,
ENABLED_SERVICES+=q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,
services=key
services+=,n-api,n-crt,n-cpu,n-sch,n-cond
services+=,cinder,c-api,c-vol,c-sch,c-bak
services+=,g-api,g-reg
services+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
services+=,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc
# Enable LBaaS V2 plugin
export DEVSTACK_GATE_NEUTRON=1
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
ENABLED_SERVICES+=",q-lbaasv2"
export ENABLED_SERVICES
services+=,q-lbaasv2
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
# Enable Zaqar
export PROJECTS="openstack/zaqar $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
export OVERRIDE_ENABLED_SERVICES=$services
fi
if [ "$BRANCH_OVERRIDE" != "default" ] ; then