Merge "Add Loki testing for Neutron"

devstack/lib/loki

@@ -0,0 +1,6 @@
+# For more information on loki, see:
+# https://docs.openstack.org/neutron/latest//contributor/testing/db_transient_failure_injection.html
+
+function configure_loki {
+    neutron_service_plugin_class_add "loki"
+}

devstack/plugin.sh

@@ -18,6 +18,7 @@ source $LIBDIR/fip_port_forwarding
 source $LIBDIR/uplink_status_propagation
 source $LIBDIR/tag_ports_during_bulk_creation
 source $LIBDIR/octavia
+source $LIBDIR/loki
 
 Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT)
 
@@ -109,6 +110,9 @@ if [[ "$1" == "stack" ]]; then
                     configure_port_forwarding
                 fi
             fi
+            if is_service_enabled neutron-loki; then
+                configure_loki
+            fi
             ;;
         extra)
             if is_service_enabled q-sriov-agt neutron-sriov-agent; then

doc/source/contributor/testing/ci_scenario_jobs.rst

@@ -80,6 +80,11 @@ Below is a summary of those jobs.
     |                                              |(only tests related to            |         |       |             |                 |          |       |        |            |             |
     |                                              |Neutron and Nova)                 |         |       |             |                 |          |       |        |            |             |
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
+    |neutron-tempest-with-uwsgi-loki               |tempest.api (without slow tests)  |   3.6   |   1   | openvswitch | openvswitch     | legacy   | False | False  | True       | No          |
+    |(non-voting)                                  |tempest.scenario                  |         |       |             |                 |          |       |        |            |             |
+    |                                              |(only tests related to            |         |       |             |                 |          |       |        |            |             |
+    |                                              |Neutron and Nova)                 |         |       |             |                 |          |       |        |            |             |
+    +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
     |tempest-ipv6-only                             |tempest smoke + IPv6 tests        |   3.6   |   1   | openvswitch | openvswitch     | legacy   | False | False  | True       | Yes         |
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
     |neutron-ovn-tempest-ovs-release               |Various tempest api, scenario     |   3.6   |   1   | ovn         | ovn             | ---      | False | False  | True       | Yes         |

zuul.d/project.yaml

@@ -52,6 +52,8 @@
         - neutron-ovn-tempest-ovs-release
         - neutron-ovn-tempest-ovs-release-ipv6-only:
             voting: false
+        - neutron-tempest-with-uwsgi-loki:
+            voting: false
         # TODO(slaweq): add this job again to the check queue when it will be
         # working fine on python 3
         #- networking-midonet-tempest-aio-ml2-centos-7:

zuul.d/tempest-singlenode.yaml

@@ -201,6 +201,15 @@
         br-int-flows: true
     irrelevant-files: *irrelevant-files
 
+- job:
+    name: neutron-tempest-with-uwsgi-loki
+    parent: neutron-tempest-with-uwsgi
+    timeout: 10800
+    vars:
+      devstack_services:
+        neutron-loki: true
+    irrelevant-files: *irrelevant-files
+
 - job:
     name: neutron-ovn-base
     description: Base job for devstack/tempest to test Neutron with ovn driver.