From 0e2e50aad89b3d0711590f45210eea0a34e613f5 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@sileht.net>
Date: Thu, 14 Jun 2018 12:39:07 +0200
Subject: [PATCH] Fix oslo messaging gating

This change fixes the oslo.messaging gate for rabbit/amqp1/kafka.

Change-Id: I7c80b89231ca0a6a9e38aecc9e744da5d7227f00
---
 .../oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml  | 4 ++--
 .../oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml  | 4 ++--
 .../oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
index 2fe2ea74b..cbdd43ec4 100644
--- a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
+++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
@@ -41,7 +41,7 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/heat-tempest-plugin /opt/stack/new/telemetry-tempest-plugin'"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
@@ -49,7 +49,7 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1"
           export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
           function post_test_hook {
-              cd /opt/stack/new/telemetry-tempest-plugin/telemetry_tempest_plugin/integration/hooks/
+              cd /opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
               ./post_test_hook.sh
           }
           export -f post_test_hook
diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
index 1c8f60348..e93d01dd6 100644
--- a/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
+++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
@@ -41,14 +41,14 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/heat-tempest-plugin /opt/stack/new/telemetry-tempest-plugin'"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-kafka git://git.openstack.org/openstack/devstack-plugin-kafka"
           export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
           function post_test_hook {
-              cd /opt/stack/new/telemetry-tempest-plugin/telemetry_tempest_plugin/integration/hooks/
+              cd /opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
               ./post_test_hook.sh
           }
           export -f post_test_hook
diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
index b07cfbab9..59b6a2c0e 100644
--- a/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
+++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
@@ -40,13 +40,13 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/heat-tempest-plugin /opt/stack/new/telemetry-tempest-plugin'"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
           export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
           function post_test_hook {
-              cd /opt/stack/new/telemetry-tempest-plugin/telemetry_tempest_plugin/integration/hooks/
+              cd /opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
               ./post_test_hook.sh
           }
           export -f post_test_hook