Merge "Remove stable/newton from zuul settings"

This commit is contained in:
Zuul 2017-11-06 04:59:17 +00:00 committed by Gerrit Code Review
commit 51d4b753ae
6 changed files with 12 additions and 74 deletions

View File

@ -325,40 +325,30 @@
jobs:
- oslo.messaging-tox-py27-func-amqp1:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-kafka:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-pika:
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-rabbit:
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-pika
- oslo.messaging-tox-py27-func-rabbit
- oslo.messaging-tox-py27-func-zmq-proxy:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-zmq-pubsub:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-zmq:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py35-func-amqp1:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py35-func-rabbit:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py35-func-zmq:
voting: false
branches: ^(?!stable/newton).*$
- oslo.messaging-src-dsvm-full-rabbit-default
- oslo.messaging-src-dsvm-full-amqp1-hybrid:
voting: false
branches: ^(?!stable/(?:newton|ocata)).*$
branches: ^(?!stable/ocata).*$
- oslo.messaging-src-dsvm-full-amqp1-dual-centos-7:
voting: false
branches: ^(?!stable/(?:newton|ocata)).*$
branches: ^(?!stable/ocata).*$
- oslo.messaging-src-dsvm-full-kafka-default-centos-7:
voting: false
- oslo.messaging-src-dsvm-full-kafka-default:
@ -386,7 +376,7 @@
- oslo.messaging-tempest-neutron-dsvm-src-rabbit-default
- oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid:
voting: false
branches: ^(?!stable/(?:newton|ocata)).*$
branches: ^(?!stable/ocata).*$
- oslo.messaging-tempest-neutron-dsvm-src-kafka-default:
voting: false
- oslo.messaging-tempest-neutron-dsvm-src-pika-default:
@ -396,10 +386,8 @@
gate:
jobs:
- oslo.messaging-tox-py27-func-rabbit:
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-pika:
branches: ^(?!stable/newton).*$
- oslo.messaging-tox-py27-func-rabbit
- oslo.messaging-tox-py27-func-pika
- oslo.messaging-telemetry-dsvm-integration-rabbit
- oslo.messaging-src-dsvm-full-rabbit-default
- oslo.messaging-tempest-neutron-dsvm-src-rabbit-default

View File

@ -32,11 +32,7 @@
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
@ -45,12 +41,6 @@
export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
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"

View File

@ -32,11 +32,7 @@
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
@ -45,12 +41,6 @@
export PROJECTS="openstack/devstack-plugin-kafka $PROJECTS"
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"

View File

@ -32,11 +32,7 @@
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
@ -45,12 +41,6 @@
export PROJECTS="openstack/devstack-plugin-pika $PROJECTS"
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"

View File

@ -32,11 +32,7 @@
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
@ -48,12 +44,6 @@
# 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"

View File

@ -32,11 +32,7 @@
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
@ -45,12 +41,6 @@
export PROJECTS="openstack/devstack-plugin-zmq $PROJECTS"
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"