Convert legacy functional jobs to zuulv3

This commit merges the legacy functional test jobs (core and adv-svcs)
into neutronclient-functional. FWaaS v1 was dropped in Stein and
adv-svcs job now checks only VPNaaS, so it looks too much to have
a separate job for VPNaaS.

Note that tls-proxy is disabled as the base class for functional tests
(neutronclient.tests.functional.base.ClientTestBase) does not support
HTTPS endpoints. This can be tackled separately.

Change-Id: I714efd1bc14cbba85f7b4caf6834ce375ff89547

2 files changed, 24 insertions, 18 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 80a5f4e..60c7788 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,20 +12,10 @@
       - openstackclient-plugin-jobs
     check:
       jobs:
-        - legacy-neutronclient-test-dsvm-functional:
-            irrelevant-files: &project-irrelevant-files
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^neutron/locale/.*$
-              - ^releasenotes/.*$
-        - legacy-neutronclient-test-dsvm-functional-adv-svcs:
-            irrelevant-files: *project-irrelevant-files
+        - neutronclient-functional
     gate:
       jobs:
-        - legacy-neutronclient-test-dsvm-functional:
-            irrelevant-files: *project-irrelevant-files
-        - legacy-neutronclient-test-dsvm-functional-adv-svcs:
-            irrelevant-files: *project-irrelevant-files
+        - neutronclient-functional
     experimental:
       jobs:
         - legacy-grenade-dsvm-neutron-libs:
@@ -33,3 +23,24 @@
               - ^(test-|)requirements.txt$
               - ^setup.cfg$
 
+- job:
+    name: neutronclient-functional
+    parent: devstack-tox-functional
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+    required-projects:
+      - openstack/python-neutronclient
+      - openstack/neutron
+      - openstack/neutron-vpnaas
+    vars:
+      tox_envlist: functional
+      devstack_services:
+        # NOTE: neutronclient.tests.functional.base.ClientTestBase does not
+        # support HTTPS endpoints now, so tls-proxy needs to be disabled.
+        tls-proxy: false
+      devstack_localrc:
+        LIBS_FROM_GIT: python-neutronclient
+      devstack_plugins:
+        neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas
diff --git a/tox.ini b/tox.ini
index 5ef67b9..13a45d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,12 +37,7 @@ commands = {posargs}
 
 [testenv:functional]
 setenv =
-  OS_TEST_PATH = ./neutronclient/tests/functional/core
-  OS_NEUTRONCLIENT_EXEC_DIR = {envdir}/bin
-
-[testenv:functional-adv-svcs]
-setenv =
-  OS_TEST_PATH = ./neutronclient/tests/functional/adv-svcs
+  OS_TEST_PATH = ./neutronclient/tests/functional
   OS_NEUTRONCLIENT_EXEC_DIR = {envdir}/bin
 
 [testenv:cover]