From cb016333804bf318720db74ef5076979548b3130 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Tue, 24 Mar 2020 13:50:53 -0700 Subject: [PATCH] [ci] Stop requiring neutron-tempest-plugin We needed this plugin because neutron-dynamic-plugin's code base included its tempest plugin in-tree. This issue was addressed in https://review.opendev.org/#/c/695014/. So we no longer need to install neutron-tempest-plugin in manila jobs. Change-Id: I34b77c95aad7ee2b67ba876db8aa64bbc44adb79 Signed-off-by: Goutham Pacha Ravi --- .zuul.yaml | 6 ------ .../legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml | 2 -- .../legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml | 2 -- playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml | 2 -- 4 files changed, 12 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 543e7d71ef..4c7c1a1366 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -309,9 +309,6 @@ - openstack/manila - openstack/manila-tempest-plugin - openstack/neutron-dynamic-routing - # TODO(gouthamr): Remove the line below when neutron-dynamic-routing - # separates its tempest plugin from its tree - - openstack/neutron-tempest-plugin - openstack/python-manilaclient - openstack/tempest @@ -337,9 +334,6 @@ - openstack/manila - openstack/manila-tempest-plugin - openstack/neutron-dynamic-routing - # TODO(gouthamr): Remove the line below when neutron-dynamic-routing - # separates its tempest plugin from its tree - - openstack/neutron-tempest-plugin - openstack/python-manilaclient - openstack/tempest diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml index 40558a3e02..8ce783ff84 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml @@ -32,7 +32,6 @@ enable_plugin manila https://opendev.org/openstack/manila enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing - enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph # Enable CephFS as the backend for Manila. @@ -88,7 +87,6 @@ PROJECTS="openstack/devstack-plugin-ceph $PROJECTS" PROJECTS="openstack/manila-tempest-plugin $PROJECTS" PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - PROJECTS="openstack/neutron-tempest-plugin $PROJECTS" export PROJECTS export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml index 7955649478..acbc3bc00f 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml @@ -33,7 +33,6 @@ enable_plugin manila https://opendev.org/openstack/manila enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing - enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin SERVICE_IP_VERSION=6 SERVICE_HOST="" EOF @@ -74,7 +73,6 @@ export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS" export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml index 61234f3a60..4f423586dc 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml @@ -33,7 +33,6 @@ enable_plugin manila https://opendev.org/openstack/manila enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing - enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin EOF executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' @@ -72,7 +71,6 @@ export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS" export DEVSTACK_GATE_USE_PYTHON3=True