Switch ovn devstack jobs to be ovs now

With [1] default Neutron backend set by Devstack is changed to OVN.
So now most of the Tobiko jobs are running on the Neutron with ML2/OVN
backend.
Jobs which were before "-ovn" jobs are now changed to the "-ovs" jobs
and runs ML2/OVS backend in Neutron.

Additionally this patch switched devstack-tobiko-gate-octavia job to be
run with ML2/OVS backend in Neutron.

Jobs devstack-tobiko-faults and devstack-tobiko-gate-multinode are
for now explicitly set to be run on ML2/OVS backend as some tests are
failing in those multinode jobs while running on OVN and that needs
further investigation.

[1] https://review.opendev.org/c/openstack/devstack/+/791436

Change-Id: Iefc255a33d3da509b31d93f13c771357d2ef5fa7

zuul.d/jobs.yaml

@@ -27,11 +27,11 @@
         LOG_COLOR: false
         NETWORK_API_EXTENSIONS: >-
           address-scope,agent,allowed-address-pairs,auto-allocated-topology,
-          availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,
+          availability_zone,binding,default-subnetpools,
           dns-domain-ports,dns-integration,dvr,empty-string-filtering,
           ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,
           fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,
-          l3_agent_scheduler,logging,metering,multi-provider,net-mtu,
+          logging,metering,multi-provider,net-mtu,
           net-mtu-writable,network-ip-availability,network_availability_zone,
           pagination,port-security,project-id,provider,qos,
           qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,
@@ -92,6 +92,10 @@
       ipv6_dns_nameservers: []
       zuul_copy_output:
         '{{ stage_dir }}/stackviz': logs
+        "{{ devstack_base_dir }}/data/ovn": "logs"
+        "{{ devstack_base_dir }}/data/ovs": "logs"
+        "{{ devstack_log_dir }}/ovsdb-server-nb.log": "logs"
+        "{{ devstack_log_dir }}/ovsdb-server-sb.log": "logs"
       extensions_to_txt:
         conf: true
         log: true
@@ -150,10 +154,44 @@
       devstack_localrc:
         ENABLE_FILE_INJECTION: true
         MULTI_HOST: 1
+        # NOTE(slaweq): remove those lines when switching to the default
+        # (ML2/OVN) backend in Neutron
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
+      devstack_local_conf:
+        post-config:
+          /$NEUTRON_CORE_PLUGIN_CONF:
+            AGENT:
+              tunnel_types: gre,vxlan
       devstack_services:
         n-cpu: false
+        neutron-qos: true
+        # Disable OVN services
+        # It's temporary workaround until test
+        # OvnControllerTest::test_restart_ovn_controller test
+        # will be fixed in multinode job running on the OVN backend
+        ovn-controller: false
+        ovn-northd: false
+        ovs-vswitchd: false
+        ovsdb-server: false
+        q-ovn-metadata-agent: false
+        # Neutron services
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
     group-vars:
       subnode:
+        devstack_localrc:
+          # NOTE(slaweq): remove those lines when switching to the default
+          # (ML2/OVN) backend in Neutron
+          Q_AGENT: openvswitch
+        devstack_local_conf:
+          post-config:
+            /$NEUTRON_CORE_PLUGIN_CONF:
+              AGENT:
+                tunnel_types: gre,vxlan
         devstack_services:
           c-vol: true
           dstat: true
@@ -164,13 +202,22 @@
           n-api-meta: true
           placement-client: true
           n-cpu: true
-          neutron-agent: true
+          # Disable OVN services
-          neutron-qos: true
+          # It's temporary workaround until test
-          # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753)
+          # OvnControllerTest::test_restart_ovn_controller test
-          memory_tracker: false
+          # will be fixed in multinode job running on the OVN backend
+          ovn-controller: false
+          ovn-northd: false
+          ovs-vswitchd: false
+          ovsdb-server: false
+          q-ovn-metadata-agent: false
+          # Neutron services
           q-agt: true
           q-l3: true
           q-meta: true
+          neutron-qos: true
+          # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753)
+          memory_tracker: false
           tls-proxy: false
 
 

zuul.d/octavia.yaml

@@ -15,7 +15,24 @@
       devstack_plugins:
         barbican: https://opendev.org/openstack/barbican.git
         octavia: https://opendev.org/openstack/octavia.git
+      devstack_localrc:
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
       devstack_services:
+        # OVN services
+        ovn-controller: false
+        ovn-northd: false
+        ovs-vswitchd: false
+        ovsdb-server: false
+        q-ovn-metadata-agent: false
+        # Neutron services
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+        q-metering: true
+        q-svc: true
         # Octavia
         octavia: true
         o-cw: true

zuul.d/ovn.yaml

@@ -1,57 +1,58 @@
 ---
 
 - job:
-    name: devstack-tobiko-ovn
+    name: devstack-tobiko-ovs
     parent: devstack-tobiko
     abstract: true
     description: |
-      Base Tobiko devstack job to be used with OVN.
+      Base Tobiko devstack job to be used with ML2/OVS.
-    vars: &ovn_base
+    vars: &ovs_base
-      devstack_local_conf:
-        post-config:
-          "/$NEUTRON_CORE_PLUGIN_CONF":
-            ovn:
-              enable_distributed_floating_ip: true
       # TODO(fressi): restore name servers list as soon external connectivity
       # is fixed
       ipv4_dns_nameservers: []
       devstack_localrc:
-        ENABLE_CHASSIS_AS_GW: true
+        NETWORK_API_EXTENSIONS: >-
-        ENABLE_TLS: true
+          address-scope,agent,allowed-address-pairs,auto-allocated-topology,
-        ML2_L3_PLUGIN: ovn-router,trunk
+          availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,
-        OVN_BUILD_MODULES: false
+          dns-domain-ports,dns-integration,dvr,empty-string-filtering,
-        OVN_DBS_LOG_LEVEL: dbg
+          ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,
-        OVN_IGMP_SNOOPING_ENABLE: true
+          fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,
-        OVN_L3_CREATE_PUBLIC_NETWORK: true
+          l3_agent_scheduler,logging,metering,multi-provider,net-mtu,
-        PHYSICAL_NETWORK: public
+          net-mtu-writable,network-ip-availability,network_availability_zone,
-        Q_AGENT: ovn
+          pagination,port-security,project-id,provider,qos,
-        Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
+          qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,
-        Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
+          router,router_availability_zone,security-group,
-        Q_ML2_TENANT_NETWORK_TYPE: geneve
+          port-mac-address-regenerate,port-security-groups-filtering,
-        Q_USE_PROVIDERNET_FOR_PUBLIC: true
+          segment,service-type,sorting,standard-attr-description,
+          standard-attr-revisions,standard-attr-segment,
+          standard-attr-timestamp,standard-attr-tag,subnet_allocation,
+          trunk,trunk-details,uplink-status-propagation
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
 
       devstack_services:
+        # Disable OVN services
+        ovn-controller: false
+        ovn-northd: false
+        ovs-vswitchd: false
+        ovsdb-server: false
+        q-ovn-metadata-agent: false
+        # Neutron services
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+        q-metering: true
+        q-port-forwarding: true
+        q-qos: true
+        neutron-segments: true
         br-ex-tcpdump: true
         br-int-flows: true
         c-bak: false
         dstat: false
         etcd: false
-        neutron-segments: true
-        ovn-controller: true
-        ovn-northd: true
-        ovs-vswitchd: true
-        ovsdb-server: true
         placement-api: true
-        q-agt: false
-        q-dhcp: false
-        q-dns: true
-        q-l3: false
-        q-meta: false
-        q-metering: false
-        q-ovn-metadata-agent: true
-        q-port-forwarding: true
-        q-qos: true
-        q-svc: true
         s-account: false
         s-container: false
         s-object: false
@@ -62,21 +63,16 @@
         neutron: "https://opendev.org/openstack/neutron"
 
 - job:
-    name: devstack-tobiko-multinode-ovn
+    name: devstack-tobiko-multinode-ovs
     parent: devstack-tobiko-multinode
     abstract: true
     description: Base DevStack Tobiko job with multinode.
-    vars: &ovn_multinode_vars
+    vars: &ovs_multinode_vars
-      <<: *ovn_base
+      <<: *ovs_base
       extensions_to_txt:
         db: true
-      zuul_copy_output:
-        "{{ devstack_base_dir }}/data/ovn": "logs"
-        "{{ devstack_base_dir }}/data/ovs": "logs"
-        "{{ devstack_log_dir }}/ovsdb-server-nb.log": "logs"
-        "{{ devstack_log_dir }}/ovsdb-server-sb.log": "logs"
 
-    group-vars: &ovn_multinode_group_vars
+    group-vars: &ovs_multinode_group_vars
       subnode:
         devstack_services:
           c-vol: true
@@ -88,32 +84,32 @@
           n-api-meta: true
           placement-client: true
           n-cpu: true
-          neutron-agent: false
+          neutron-agent: true
           # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753)
           memory_tracker: false
-          ovn-controller: true
+          ovn-controller: false
-          q-agt: false
+          q-agt: true
-          q-l3: false
+          q-l3: true
-          q-meta: false
+          q-meta: true
-          q-ovn-metadata-agent: true
+          q-ovn-metadata-agent: false
           tls-proxy: false
 
 
 # --- Gate -------------------------------------------------------------------
 
 - job:
-    name: devstack-tobiko-gate-ovn
+    name: devstack-tobiko-gate-ovs
     parent: devstack-tobiko-gate
     description: |
-      Tobiko devstack job used to gate with OVN
+      Tobiko devstack job used to gate with OVS
     voting: true
     vars:
-      <<: *ovn_base
+      <<: *ovs_base
 
 
 - job:
-    name: devstack-tobiko-gate-ovn-centos
+    name: devstack-tobiko-gate-ovs-centos
-    parent: devstack-tobiko-gate-ovn
+    parent: devstack-tobiko-gate-ovs
     nodeset: devstack-tobiko-centos
     voting: false
 
@@ -121,17 +117,17 @@
 # --- Faults -----------------------------------------------------------------
 
 - job:
-    name: devstack-tobiko-faults-ovn
+    name: devstack-tobiko-faults-ovs
     parent: devstack-tobiko-faults
     abstract: true
     vars:
-      <<: *ovn_multinode_vars
+      <<: *ovs_multinode_vars
     group-vars:
-      <<: *ovn_multinode_group_vars
+      <<: *ovs_multinode_group_vars
 
 
 - job:
-    name: devstack-tobiko-faults-ovn-centos
+    name: devstack-tobiko-faults-ovs-centos
-    parent: devstack-tobiko-faults-ovn
+    parent: devstack-tobiko-faults-ovs
     nodeset: devstack-tobiko-multinode-centos
     voting: false

zuul.d/project-templates.yaml

@@ -11,7 +11,7 @@
         - devstack-tobiko-gate-ceph
         - devstack-tobiko-gate-multinode
         - devstack-tobiko-gate-octavia
-        - devstack-tobiko-gate-ovn
+        - devstack-tobiko-gate-ovs
 
     gate: *gate_check_pipeline
 

zuul.d/project.yaml

@@ -12,8 +12,8 @@
         - devstack-tobiko-gate-centos
         - devstack-tobiko-gate-octavia-centos
         - devstack-tobiko-gate-ceph-centos
-        - devstack-tobiko-gate-ovn-centos
+        - devstack-tobiko-gate-ovs-centos
         - devstack-tobiko-faults-centos
-        - devstack-tobiko-faults-ovn-centos
+        - devstack-tobiko-faults-ovs-centos
 
     periodic: *check_pipeline