From 6f92fa9144077e9c7c971f3cd1b7be89a222849f Mon Sep 17 00:00:00 2001 From: gordon chung Date: Wed, 16 Dec 2015 14:12:10 -0500 Subject: [PATCH] fix stable/liberty telemetry integration job devstack-gate sets up the environment for gate jobs but it configures branches at a global level rather than a per project level. this means projects which are released independently can't be tested with other projects. this patch skips the devstack-gate configuration of gnocchi and lets devstack configure it so enable_plugin functionality is properly handled. Change-Id: I924f99ffb3344b2d501c53dbbc8403f419dfdee7 Closes-Bug: #1526530 --- jenkins/jobs/ceilometer.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index 63eafe94ba..c82aa33922 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -234,7 +234,9 @@ s+="gnocchi-api" export ENABLE_SERVICES="$s" - export PROJECTS="openstack/aodh openstack/gnocchi" + # Do not include gnocchi in projects as devstack-gate can only handle branches at + # global level rather per project. We'll let devstack plugins do proper work + export PROJECTS="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 $gnocchi_branch"