openstack/project-config
Code Issues Proposed changes

telemetry: fix liberty gate

Browse Source 
We recently default CEILOMETER_BACKEND to Gnocchi for the integration
testing, but that was not supported for liberty branches.

The Gnocchi was enabled in additional to the legacy Ceilometer storage
not as replacement like we do now.

This change fixes that.

Change-Id: I7863debdc80126c44c49c7abd8e62a47cdaf559b
This commit is contained in:
Mehdi Abaakouk
2016-09-19 11:41:50 +02:00
parent 89d351ec7e
commit 3b4e1c0c9b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jenkins/jobs/ceilometer.yaml
+10 -2
View File
@@ -184,9 +184,13 @@
;;
esac
case "$ZUUL_BRANCH" in
stable/liberty|stable/1.3) break ;;
*) export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi" ;;
esac
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_STORAGE_BACKEND=file"
export PROJECTS="openstack/{name} $PROJECTS"
@@ -243,9 +247,13 @@
export PROJECTS="openstack/panko $PROJECTS"
esac
case "$ZUUL_BRANCH" in
stable/liberty|stable/1.3) break ;;
*) export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi" ;;
esac
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_STORAGE_BACKEND=file"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-{plugin} git://git.openstack.org/openstack/devstack-plugin-{plugin}"