openstack/project-config
Code Issues Proposed changes

fix panko initialisation

Browse Source 
i accidentally mucked up the fact that gnocchi plugin is the start
of setting DEVSTACK_LOCAL_CONFIG value. this patch just moves gnocchi
to start since it doesn't matter if gnocchi or panko is started first.

Change-Id: I33a3f1a1b6e58be4aa6e02e2f5f1e2cb3c08bf21
This commit is contained in:
gord chung 2016-10-17 18:41:57 +00:00
parent 4702b89ab3
commit d5e141be6b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/jobs/ceilometer.yaml
View File

@ -174,6 +174,7 @@
export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi" export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi"
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
case "$ZUUL_BRANCH" in case "$ZUUL_BRANCH" in
stable/liberty|stable/mitaka) break;; stable/liberty|stable/mitaka) break;;
stable/1.3|stable/2.0|stable/2.1|stable/2.2) break;; stable/1.3|stable/2.0|stable/2.1|stable/2.2) break;;
@ -182,7 +183,6 @@
export PROJECTS="openstack/panko $PROJECTS" export PROJECTS="openstack/panko $PROJECTS"
;; ;;
esac esac
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" export DEVSTACK_LOCAL_CONFIG+=$'\n'"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 aodh git://git.openstack.org/openstack/aodh"
@ -238,6 +238,7 @@
export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi openstack/oslo.messaging openstack/devstack-plugin-{plugin}" export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi openstack/oslo.messaging openstack/devstack-plugin-{plugin}"
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
case "$ZUUL_BRANCH" in case "$ZUUL_BRANCH" in
stable/liberty|stable/mitaka) break;; stable/liberty|stable/mitaka) break;;
stable/1.3|stable/2.0|stable/2.1|stable/2.2) break;; stable/1.3|stable/2.0|stable/2.1|stable/2.2) break;;
@ -245,7 +246,6 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
export PROJECTS="openstack/panko $PROJECTS" export PROJECTS="openstack/panko $PROJECTS"
esac esac
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" export DEVSTACK_LOCAL_CONFIG+=$'\n'"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 aodh git://git.openstack.org/openstack/aodh"