From 1a2da88b903b4d5d25b0b17e03ab84731d377632 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Mon, 21 Mar 2022 14:12:46 +0530
Subject: [PATCH] Fix multinode ovn/ovs with source deploy jobs

Since in these jobs ovs/ovn built/installed from
source during devstack installation, infra bridge
i.e br-infra prepared during pre-run get's lost.

After devstack setup rerunning the multinode setup
roles with install_ovs=false(role var added in depends-on
patch) to fix it.

It's alternative approach to [1].

[1] https://review.opendev.org/c/openstack/neutron/+/762654

Depends-On: https://review.opendev.org/c/zuul/zuul-jobs/+/832497
Closes-Bug: #1904117
Change-Id: Ie2cd53881cb043bc72f201b6aac9eacd0c0c7c88
---
 playbooks/multinode-devstack-custom.yaml | 27 ++++++++++++++++++++++++
 zuul.d/tempest-multinode.yaml            |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 playbooks/multinode-devstack-custom.yaml

diff --git a/playbooks/multinode-devstack-custom.yaml b/playbooks/multinode-devstack-custom.yaml
new file mode 100644
index 00000000000..1687906d8fb
--- /dev/null
+++ b/playbooks/multinode-devstack-custom.yaml
@@ -0,0 +1,27 @@
+- hosts: all
+  vars:
+    install_ovs: false
+  roles:
+    - orchestrate-devstack
+    # For ovs from source jobs we need to reconfigure bridges after devstack setup
+    - multi-node-bridge
+    - multi-node-setup
+
+# We run tests only on one node, regardless how many nodes are in the system
+- hosts: tempest
+  tasks:
+    - name: Setup Tempest Run Directory
+      include_role:
+        name: setup-tempest-run-dir
+
+    - name: Setup Tempest Data Directory
+      include_role:
+        name: setup-tempest-data-dir
+
+    - name: ACL devstack files
+      include_role:
+        name: acl-devstack-files
+
+    - name: Run Tempest
+      include_role:
+        name: run-tempest
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index 3bf6ce463ab..05f5a3cbc87 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -475,6 +475,7 @@
     # experimental queue
     name: neutron-ovn-tempest-full-multinode-ovs-master
     parent: neutron-ovn-multinode-base
+    run: playbooks/multinode-devstack-custom.yaml
     vars:
       tox_envlist: all
       tempest_test_regex: "^(?!.*\