From 31ffa13932b1f0c9c2596b9d30f44ecf3cc8f14b Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Sat, 18 Nov 2017 15:27:06 +0530
Subject: [PATCH] Use heat-tempest-plugin in grenade job

Change-Id: I3a3744fa116a2d424b2afd95eb89058ad78d7f0b
---
 .zuul.yaml                          | 1 +
 devstack/upgrade/resources.sh       | 4 ++--
 playbooks/devstack/grenade/run.yaml | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index ac0bea31ca..1b7c771d47 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -87,6 +87,7 @@
       - openstack-dev/grenade
       - openstack-infra/devstack-gate
       - openstack/heat
+      - openstack/heat-tempest-plugin
     irrelevant-files:
       - ^(test-|)requirements.txt$
       - ^.*\.rst$
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 4a2cf263cf..4d0a2afb71 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -40,7 +40,7 @@ function _run_heat_api_tests {
     local devstack_dir=$1
 
     pushd $devstack_dir/../tempest
-    sed -i -e '/group_regex/c\group_regex=heat_integrationtests\\.api\\.test_heat_api(?:\\.|_)([^_]+)' .testr.conf
+    sed -i -e '/group_regex/c\group_regex=heat_tempest_plugin\\.tests\\.api\\.test_heat_api(?:\\.|_)([^_]+)' .testr.conf
     conf_file=etc/tempest.conf
     iniset_multiline $conf_file service_available heat_plugin True
     iniset $conf_file heat_plugin username $OS_USERNAME
@@ -53,7 +53,7 @@ function _run_heat_api_tests {
     iniset $conf_file heat_plugin project_domain_name $OS_PROJECT_DOMAIN_NAME
     iniset $conf_file heat_plugin region $OS_REGION_NAME
     iniset $conf_file heat_plugin auth_version $OS_IDENTITY_API_VERSION
-    tempest run --regex heat_integrationtests.api
+    tox -evenv-tempest -- tempest run --regex heat_tempest_plugin.tests.api
     popd
 }
 
diff --git a/playbooks/devstack/grenade/run.yaml b/playbooks/devstack/grenade/run.yaml
index e254603028..f2c2ea4837 100644
--- a/playbooks/devstack/grenade/run.yaml
+++ b/playbooks/devstack/grenade/run.yaml
@@ -30,6 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin heat git://git.openstack.org/openstack/heat
+          TEMPEST_PLUGINS+=' ../heat-tempest-plugin'
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -40,6 +41,7 @@
           set -e
           set -x
           export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
           export PYTHONUNBUFFERED=true
           export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
           export DEVSTACK_GATE_NEUTRON=1