openstack/project-config
Code Issues Proposed changes

Further fix for Senlin integration test

Browse Source 
Using ENABLED_SERVICES rather than OVERRIDE_ENABLED_SERVICES
to setup senlin integration test job.

Change-Id: I36bf6b920a38cf3f06c5266e7fffa5c0bbd1f2d3
This commit is contained in:
yanyanhu 2016-09-18 21:43:43 -04:00
parent ab6fd866d7
commit 0fe005d3eb
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jenkins/jobs/senlin.yaml
View File

@ -26,21 +26,18 @@
export SENLIN_BACKEND="openstack_test"
else
export SENLIN_BACKEND="openstack"
services=key,mysql
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
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,
# Enable LBaaS V2 plugin
export DEVSTACK_GATE_NEUTRON=1
ENABLED_SERVICES+=q-lbaasv2,
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
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 PROJECTS="openstack/python-zaqarclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
export OVERRIDE_ENABLED_SERVICES=$services
export ENABLED_SERVICES
fi
if [ "$BRANCH_OVERRIDE" != "default" ] ; then