From 7c5eb3cd4cf271af16961a49e19f0b6ab3195281 Mon Sep 17 00:00:00 2001 From: Lihi Wishnitzer Date: Thu, 26 Oct 2017 17:18:29 +0300 Subject: [PATCH] Rename fullstack gates Rename the fullstack gates in order to emphasize the difference between the gates, and what is tested in each gate. Change-Id: I56200b4eedac14a0b3f3f795d6b952f799a36de1 --- .zuul.yaml | 20 +++++++++---------- ...tackgaterc-zmq => devstackgaterc-etcd-zmq} | 0 .../{devstackgaterc => devstackgaterc-redis} | 0 .../post.yaml | 0 .../run.yaml | 2 +- .../post.yaml | 0 .../run.yaml | 2 +- zuul/dragonflow-dsvm-rally/run.yaml | 2 +- zuul/tempest-dsvm-dragonflow/run.yaml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) rename devstack/{devstackgaterc-zmq => devstackgaterc-etcd-zmq} (100%) rename devstack/{devstackgaterc => devstackgaterc-redis} (100%) rename zuul/{dragonflow-dsvm-fullstack-zmq => dragonflow-dsvm-fullstack-etcd-zmq}/post.yaml (100%) rename zuul/{dragonflow-dsvm-fullstack-zmq => dragonflow-dsvm-fullstack-etcd-zmq}/run.yaml (98%) rename zuul/{dragonflow-dsvm-fullstack => dragonflow-dsvm-fullstack-redis}/post.yaml (100%) rename zuul/{dragonflow-dsvm-fullstack => dragonflow-dsvm-fullstack-redis}/run.yaml (98%) diff --git a/.zuul.yaml b/.zuul.yaml index dc0c15d74..187ffe73b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,8 +9,8 @@ - ^setup.cfg$ - dragonflow-dsvm-rally: voting: false - - dragonflow-dsvm-fullstack - - dragonflow-dsvm-fullstack-zmq + - dragonflow-dsvm-fullstack-redis + - dragonflow-dsvm-fullstack-etcd-zmq - legacy-install-dsvm-dragonflow-kuryr-kubernetes: voting: false - legacy-openstack-ansible-os_neutron-ansible-dragonflow: @@ -18,13 +18,13 @@ branches: ^(?!stable/newton).*$ gate: jobs: - - dragonflow-dsvm-fullstack + - dragonflow-dsvm-fullstack-redis - job: - name: dragonflow-dsvm-fullstack + name: dragonflow-dsvm-fullstack-redis parent: legacy-dsvm-base - run: zuul/dragonflow-dsvm-fullstack/run - post-run: zuul/dragonflow-dsvm-fullstack/post + run: zuul/dragonflow-dsvm-fullstack-redis/run + post-run: zuul/dragonflow-dsvm-fullstack-redis/post timeout: 9900 required-projects: - openstack-infra/devstack-gate @@ -34,10 +34,10 @@ - openstack/neutron-dynamic-routing - job: - name: dragonflow-dsvm-fullstack-zmq + name: dragonflow-dsvm-fullstack-etcd-zmq parent: legacy-dsvm-base - run: zuul/dragonflow-dsvm-fullstack-zmq/run - post-run: zuul/dragonflow-dsvm-fullstack-zmq/post + run: zuul/dragonflow-dsvm-fullstack-etcd-zmq/run + post-run: zuul/dragonflow-dsvm-fullstack-etcd-zmq/post timeout: 9900 required-projects: - openstack-infra/devstack-gate @@ -72,4 +72,4 @@ - openstack/neutron - openstack/networking-sfc - openstack/neutron-dynamic-routing - - openstack/tempest \ No newline at end of file + - openstack/tempest diff --git a/devstack/devstackgaterc-zmq b/devstack/devstackgaterc-etcd-zmq similarity index 100% rename from devstack/devstackgaterc-zmq rename to devstack/devstackgaterc-etcd-zmq diff --git a/devstack/devstackgaterc b/devstack/devstackgaterc-redis similarity index 100% rename from devstack/devstackgaterc rename to devstack/devstackgaterc-redis diff --git a/zuul/dragonflow-dsvm-fullstack-zmq/post.yaml b/zuul/dragonflow-dsvm-fullstack-etcd-zmq/post.yaml similarity index 100% rename from zuul/dragonflow-dsvm-fullstack-zmq/post.yaml rename to zuul/dragonflow-dsvm-fullstack-etcd-zmq/post.yaml diff --git a/zuul/dragonflow-dsvm-fullstack-zmq/run.yaml b/zuul/dragonflow-dsvm-fullstack-etcd-zmq/run.yaml similarity index 98% rename from zuul/dragonflow-dsvm-fullstack-zmq/run.yaml rename to zuul/dragonflow-dsvm-fullstack-etcd-zmq/run.yaml index 21f2b48bc..e0aa4f8cb 100644 --- a/zuul/dragonflow-dsvm-fullstack-zmq/run.yaml +++ b/zuul/dragonflow-dsvm-fullstack-etcd-zmq/run.yaml @@ -57,7 +57,7 @@ export PROJECTS="openstack/dragonflow $PROJECTS" export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" export PROJECTS="openstack/networking-sfc $PROJECTS" - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-zmq + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-etcd-zmq function gate_hook { bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/gate_hook.sh fullstack diff --git a/zuul/dragonflow-dsvm-fullstack/post.yaml b/zuul/dragonflow-dsvm-fullstack-redis/post.yaml similarity index 100% rename from zuul/dragonflow-dsvm-fullstack/post.yaml rename to zuul/dragonflow-dsvm-fullstack-redis/post.yaml diff --git a/zuul/dragonflow-dsvm-fullstack/run.yaml b/zuul/dragonflow-dsvm-fullstack-redis/run.yaml similarity index 98% rename from zuul/dragonflow-dsvm-fullstack/run.yaml rename to zuul/dragonflow-dsvm-fullstack-redis/run.yaml index c81304a8d..fe42a0637 100644 --- a/zuul/dragonflow-dsvm-fullstack/run.yaml +++ b/zuul/dragonflow-dsvm-fullstack-redis/run.yaml @@ -61,7 +61,7 @@ export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" export PROJECTS="openstack/networking-sfc $PROJECTS" - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-redis function gate_hook { bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/gate_hook.sh fullstack diff --git a/zuul/dragonflow-dsvm-rally/run.yaml b/zuul/dragonflow-dsvm-rally/run.yaml index 73eb65876..a4a5c5865 100644 --- a/zuul/dragonflow-dsvm-rally/run.yaml +++ b/zuul/dragonflow-dsvm-rally/run.yaml @@ -54,7 +54,7 @@ export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" export PROJECTS="openstack/rally $PROJECTS" - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-redis function post_test_hook { $BASE/new/rally/tests/ci/rally-gate.sh diff --git a/zuul/tempest-dsvm-dragonflow/run.yaml b/zuul/tempest-dsvm-dragonflow/run.yaml index c30c4c266..5159ab9d6 100644 --- a/zuul/tempest-dsvm-dragonflow/run.yaml +++ b/zuul/tempest-dsvm-dragonflow/run.yaml @@ -63,7 +63,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-redis function gate_hook { bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/gate_hook.sh tempest