Fix zuul templates for functional and tempest tests

* The "devstack_localrc" key was missing, without it local.conf won't be
  populated.

* Added OVN_BUILD_FROM_SOURCE to True to make sure OVN is compiled
from code and not installed from packages.

* Updated the version of OVN and OVS in the -released job to a newer
  version, according to the referenced in Neutron stable/wallaby
  branch [1] .

* Configure correct db user in the functional tests job
  This was changed in the Neutron in commit [2] and should
  be updated also in the configure_functional_tests role in
  this repo.

* Remove run-devstack role from run_functional_job playbook
  There is no need to run that role in the functional
  job and not running it can save few minutes in each job's run.
  The same change was done in Neutron in patch [3].

[1] https://review.opendev.org/c/openstack/neutron/+/751882
[2] https://review.opendev.org/c/openstack/neutron/+/814009
[3] https://review.opendev.org/c/openstack/neutron/+/816354

Conflicts:
   zuul.d/base.yaml

Closes-Bug: #1964339
Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
Change-Id: I05ed8fb053c78bd16a52b5d82a3ab51faf856d78
(cherry picked from commit 5bee600edd)
(cherry picked from commit 1ee61f955f)

playbooks/run_functional_job.yaml

@@ -1,7 +1,5 @@
 - hosts: all
   roles:
-    - run-devstack
-    # Run bindep and test-setup after devstack so that they won't interfere
     - role: bindep
       bindep_profile: test
       bindep_dir: "{{ zuul_work_dir }}"

roles/configure_functional_tests/tasks/main.yaml

@@ -4,7 +4,6 @@
         set -x
         GATE_STACK_USER={{ ansible_user }}
         IS_GATE=True
-
         BASE_DIR={{ base_dir }}
         GATE_DEST={{ gate_dest_dir }}
         PROJECT_NAME={{ project_name }}
@@ -15,11 +14,12 @@
         STACK_USER=stack
         OVS_BRANCH={{ OVS_BRANCH }}
         OVN_BRANCH={{ OVN_BRANCH }}
-
+        Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }}
+        # This is DB USER used in e.g. pgsql db
+        DATABASE_USER=openstack_citest
         source $DEVSTACK_PATH/functions
         source $NEUTRON_DIR/devstack/lib/ovs
         source $DEVSTACK_PATH/lib/neutron_plugins/ovn_agent
         source $NEUTRON_DIR/tools/configure_for_func_testing.sh
-
         configure_host_for_func_testing
     executable: /bin/bash

zuul.d/base.yaml

@@ -36,8 +36,11 @@
     parent: ovn-octavia-provider-functional-base
     description: Run OVN Octavia provider functional tests
     vars:
-      OVN_BRANCH: v20.06.0
-      OVS_BRANCH: v2.13.0
+      OVN_BUILD_FROM_SOURCE: True
+      Q_BUILD_OVS_FROM_GIT: True
+      INSTALL_OVN: True
+      OVN_BRANCH: v20.06.1
+      OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5
 
 - job:
     name: ovn-octavia-provider-tempest-base
@@ -155,5 +158,7 @@
     vars:
       devstack_localrc:
         OVN_BUILD_FROM_SOURCE: True
-        OVN_BRANCH: v20.06.0
-        OVS_BRANCH: v2.13.0
+        Q_BUILD_OVS_FROM_GIT: True
+        INSTALL_OVN: True
+        OVN_BRANCH: v20.06.1
+        OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5