Merge "Use heat-tempest-plugin for integration tests"

.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

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

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

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