Enable heat support in telemetry-tempest-plugin
* Due to tempest plugin split migration and deprecation of
`orchestration` flag in heat which is replaced with
heat_plugins leads to skipping telemetry scenario tests.
* It updates the same and enable tests for the same.
Change-Id: Idd12dcb05322737b3d9b72eac902b969252ee4c3
diff --git a/.zuul.yaml b/.zuul.yaml
index 01d6e87..d946983 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,6 +10,8 @@
- openstack/ceilometer
- openstack/panko
- openstack/telemetry-tempest-plugin
+ - openstack/heat-tempest-plugin
+ - openstack/heat
# following are required when DEVSTACK_GATE_HEAT, which this
# job turns on
- openstack/dib-utils
diff --git a/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin/run.yaml b/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin/run.yaml
index a2b851a..f11ce27 100644
--- a/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin/run.yaml
+++ b/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin/run.yaml
@@ -35,16 +35,15 @@
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
- export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin"
+ export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin openstack/heat openstack/heat-tempest-plugin"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
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'"enable_plugin telemetry-tempest-plugin git://git.openstack.org/openstack/telemetry-tempest-plugin"
+ export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/heat-tempest-plugin /opt/stack/new/telemetry-tempest-plugin'"
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/
./post_test_hook.sh
diff --git a/telemetry_tempest_plugin/integration/hooks/post_test_hook.sh b/telemetry_tempest_plugin/integration/hooks/post_test_hook.sh
index aaa3d47..d212596 100755
--- a/telemetry_tempest_plugin/integration/hooks/post_test_hook.sh
+++ b/telemetry_tempest_plugin/integration/hooks/post_test_hook.sh
@@ -84,7 +84,7 @@
sudo chown -R tempest:stack $BASE/data/tempest
cd $BASE/new/tempest
set +e
-sudo -H -u tempest OS_TEST_TIMEOUT=$TEMPEST_OS_TEST_TIMEOUT tox -eall-plugin -- telemetry_tempest_plugin --concurrency=$TEMPEST_CONCURRENCY
+sudo -H -u tempest OS_TEST_TIMEOUT=$TEMPEST_OS_TEST_TIMEOUT tox -evenv-tempest -- tempest run -r telemetry_tempest_plugin --concurrency=$TEMPEST_CONCURRENCY
EXIT_CODE=$?
set -e
export_subunit_data "all-plugin"
diff --git a/telemetry_tempest_plugin/scenario/test_telemetry_integration.py b/telemetry_tempest_plugin/scenario/test_telemetry_integration.py
index aba412f..139e709 100644
--- a/telemetry_tempest_plugin/scenario/test_telemetry_integration.py
+++ b/telemetry_tempest_plugin/scenario/test_telemetry_integration.py
@@ -31,8 +31,8 @@
@classmethod
def skip_checks(cls):
super(TestTelemetryIntegration, cls).skip_checks()
- for name in ["aodh_plugin", "gnocchi", "nova", "heat", "panko",
- "ceilometer", "glance"]:
+ for name in ["aodh_plugin", "gnocchi", "nova", "heat_plugin",
+ "panko", "ceilometer", "glance"]:
cls._check_service(name)
@classmethod
@@ -88,7 +88,7 @@
"AODH_SERVICE_URL": self._get_endpoint(auth, "alarming_plugin"),
"GNOCCHI_SERVICE_URL": self._get_endpoint(auth, "metric"),
"PANKO_SERVICE_URL": self._get_endpoint(auth, "event"),
- "HEAT_SERVICE_URL": self._get_endpoint(auth, "orchestration"),
+ "HEAT_SERVICE_URL": self._get_endpoint(auth, "heat_plugin"),
"NOVA_SERVICE_URL": self._get_endpoint(auth, "compute"),
"GLANCE_SERVICE_URL": self._get_endpoint(auth, "image"),
"GLANCE_IMAGE_NAME": self.glance_image_create(),