Use heat-tempest-plugin in grenade job

Change-Id: I3a3744fa116a2d424b2afd95eb89058ad78d7f0b

.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$

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
 }
 

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