openstack/project-config
Code Issues Proposed changes

Gnocchi: Fix mapping between of stable branches

Browse Source 
Gnocchi does independent releases, but gates on project that
does managed 6 month releases.

This change fixes the mapping between Gnocchi stable branches
other project branches.

Change-Id: I9c7dcd8670201f75ce9fbf5b145a7884d86e328c
This commit is contained in:
Mehdi Abaakouk 2015-11-20 13:34:44 +01:00 committed by Andreas Jaeger
parent 09cc66fa25
commit f231279a9c
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jenkins/jobs/ceilometer.yaml
View File

@ -199,6 +199,23 @@
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
# NOTE(sileht): This job runs on Aodh, Ceilometer and Gnocchi
# Gnocchi uses an independant release cycle. So we map here
# which Gnocchi version can be used with other OpenStack
# componements and the reverse.
gnocchi_branch=
if [ "$ZUUL_PROJECT" == "openstack/gnocchi" ]; then
case "$ZUUL_BRANCH" in
"stable/1.0"|"stable/1.1"|"stable/1.2") export OVERRIDE_ZUUL_BRANCH=stable/kilo ;;
"stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;;
esac
else
case "$ZUUL_BRANCH" in
"stable/kilo") gnocchi_branch="stable/1.2";
"stable/liberty") gnocchi_branch="stable/1.3";
esac
fi
export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
@ -215,7 +232,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" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi $gnocchi_branch"
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"

9
jenkins/jobs/gnocchi.yaml
View File

@ -18,11 +18,10 @@
export PROJECTS="openstack/gnocchi $PROJECTS" export PROJECTS="openstack/gnocchi $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi" export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
if [ "$ZUUL_BRANCH" = "stable/1.0" ] ; then case "$ZUUL_BRANCH" in
export OVERRIDE_ZUUL_BRANCH=stable/kilo "stable/1.0"|"stable/1.1"|"stable/1.2") export OVERRIDE_ZUUL_BRANCH=stable/kilo ;;
elif [ "$ZUUL_BRANCH" = "stable/1.3" ] ; then "stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;;
export OVERRIDE_ZUUL_BRANCH=stable/liberty esac
fi
function gate_hook {{ function gate_hook {{
cd /opt/stack/new/gnocchi/devstack/gate cd /opt/stack/new/gnocchi/devstack/gate