From f197d18847c9b5df27b304a2f849a08a7d2cc55e Mon Sep 17 00:00:00 2001
From: Chris Dent <chdent@redhat.com>
Date: Sun, 28 Jun 2015 15:13:48 +0000
Subject: [PATCH] Use ceilometer devstack plugin in gate

Turn on the ceilometer devstack plugin in the various ceilometer
related job descriptions. The relies on enable_plugin failing
gracefully when it does not exist (on an older branch).

Depends-On: I413ab159474b7d7231ad66d3a482201f74efe8a8
Change-Id: I63e7cfc2425b4f33b91ef56f22bc30e3f02ca66a
---
 jenkins/jobs/ceilometer.yaml    | 6 +++++-
 jenkins/jobs/devstack-gate.yaml | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml
index 1829e75061..1fa70e1e00 100644
--- a/jenkins/jobs/ceilometer.yaml
+++ b/jenkins/jobs/ceilometer.yaml
@@ -17,6 +17,7 @@
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_CEILOMETER_BACKEND={backend}
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -49,6 +50,7 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_CEILOMETER_BACKEND={backend}
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -78,6 +80,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_CEILOMETER_BACKEND={backend}
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -169,7 +172,8 @@
           export ENABLE_SERVICES="$s"
 
           export PROJECTS="openstack/aodh openstack/gnocchi"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin aodh git://git.openstack.org/openstack/aodh"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5"
diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 73de3bc107..8ce3fefd18 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -1738,6 +1738,7 @@
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export GRENADE_PLUGINRC="enable_grenade_plugin ceilometer https://git.openstack.org/openstack/ceilometer"
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh