Enable congress-tempest-plugin to use in congress

This commit enables to use congress-tempest-plugin instead of intree repo and also enables heat, murano, aodh tempest plugins to fix the corresponding congress tempest tests to run. And also, fixes the gate failure in aodh tests, due to recent change in aodh to remove the threshold_rule I7ccf930f2ad0316dbda0675a2ec0344e61986022, so this commit removes the same from congress repo. dsvm HA tests are disabled. Depends-On: I5c26c8e77f15f9ea0f075dc23e7249bba5a56e8c Partially-Implements blueprint split-tempest-plugin Closes-Bug:#1742656 Partial-Bug:#1743729 Change-Id: If1774d1993a4f20c99d3c41464bb8a365c3c2132
2018-01-11 15:39:50 +05:30 · 2018-01-11 15:39:50 +05:30 · 27c3bb50b4
parent d9f6b258f7
commit 27c3bb50b4
5 changed files with 36 additions and 26 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -9,16 +9,20 @@
    required-projects:
      - openstack-infra/devstack-gate
      - openstack/aodh
+      - openstack/python-aodhclient
      - openstack/congress
      - openstack/congress-dashboard
+      - openstack/congress-tempest-plugin
+      - openstack/python-congressclient
      - openstack/murano
      - openstack/murano-dashboard
-      - openstack/python-aodhclient
-      - openstack/python-congressclient
      - openstack/python-muranoclient
      - openstack/mistral
      - openstack/python-mistralclient
      - openstack/mistral-tempest-plugin
+      - openstack/murano-tempest-plugin
+      - openstack/telemetry-tempest-plugin
+      - openstack/heat-tempest-plugin
    run: playbooks/legacy/congress-devstack-api-base/run.yaml
    post-run: playbooks/legacy/congress-devstack-api-base/post.yaml
    timeout: 6000
@ -36,9 +40,10 @@
    required-projects:
      - openstack-infra/devstack-gate
      - openstack/aodh
+      - openstack/python-aodhclient
      - openstack/congress
      - openstack/congress-dashboard
-      - openstack/python-aodhclient
+      - openstack/congress-tempest-plugin
      - openstack/python-congressclient
      - openstack/murano
      - openstack/murano-dashboard
@ -46,6 +51,9 @@
      - openstack/mistral
      - openstack/python-mistralclient
      - openstack/mistral-tempest-plugin
+      - openstack/murano-tempest-plugin
+      - openstack/telemetry-tempest-plugin
+      - openstack/heat-tempest-plugin
    run: playbooks/legacy/congress-pe-replicated-base/run.yaml
    post-run: playbooks/legacy/congress-pe-replicated-base/post.yaml
    timeout: 6000
@ -73,17 +81,18 @@
      - ^releasenotes/.*$
    required-projects:
      - openstack-infra/devstack-gate
-      - openstack/aodh
      - openstack/congress
+      - openstack/congress-tempest-plugin
      - openstack/congress-dashboard
+      - openstack/python-congressclient
      - openstack/murano
      - openstack/murano-dashboard
-      - openstack/python-aodhclient
-      - openstack/python-congressclient
      - openstack/python-muranoclient
      - openstack/mistral
      - openstack/python-mistralclient
      - openstack/mistral-tempest-plugin
+      - openstack/murano-tempest-plugin
+      - openstack/heat-tempest-plugin
    run: playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml
    post-run: playbooks/legacy/congress-devstack-py35-api-mysql/post.yaml
    timeout: 6000
--- a/congress/datasources/aodh_driver.py
+++ b/congress/datasources/aodh_driver.py
@ -27,9 +27,9 @@ LOG = logging.getLogger(__name__)
 class AodhDriver(datasource_driver.PollingDataSourceDriver,
                 datasource_driver.ExecutionDriver):
    ALARMS = "alarms"
-    ALARM_THRESHOLD_RULE = "alarms.threshold_rule"

    value_trans = {'translation-type': 'VALUE'}
+    # TODO(ramineni): enable ALARM_RULES translator

    alarms_translator = {
        'translation-type': 'HDICT',
@ -40,12 +40,6 @@ class AodhDriver(datasource_driver.PollingDataSourceDriver,
             {'fieldname': 'name', 'translator': value_trans},
             {'fieldname': 'state', 'translator': value_trans},
             {'fieldname': 'enabled', 'translator': value_trans},
-             {'fieldname': 'threshold_rule', 'col': 'threshold_rule_id',
-              'translator': {'translation-type': 'VDICT',
-                             'table-name': ALARM_THRESHOLD_RULE,
-                             'id-col': 'threshold_rule_id',
-                             'key-col': 'key', 'val-col': 'value',
-                             'translator': value_trans}},
             {'fieldname': 'type', 'translator': value_trans},
             {'fieldname': 'description', 'translator': value_trans},
             {'fieldname': 'time_constraints', 'translator': value_trans},
--- a/playbooks/legacy/congress-devstack-api-base/run.yaml
+++ b/playbooks/legacy/congress-devstack-api-base/run.yaml
@ -39,6 +39,8 @@
          CONGRESS_MULTIPROCESS_DEPLOYMENT=True
          CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST=True

+          TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/telemetry-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin'
+
          EOF
        executable: /bin/bash
        chdir: '{{ ansible_user_dir }}/workspace'
@ -53,13 +55,12 @@

          export PYTHONUNBUFFERED=true
          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests"
+          export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_plugin"
          export DEVSTACK_GATE_NEUTRON=1
          export PROJECTS="openstack/congress $PROJECTS"
          export PROJECTS="openstack/congress-dashboard $PROJECTS"
          export PROJECTS="openstack/python-congressclient $PROJECTS"
-          #export DEVSTACK_PROJECT_FROM_GIT=python-congressclient
+          export PROJECTS="openstack/congress-tempest-plugin $PROJECTS"
          export PROJECTS="openstack/murano $PROJECTS"
          export PROJECTS="openstack/aodh $PROJECTS"
          export PROJECTS="openstack/mistral $PROJECTS"
@ -68,6 +69,9 @@
          export PROJECTS="openstack/murano-dashboard $PROJECTS"
          export PROJECTS="openstack/python-muranoclient $PROJECTS"
          export PROJECTS="openstack/python-aodhclient $PROJECTS"
+          export PROJECTS="openstack/telemetry-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"

          export ENABLED_SERVICES
          export BRANCH_OVERRIDE=default
--- a/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml
+++ b/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml
@ -36,7 +36,7 @@
          disable_service s-proxy
          # without Swift, c-bak cannot run (in the Gate at least)
          disable_service c-bak
-          # enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
+          # aodh not ready for python3 yet
          # enable_plugin aodh git://git.openstack.org/openstack/aodh
          enable_plugin heat git://git.openstack.org/openstack/heat
          enable_plugin congress git://git.openstack.org/openstack/congress
@ -46,7 +46,7 @@
          # To deploy congress as multi-process (api, pe, datasources)
          CONGRESS_MULTIPROCESS_DEPLOYMENT=True
          CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST=True
-
+          TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin'
          EOF
        executable: /bin/bash
        chdir: '{{ ansible_user_dir }}/workspace'
@ -59,24 +59,23 @@
          export DEVSTACK_GATE_USE_PYTHON3=True
          # swift is not ready for python3 yet
          # ENABLED_SERVICES=s-proxy,s-object,s-container,s-account,
-          # ENABLED_SERVICES+=h-eng,h-api,h-api-cfn,h-api-cw
          ENABLED_SERVICES+=neutron-qos
          export PYTHONUNBUFFERED=true
          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests"
+          export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_plugin"
          export DEVSTACK_GATE_NEUTRON=1
          export PROJECTS="openstack/congress $PROJECTS"
          export PROJECTS="openstack/congress-dashboard $PROJECTS"
          export PROJECTS="openstack/python-congressclient $PROJECTS"
+          export PROJECTS="openstack/congress-tempest-plugin $PROJECTS"
          export PROJECTS="openstack/murano $PROJECTS"
-          export PROJECTS="openstack/aodh $PROJECTS"
          export PROJECTS="openstack/mistral $PROJECTS"
          export PROJECTS="openstack/python-mistralclient $PROJECTS"
          export PROJECTS="openstack/mistral-tempest-plugin $PROJECTS"
          export PROJECTS="openstack/murano-dashboard $PROJECTS"
          export PROJECTS="openstack/python-muranoclient $PROJECTS"
-          export PROJECTS="openstack/python-aodhclient $PROJECTS"
+          export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"

          export ENABLED_SERVICES
          export BRANCH_OVERRIDE=default
--- a/playbooks/legacy/congress-pe-replicated-base/run.yaml
+++ b/playbooks/legacy/congress-pe-replicated-base/run.yaml
@ -39,6 +39,7 @@
          # To deploy congress as multi-process (api, pe, datasources)
          CONGRESS_MULTIPROCESS_DEPLOYMENT=True
          CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST=True
+          TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/telemetry-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin'

          EOF
        executable: /bin/bash
@ -54,20 +55,23 @@

          export PYTHONUNBUFFERED=true
          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests"
+          export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_plugin"
          export DEVSTACK_GATE_NEUTRON=1
          export PROJECTS="openstack/congress $PROJECTS"
          export PROJECTS="openstack/congress-dashboard $PROJECTS"
          export PROJECTS="openstack/python-congressclient $PROJECTS"
+          export PROJECTS="openstack/congress-tempest-plugin $PROJECTS"
          export PROJECTS="openstack/murano $PROJECTS"
-          export PROJECTS="openstack/aodh $PROJECTS"
          export PROJECTS="openstack/mistral $PROJECTS"
          export PROJECTS="openstack/python-mistralclient $PROJECTS"
          export PROJECTS="openstack/mistral-tempest-plugin $PROJECTS"
          export PROJECTS="openstack/murano-dashboard $PROJECTS"
          export PROJECTS="openstack/python-muranoclient $PROJECTS"
+          export PROJECTS="openstack/aodh $PROJECTS"
          export PROJECTS="openstack/python-aodhclient $PROJECTS"
+          export PROJECTS="openstack/telemetry-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"

          export ENABLED_SERVICES
          export BRANCH_OVERRIDE=default