openstack/ceilometer
Code Issues Proposed changes

Merge "remove branch specific references"

Browse Source
This commit is contained in:
Zuul 2017-11-01 04:41:51 +00:00 committed by Gerrit Code Review
commit 9df30d21b4
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -30,7 +30,6 @@
check:
jobs:
- grenade-dsvm-ceilometer:
branches: ^(?!stable/newton).*$
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
@ -38,7 +37,6 @@
gate:
jobs:
- grenade-dsvm-ceilometer:
branches: ^(?!stable/newton).*$
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$

31
playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml
View File

@ -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"