From 6376e327e0ac94293d789ac26f8d0983352639a1 Mon Sep 17 00:00:00 2001
From: Eyal <eyal.bar-ilan@nokia.com>
Date: Mon, 14 Sep 2020 10:32:20 +0300
Subject: [PATCH] Don't use test gnocchi its not stable

for some strange reason when installing ceilometer and gnocchi
the mysqld process is killed by the oom killer of the operating system
this happens only in the gate and not localy on my devstack.

for now we won't enable the ceilometer plugin (which installs gnocchi)

Change-Id: If870b80456d8ebd4877253d977b5c59a11ad1c16
---
 .zuul.yaml                                    | 54 +++++++++++++++----
 vitrage_tempest_plugin/tests/base.py          |  8 +++
 .../tests/datasources/test_aodh.py            |  2 +
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 15f59c3..b5b58d1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -54,11 +54,6 @@
             DEFAULT:
               notification_topics: 'notifications,vitrage_notifications'
               notification_driver: messagingv2
-          $HEAT_CONF:
-            DEFAULT:
-              notification_topics: 'notifications,vitrage_notifications'
-              notification_driver: messagingv2
-              policy_file: /etc/heat/policy.yaml
           $AODH_CONF:
             oslo_messaging_notifications:
               topics: 'notifications,vitrage_notifications'
@@ -93,12 +88,9 @@
         s-proxy: false
         tls-proxy: false
       devstack_plugins:
-        heat: https://opendev.org/openstack/heat
-        ceilometer: https://opendev.org/openstack/ceilometer
         aodh: https://opendev.org/openstack/aodh
-        mistral: https://opendev.org/openstack/mistral
         vitrage: https://opendev.org/openstack/vitrage
-       
+
 
 - job:
     name: vitrage-tempest-plugin-api
@@ -117,7 +109,51 @@
     name: vitrage-tempest-plugin-datasources
     parent: vitrage-tempest-plugin-base
     vars:
+      devstack_local_conf:
+        post-config:
+          $NOVA_CONF:
+            DEFAULT:
+              notification_topics: 'notifications,vitrage_notifications'
+              notification_driver: messagingv2
+            notifications:
+              versioned_notifications_topics: 'versioned_notifications,vitrage_notifications'
+              notification_driver: messagingv2
+          $NEUTRON_CONF:
+            DEFAULT:
+              notification_topics: 'notifications,vitrage_notifications'
+              notification_driver: messagingv2
+          $CINDER_CONF:
+            DEFAULT:
+              notification_topics: 'notifications,vitrage_notifications'
+              notification_driver: messagingv2
+          $HEAT_CONF:
+            DEFAULT:
+              notification_topics: 'notifications,vitrage_notifications'
+              notification_driver: messagingv2
+              policy_file: /etc/heat/policy.yaml
+          $AODH_CONF:
+            oslo_messaging_notifications:
+              topics: 'notifications,vitrage_notifications'
+              driver: messagingv2
+          $VITRAGE_CONF:
+            DEFAULT:
+              notifiers: 'mistral,nova,webhook'
+            datasources:
+              snapshots_interval: 120
+        test-config:
+          $TEMPEST_CONFIG:
+            service_available:
+              vitrage: True
+            root_cause_analysis_service:
+              zabbix_alarms_per_host: 2
+              instances_per_host: 2
+              snapshots_interval: 120
       tempest_test_regex: datasources|test_events|notifiers|e2e|database
+      devstack_plugins:
+        heat: https://opendev.org/openstack/heat
+        aodh: https://opendev.org/openstack/aodh
+        mistral: https://opendev.org/openstack/mistral
+        vitrage: https://opendev.org/openstack/vitrage
 
 - job:
     name: vitrage-tempest-plugin-mock
diff --git a/vitrage_tempest_plugin/tests/base.py b/vitrage_tempest_plugin/tests/base.py
index 21cb411..a3771fd 100644
--- a/vitrage_tempest_plugin/tests/base.py
+++ b/vitrage_tempest_plugin/tests/base.py
@@ -147,6 +147,14 @@ class BaseVitrageTempest(test.BaseTestCase):
         cls.num_default_edges = 2
         cls.num_demo_tenant_networks = cls._calc_num_tenant_networks()
 
+    @classmethod
+    def setup_credentials(cls):
+        # Do not create new tempest network resources
+        # We use the default networks that come in devstack
+        # see the set_network_resources doc in tempest base
+        cls.set_network_resources()
+        super(BaseVitrageTempest, cls).setup_credentials()
+
     @classmethod
     def _get_num_default_ports(cls):
         ports = TempestClients.neutron().list_ports()['ports']
diff --git a/vitrage_tempest_plugin/tests/datasources/test_aodh.py b/vitrage_tempest_plugin/tests/datasources/test_aodh.py
index 8167dad..6440d1f 100644
--- a/vitrage_tempest_plugin/tests/datasources/test_aodh.py
+++ b/vitrage_tempest_plugin/tests/datasources/test_aodh.py
@@ -13,6 +13,7 @@
 # under the License.
 
 from oslo_log import log as logging
+import testtools
 from vitrage_tempest_plugin.tests import utils
 
 from vitrage_tempest_plugin.tests.base import BaseVitrageTempest
@@ -23,6 +24,7 @@ from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients
 LOG = logging.getLogger(__name__)
 
 
+@testtools.skip('gnocchi is not supported')
 class TestAodhAlarm(BaseVitrageTempest):
     NUM_INSTANCE = 1
     NUM_ALARM = 1