From e18ca5d3593531cb44309121b1cf14d9579068d0 Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Wed, 8 Apr 2020 15:24:54 +0300
Subject: [PATCH] [ci] Get back jobs

Change-Id: Ibb6ef2cb0d14be80b1ee6fb808c4facbee36e97b
---
 .zuul.d/zuul.yaml       | 78 +++++++++++++++++++++++++++++++++++++++++
 tests/ci/osresources.py |  3 +-
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 7d06526d..82d48483 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -1,7 +1,85 @@
 - project:
     check:
       jobs:
+        - rally-tox-cover
         - rally-tox-pep8
+        - rally-tox-py36
+        - rally-tox-py37
+        - rally-tox-py38
+        - rally-dsvm-tox-functional
+        - rally-docker-check
+        - rally-task-basic-with-existing-users:
+            # use_existing_users key did not trigger proper ansible tasks
+            voting: false
+        - rally-task-simple-job
+        - rally-task-barbican:
+            files:
+              - rally-jobs/barbican.yaml
+              - rally_openstack/common/osclients.py
+              - rally_openstack/common/services/key_manager
+              - rally_openstack/task/cleanup/resources.py
+              - rally_openstack/task/scenarios/barbican
+        - rally-task-cinder
+        # NOTE(andreykurilin): this requires more thing to configure before
+        #   launching.
+        #- rally-task-designate
+        - rally-task-heat:
+            voting: false
+        - rally-task-ironic
+        - rally-task-keystone-glance-swift
+        - rally-task-magnum:
+            voting: false
+            files:
+              - rally-jobs/magnum.yaml
+              - rally_openstack/cleanup/resources.py
+              - rally_openstack/contexts/magnum
+              - rally_openstack/scenarios/magnum
+              - rally_openstack/osclients.py
+        - rally-task-manila-no-ss:
+            voting: false
+        - rally-task-manila-ss:
+            voting: false
+        - rally-task-mistral
+        # it did not work for a long time. try to re-configure it
+        #- rally-task-monasca
+        - rally-task-murano:
+            voting: false
+        - rally-task-neutron
+        - rally-task-neutron-trunk:
+            files:
+              - rally-jobs/neutron-trunk.yaml
+              - rally_openstack/scenarios/neutron/trunk.py
+              - rally_openstack/scenarios/neutron/network.py
+        - rally-task-neutron-with-extensions:
+            voting: false
+        - rally-task-nova:
+            voting: false
+        # it did not work for a long time
+        #- rally-task-senlin
+        #- rally-task-octavia:
+        #    voting: false
+        - rally-task-telemetry
+        - rally-task-watcher:
+            # watcher-api did not start last time
+            voting: false
+        - rally-task-zaqar
+        - rally-verify-tempest
     gate:
       jobs:
+        - rally-tox-cover
         - rally-tox-pep8
+        - rally-tox-py36
+        - rally-tox-py37
+        - rally-tox-py38
+        - rally-dsvm-tox-functional
+        - rally-docker-check
+        - rally-task-simple-job
+        - rally-task-cinder
+        #- rally-task-heat
+        - rally-task-ironic
+        - rally-task-keystone-glance-swift
+        - rally-task-mistral
+        - rally-task-neutron
+        - rally-task-telemetry
+        - rally-task-zaqar
+        - rally-verify-tempest
diff --git a/tests/ci/osresources.py b/tests/ci/osresources.py
index 8ad36898..53aac2a9 100755
--- a/tests/ci/osresources.py
+++ b/tests/ci/osresources.py
@@ -574,8 +574,7 @@ def check_resource(resources_mgs, args):
                 # Glance has issues with uWSGI integration...
                 # or resource["cls"] == "glance"
 
-                or (resource["cls"] == "gnocchi"
-                    and resource["resource_name"] == "metric")):
+                or resource["cls"] == "gnocchi"):
 
             expected.append(resource)