diff --git a/.zuul.yaml b/.zuul.yaml index 11fb98b05..da20f4a64 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -170,6 +170,7 @@ - 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 @@ -225,6 +226,7 @@ - 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/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml index 007c66c40..2fe2ea74b 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml @@ -35,7 +35,7 @@ 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 openstack/heat-tempest-plugin" + export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin openstack/heat openstack/heat-tempest-plugin" export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" 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" @@ -47,6 +47,7 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15" export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" + 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