Merge "Running tests in serial"

.zuul.d/octavia.yaml

@@ -126,6 +126,15 @@
       devstack_localrc:
         KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true
 
+- job:
+    name: kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
+    description: Tempest with Octavia running in serial, CNI daemon enabled, containers and OpenShift
+    parent: kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia
+    vars:
+      devstack_localrc:
+        KURYR_K8S_SERIAL_TESTS: True
+      tempest_concurrency: 1
+
 - job:
     name: kuryr-kubernetes-tempest-daemon-pools-octavia
     parent: kuryr-kubernetes-tempest-daemon-octavia
@@ -137,6 +146,5 @@
         KURYR_USE_PORT_POOLS: true
         KURYR_POD_VIF_DRIVER: neutron-vif
         KURYR_VIF_POOL_DRIVER: neutron
-        TEMPEST_CONCURRENCY: 1
-
-
+        KURYR_K8S_SERIAL_TESTS: True
+      tempest_concurrency: 1

.zuul.d/project.yaml

@@ -40,4 +40,5 @@
         - kuryr-kubernetes-tempest-daemon-pools-octavia
         - kuryr-kubernetes-tempest-daemon-containerized-octavia-l2
         - kuryr-kubernetes-tempest-daemon-containerized-octavia-namespace
+        - kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
         - kuryr-kubernetes-tempest-daemon-ovn

devstack/plugin.sh

@@ -863,6 +863,9 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
     if is_service_enabled tempest && [[ "$KURYR_SUBNET_DRIVER" == "namespace" ]]; then
         iniset $TEMPEST_CONFIG kuryr_kubernetes namespace_enabled True
     fi
+    if is_service_enabled tempest && [[ "$KURYR_K8S_SERIAL_TESTS" == "True" ]]; then
+        iniset $TEMPEST_CONFIG kuryr_kubernetes run_tests_serial True
+    fi
 fi
 
 if [[ "$1" == "unstack" ]]; then