openstack
/
project-config
Code Issues Proposed changes

Fix ceilometer testing 

The jobs introduced in [1] and [2] are broken because they overwrite
DEVSTACK_LOCAL_CONFIG instead of adding to it.

[1] https://review.openstack.org/315224
[2] https://review.openstack.org/315077

Change-Id: I860919fc413e785bb442ba0591e0933395477fd9
This commit is contained in:
Jens Rosenboom 2016-07-06 20:52:46 +02:00
parent 936551b01d
commit 652cf7cd5a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/ceilometer.yaml
View File

@ -27,7 +27,7 @@
export DEVSTACK_GATE_POSTGRES=1
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
if [ "x{network}" = "x-neutron" ] ; then
export DEVSTACK_GATE_NEUTRON=1
@ -67,7 +67,7 @@
export DEVSTACK_GATE_POSTGRES=1
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
function post_test_hook {{
@ -113,7 +113,7 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
function post_test_hook {{