From e351f264ef877660694a965f4f2eb63f8b593548 Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Wed, 3 Jul 2019 16:14:59 +0200
Subject: [PATCH] Migrate functional tests job to zuul v3

Job is also renamed from "legacy-neutron-fwaas-dsvm-functional" to
"neutron-fwaas-functional"

Change-Id: I2c8cef73df67f13e65ce14e6c5f1192a6bb994b0
---
 .zuul.yaml | 10 ++++++++--
 bindep.txt |  4 ++++
 tox.ini    |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2f34f80d8..37b20e580 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,7 +12,7 @@
     check:
       jobs:
         - neutron-fwaas-v2-dsvm-tempest
-        - legacy-neutron-fwaas-dsvm-functional
+        - neutron-fwaas-functional
         - legacy-grenade-dsvm-neutron-fwaas-multinode:
             voting: false
             irrelevant-files:
@@ -23,11 +23,17 @@
     gate:
       jobs:
         - neutron-fwaas-v2-dsvm-tempest
-        - legacy-neutron-fwaas-dsvm-functional
+        - neutron-fwaas-functional
     experimental:
       jobs:
         - neutron-fwaas-fullstack
 
+- job:
+    name: neutron-fwaas-functional
+    parent: neutron-functional
+    vars:
+      project_name: neutron-fwaas
+
 - job:
     name: neutron-fwaas-fullstack
     parent: neutron-fullstack
diff --git a/bindep.txt b/bindep.txt
index bc53c911a..86fab166e 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -4,3 +4,7 @@
 # MySQL and PostgreSQL databases since some jobs are set up in
 # OpenStack infra that need these like
 libpq-dev [test]
+
+# Packages required e.g. in functional tests
+libnetfilter-log1 [platform:dpkg platform:suse]
+libnetfilter-log [platform:rpm !platform:suse]
diff --git a/tox.ini b/tox.ini
index 4f7492dbc..4942cf719 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,7 +83,7 @@ setenv =
   OS_ROOTWRAP_CMD=sudo {envdir}/bin/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
   OS_ROOTWRAP_DAEMON_CMD=sudo {envdir}/bin/neutron-rootwrap-daemon {envdir}/etc/neutron/rootwrap.conf
   OS_FAIL_ON_MISSING_DEPS=1
-  OS_NEUTRON_PATH={env:OS_NEUTRON_PATH:/opt/stack/new/neutron}
+  OS_NEUTRON_PATH={env:OS_NEUTRON_PATH:/home/zuul/src/opendev.org/openstack/neutron}
 whitelist_externals =
   sh
   cp