From c48c98ef3c5f5ea268b95d19e0b2f1f7c99eeb61 Mon Sep 17 00:00:00 2001 From: Kenneth Giusti Date: Fri, 9 Feb 2018 15:48:51 -0500 Subject: [PATCH] Restore devstack project name in amqp1 test This patch also adds heat to required projects Change-Id: Ic150f9ce01787a1892b67e00cccc4ba43eaf0373 --- .zuul.yaml | 2 ++ .../oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 110cc8918..002583aaf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -188,6 +188,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 @@ -261,6 +262,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