From 3b4e1c0c9b1d5e3163ceccdf1be73474a53e4801 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Mon, 19 Sep 2016 11:39:18 +0200 Subject: [PATCH] telemetry: fix liberty gate 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 --- jenkins/jobs/ceilometer.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index 67ec59c6ec..3305fe030c 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -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}"