From a89317ab75e8218a16a040330e43a4c0436ad3c5 Mon Sep 17 00:00:00 2001 From: Jeremy Liu Date: Mon, 30 Oct 2017 14:02:26 +0800 Subject: [PATCH] Remove stable/newton from zuul settings stable/newton branch is EOL now, remove relevant settings from zuul. Change-Id: I5359f9f1096f5e4cce9d359db813a3749a0b9c64 --- .zuul.yaml | 26 +++++-------------- .../run.yaml | 12 +-------- .../run.yaml | 12 +-------- .../run.yaml | 12 +-------- .../run.yaml | 12 +-------- .../run.yaml | 12 +-------- 6 files changed, 12 insertions(+), 74 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 77ed4fdc0..c57e8dea7 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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 diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml index ceb3267b1..3f6ef21ef 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml @@ -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" diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml index 2117cea1d..a6c91696b 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml @@ -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" diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-pika/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-pika/run.yaml index 80a75aae6..8cad6ef0c 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-pika/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-pika/run.yaml @@ -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" diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml index de9c76954..928bf0ee3 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml @@ -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" diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml index d6aedd754..889784b3d 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml @@ -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"