From f231279a9cff26e4d3c3e1dd16b8ce93dbdb0782 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@redhat.com>
Date: Fri, 20 Nov 2015 13:34:44 +0100
Subject: [PATCH] Gnocchi: Fix mapping between of stable branches

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
---
 jenkins/jobs/ceilometer.yaml | 19 ++++++++++++++++++-
 jenkins/jobs/gnocchi.yaml    |  9 ++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml
index f7fac51c6f..17d44b8c4b 100644
--- a/jenkins/jobs/ceilometer.yaml
+++ b/jenkins/jobs/ceilometer.yaml
@@ -199,6 +199,23 @@
           #!/bin/bash -xe
           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_HEAT=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -215,7 +232,7 @@
           export PROJECTS="openstack/aodh openstack/gnocchi"
           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'"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'"CEILOMETER_PIPELINE_INTERVAL=5"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_COORDINATOR_URL=redis://localhost:6379?timeout=5"
diff --git a/jenkins/jobs/gnocchi.yaml b/jenkins/jobs/gnocchi.yaml
index f9fcc1843d..4b8c16ca83 100644
--- a/jenkins/jobs/gnocchi.yaml
+++ b/jenkins/jobs/gnocchi.yaml
@@ -18,11 +18,10 @@
           export PROJECTS="openstack/gnocchi $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
 
-          if [ "$ZUUL_BRANCH" = "stable/1.0" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=stable/kilo
-          elif [ "$ZUUL_BRANCH" = "stable/1.3" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=stable/liberty
-          fi
+          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
 
           function gate_hook {{
               cd /opt/stack/new/gnocchi/devstack/gate