From bad257f402359868a8026aa8911057c0fca8655c Mon Sep 17 00:00:00 2001
From: Alexander Chadin <a.chadin@servionica.ru>
Date: Fri, 27 Jul 2018 14:22:37 +0300
Subject: [PATCH] Fix strategies with additional time to initialize CDM

Change-Id: I995cfe99443744eb9f5746be5fce6302b6a7b834
---
 .zuul.yaml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 9af12fbad..e0a76f0ed 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,18 +1,17 @@
 - project:
     check:
       jobs:
-        - watcher-tempest-functional:
-            voting: false
+        - watcher-tempest-functional
         - watcher-tempest-dummy_optim
         - watcher-tempest-actuator
         - watcher-tempest-basic_optim
         - watcher-tempest-workload_balancing
-        - watcherclient-tempest-functional:
-            voting: false
+        - watcherclient-tempest-functional
+        - watcher-tempest-zone_migration
         - openstack-tox-lower-constraints
     gate:
       jobs:
-        # - watcher-tempest-functional
+        - watcher-tempest-functional
         - openstack-tox-lower-constraints
 
 - job:
@@ -43,6 +42,13 @@
     vars:
       tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_workload_balancing'
 
+- job:
+    name: watcher-tempest-zone_migration
+    parent: watcher-tempest-multinode
+    voting: false
+    vars:
+      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_zone_migration'
+
 - job:
     name: watcher-tempest-multinode
     parent: watcher-tempest-functional
@@ -58,6 +64,13 @@
             $NOVA_CONF:
               libvirt:
                 live_migration_uri: 'qemu+ssh://root@%s/system'
+            $WATCHER_CONF:
+              watcher_cluster_data_model_collectors.compute:
+                period: 120
+              watcher_cluster_data_model_collectors.baremetal:
+                period: 120
+              watcher_cluster_data_model_collectors.storage:
+                period: 120
         devstack_services:
           watcher-api: false
           watcher-decision-engine: true
@@ -79,6 +92,13 @@
           $NOVA_CONF:
             libvirt:
               live_migration_uri: 'qemu+ssh://root@%s/system'
+          $WATCHER_CONF:
+              watcher_cluster_data_model_collectors.compute:
+                period: 120
+              watcher_cluster_data_model_collectors.baremetal:
+                period: 120
+              watcher_cluster_data_model_collectors.storage:
+                period: 120
         test-config:
           $TEMPEST_CONFIG:
             compute: