From 8f7e925bebf35821d34296995f7c05212f4dbe98 Mon Sep 17 00:00:00 2001
From: gord chung <gord@live.ca>
Date: Wed, 25 Oct 2017 18:07:11 +0000
Subject: [PATCH] remove branch specific references

jobs are in-repo so they are only relevant to
current branch.

Change-Id: I11b7e617b6ab4c5566c91e03c653e08dc0357a5b
---
 .zuul.yaml                                    |  2 --
 .../run.yaml                                  | 31 ++-----------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 6e342ceb81..cff942fd0c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -122,7 +122,6 @@
         - ceilometer-tox-py27-postgresql:
             branches: ^(?!stable/newton)
         - grenade-dsvm-ceilometer:
-            branches: ^(?!stable/newton).*$
             irrelevant-files:
               - ^(test-|)requirements.txt$
               - ^setup.cfg$
@@ -143,7 +142,6 @@
         - ceilometer-tox-py27-postgresql:
             branches: ^(?!stable/newton)
         - grenade-dsvm-ceilometer:
-            branches: ^(?!stable/newton).*$
             irrelevant-files:
               - ^(test-|)requirements.txt$
               - ^setup.cfg$
diff --git a/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml b/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml
index 93c5e78984..41afd103c0 100644
--- a/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml
+++ b/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml
@@ -31,37 +31,12 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_HEAT=1
           export DEVSTACK_GATE_NEUTRON=1
-          if [ "$ZUUL_BRANCH" == "stable/newton" ] ; then
-              export DEVSTACK_GATE_TEMPEST=0
-          else
-              export DEVSTACK_GATE_TEMPEST=1
-          fi
+          export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export PROJECTS="openstack/ceilometer openstack/aodh"
-          # NOTE(sileht): This job runs on Aodh and Ceilometer.
-          # Gnocchi uses an independent release cycle. So we map here
-          # which Gnocchi version can be used with other OpenStack
-          # components and the reverse.
-          case "$ZUUL_BRANCH" in
-              "stable/newton")
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                  export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.0"
-                  export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi"
-                  ;;
-              "stable/ocata")
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                  export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1"
-                  export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi"
-                  ;;
-              *)
-                export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                export PROJECTS="openstack/panko $PROJECTS"
-                ;;
-          esac
+          export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
           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 heat git://git.openstack.org/openstack/heat"