From 0cbfac7a99154433918b2510945d8ff323f457dd Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Thu, 28 Sep 2017 15:08:47 +0530
Subject: [PATCH] Use heat-tempest-plugin for integration tests

Note: We still have to change grenade jobs to use
the plugin, before removing the plugin from tree.

Change-Id: Ie63f25e724ed3fbd42adcf5bb2d625c2fec67df1
---
 .zuul.yaml                                | 1 +
 heat_integrationtests/post_test_hook.sh   | 4 ++--
 heat_integrationtests/prepare_test_env.sh | 3 ++-
 playbooks/devstack/functional/run.yaml    | 4 ++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2665629745..ac0bea31ca 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,6 +12,7 @@
       - openstack/ceilometer
       - openstack/devstack-plugin-amqp1
       - openstack/heat
+      - openstack/heat-tempest-plugin
       - openstack/neutron
       - openstack/neutron-lbaas
       - openstack/oslo.messaging
diff --git a/heat_integrationtests/post_test_hook.sh b/heat_integrationtests/post_test_hook.sh
index 51c76a0df1..7952eea4d2 100755
--- a/heat_integrationtests/post_test_hook.sh
+++ b/heat_integrationtests/post_test_hook.sh
@@ -21,7 +21,7 @@ sudo -E $DEST/heat/heat_integrationtests/prepare_test_env.sh
 sudo -E $DEST/heat/heat_integrationtests/prepare_test_network.sh
 
 cd $DEST/tempest
-sudo sed -i -e '/group_regex/c\group_regex=heat_integrationtests\\.api\\.test_heat_api(?:\\.|_)([^_]+)' .testr.conf
-sudo tempest run --regex heat_integrationtests
+sudo sed -i -e '/group_regex/c\group_regex=heat_tempest_plugin\\.tests\\.api\\.test_heat_api(?:\\.|_)([^_]+)' .testr.conf
+sudo tox -evenv-tempest -- tempest run --regex heat_tempest_plugin.tests
 
 sudo -E $DEST/heat/heat_integrationtests/cleanup_test_env.sh
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 055723282d..77a3c8efe9 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -58,7 +58,8 @@ iniset $conf_file heat_plugin minimal_image_ref cirros-0.3.5-x86_64-disk
 
 # Skip ReloadOnSighupTest. Most jobs now run with apache+uwsgi, so the test has no significance
 # Skip NotificationTest till bug #1721202 is fixed
-iniset $conf_file heat_plugin skip_functional_test_list 'ReloadOnSighupTest, NotificationTest'
+# Skip StackCancelTest till the python-heatclient is bumped
+iniset $conf_file heat_plugin skip_functional_test_list 'ReloadOnSighupTest, NotificationTest, StackCancelTest'
 
 # Add scenario tests to skip
 # VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300
diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml
index 8263f90d0c..836e8c3efc 100644
--- a/playbooks/devstack/functional/run.yaml
+++ b/playbooks/devstack/functional/run.yaml
@@ -82,6 +82,10 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican"
           # the lbaas v2 driver choice is in the gate pre test hook
 
+          # use heat-tempest-plugin
+          export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/heat-tempest-plugin'"
+
           export OVERRIDE_ENABLED_SERVICES=$services
 
           if [ "{{ branch_override }}" != "default" ] ; then