From 421dc2195c7e47c8793e25a2d26e15e0b982f35e Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Thu, 9 Sep 2021 16:11:46 +0000
Subject: [PATCH] Redefine "neutron-ovn-tempest-ovs-master-fedora" CI job

The CI job "neutron-ovn-tempest-ovs-master-fedora" should be the same
as "neutron-ovn-tempest-ovs-master" but executed in the Fedora nodeset.

Related-Bug: #1942913
Change-Id: I89700030dedab33c28baf95993206cf5cdd1e6d6
---
 zuul.d/tempest-singlenode.yaml | 44 ++++++++++------------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 2970a131a2b..289b18d8a98 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -495,38 +495,6 @@
         s-proxy: false
     irrelevant-files: *openvswitch-irrelevant-files
 
-- job:
-    name: neutron-ovn-tempest-ovs-master-fedora
-    description: Job testing for devstack/tempest testing Neutron with ovn driver and OVN master branch and Fedora
-    parent: neutron-ovn-base
-    nodeset: devstack-single-node-fedora-latest
-    vars:
-      zuul_copy_output:
-        '{{ devstack_base_dir }}/data/ovs': 'logs'
-        '{{ devstack_base_dir }}/data/ovn': 'logs'
-        '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
-        '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
-      devstack_localrc:
-        OVN_BUILD_FROM_SOURCE: True
-        OVN_BRANCH: master
-        OVS_BRANCH: master
-      devstack_services:
-        etcd: false
-        br-ex-tcpdump: true
-        br-int-flows: true
-        tls-proxy: true
-        # Cinder services
-        c-api: false
-        c-bak: false
-        c-sch: false
-        c-vol: false
-        cinder: false
-        # Swift services
-        s-account: false
-        s-container: false
-        s-object: false
-        s-proxy: false
-
 - job:
     name: neutron-ovn-tempest-ovs-ipv6-only-base
     description: Base job for devstack/tempest to test Neutron with ovn driver in an IPv6-only deployment
@@ -559,3 +527,15 @@
         OVN_BUILD_FROM_SOURCE: True
         OVN_BRANCH: master
         OVS_BRANCH: master
+
+- job:
+    name: neutron-ovn-tempest-ovs-master-fedora
+    description: Job testing for devstack/tempest testing Neutron with ovn driver and OVN master branch and Fedora
+    parent: neutron-ovn-tempest-ovs-master
+    nodeset: devstack-single-node-fedora-latest
+    vars:
+      zuul_copy_output:
+        '{{ devstack_base_dir }}/data/ovs': 'logs'
+        '{{ devstack_base_dir }}/data/ovn': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
+        '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'