openstack/project-config
Code Issues Proposed changes

fix stable/liberty telemetry integration job

Browse Source 
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.

ok, this has to work. this uses OVERRIDE_$PROJECT_PROJECT_BRANCH
variable[1] to override gnocchi branch when devstack-gate sets up
workspace for gate.

[1] https://github.com/openstack-infra/devstack-gate/blob/master/functions.sh#L422

Change-Id: Ieffb4184cd7bc47e7d71434175f75a5be07bd112
Closes-Bug: #1526530
This commit is contained in:
gordon chung 2016-01-07 08:16:06 -05:00
parent 053e9948e5
commit a7f87f9985
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/ceilometer.yaml
View File

@ -216,8 +216,8 @@
esac esac
else else
case "$ZUUL_BRANCH" in case "$ZUUL_BRANCH" in
"stable/kilo") gnocchi_branch="stable/1.2";; "stable/kilo") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/1.2";;
"stable/liberty") gnocchi_branch="stable/1.3";; "stable/liberty") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/1.3";;
esac esac
fi fi
@ -237,7 +237,7 @@
export PROJECTS="openstack/aodh openstack/gnocchi" export PROJECTS="openstack/aodh openstack/gnocchi"
export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" 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 aodh git://git.openstack.org/openstack/aodh"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi $gnocchi_branch" 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'"GNOCCHI_ARCHIVE_POLICY=high"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5" export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_COORDINATOR_URL=redis://localhost:6379?timeout=5" export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_COORDINATOR_URL=redis://localhost:6379?timeout=5"