From 8a56f1ec53a4cae7c43cd5dc94ee54bb56e2189c Mon Sep 17 00:00:00 2001
From: Ayumu Ueha <ueha.ayumu@fujitsu.com>
Date: Wed, 17 Feb 2021 02:27:00 +0000
Subject: [PATCH] Resolve FT error in Zuul and reduce times

Latest devstack is supporting async (parallel) task.[1]
[1] https://review.opendev.org/c/openstack/devstack/+/771505

This patch change to use async task for the following effects:
* Resolve the `RETRY_LIMIT` error that is occurring on FT
* Reduce time of functional test in Zuul

Change points of .zuul.yaml:
* For async task, I added the `DEVSTACK_PARALLEL` parameter and set it
  to True.
* Removed `CELLSV2_SETUP: singleconductor` to avoid FT error that is
  caused by nova db dependency issues. (Changed to work with the
  recommended default value `supperconductor`)

Change-Id: I7bb116f80d6327257257ec8e1eebc0bd95d109a0
---
 .zuul.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2594e9cf4..7fac28093 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -100,7 +100,6 @@
       - x/fenix
     vars:
       devstack_localrc:
-        CELLSV2_SETUP: singleconductor
         PHYSICAL_NETWORK: mgmtphysnet0
         OVS_BRIDGE_MAPPINGS: public:br-ex,mgmtphysnet0:br-infra
         Q_DVR_MODE: dvr
@@ -111,6 +110,7 @@
         Q_SERVICE_PLUGIN_CLASSES: router,neutron.services.metering.metering_plugin.MeteringPlugin,networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,neutron.services.qos.qos_plugin.QoSPlugin,qos
         Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos
         L2_AGENT_EXTENSIONS: qos
+        DEVSTACK_PARALLEL: True
       test_matrix_configs: [neutron]
       zuul_work_dir: src/opendev.org/openstack/tacker
     host-vars:
@@ -201,7 +201,6 @@
                 vif_plugging_is_fatal: False
       subnode:
         devstack_localrc:
-          CELLSV2_SETUP: singleconductor
           PHYSICAL_NETWORK: mgmtphysnet0
           OVS_BRIDGE_MAPPINGS: public:br-ex,mgmtphysnet0:br-infra
           Q_DVR_MODE: dvr
@@ -377,7 +376,6 @@
     group-vars:
       subnode:
         devstack_localrc:
-          CELLSV2_SETUP: singleconductor
           DATABASE_TYPE: mysql
           IS_ZUUL_FT: True
           KEYSTONE_SERVICE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
@@ -413,7 +411,6 @@
           tls-proxy: false
     vars:
       devstack_localrc:
-        CELLSV2_SETUP: singleconductor
         DATABASE_TYPE: mysql
         ETCD_USE_RAMDISK: true
         IS_ZUUL_FT: True
@@ -431,6 +428,7 @@
         TACKER_HOST: "{{ hostvars['controller-tacker']['nodepool']['private_ipv4'] }}"
         TACKER_MODE: standalone
         USE_PYTHON3: true
+        DEVSTACK_PARALLEL: True
       devstack_local_conf:
         post-config:
           $NEUTRON_DHCP_CONF: