Merge "Fix test plugin issues in dsvm-lvm-centos job"

.zuul.yaml

@@ -319,6 +319,9 @@
       - 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
 

playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml

@@ -40,7 +40,7 @@
           SKIP_EPEL_INSTALL=True
           enable_plugin manila git://git.openstack.org/openstack/manila
           enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing
-
+          enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -102,7 +102,9 @@
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
-          export PROJECTS="openstack/manila-tempest-plugin openstack/neutron-dynamic-routing $PROJECTS"
+          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
+          export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
 
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',