From d11159c430dbd4673c2958e9256629aa34fa3492 Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Thu, 18 Jan 2018 12:54:34 -0500 Subject: [PATCH] Update telemetry integration playbooks Change-Id: I5b4f01c928373cac530aa6877a34c684577bc64e --- .zuul.yaml | 6 ++-- .../run.yaml | 34 ++++--------------- .../run.yaml | 29 +++------------- 3 files changed, 15 insertions(+), 54 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 3ead3b4d8..d25f8c4e4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -178,7 +178,7 @@ parent: legacy-dsvm-base run: playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml post-run: playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/post.yaml - timeout: 4200 + timeout: 10800 required-projects: - openstack-infra/devstack-gate - openstack/aodh @@ -186,6 +186,7 @@ - openstack/devstack-plugin-amqp1 - openstack/oslo.messaging - openstack/panko + - openstack/telemetry-tempest-plugin # following are required when DEVSTACK_GATE_HEAT, which this # job turns on - openstack/dib-utils @@ -250,13 +251,14 @@ parent: legacy-dsvm-base run: playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml post-run: playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/post.yaml - timeout: 7800 + timeout: 10800 required-projects: - openstack-infra/devstack-gate - openstack/aodh - openstack/ceilometer - openstack/oslo.messaging - openstack/panko + - openstack/telemetry-tempest-plugin # 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 3f6ef21ef..0dc28c41c 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml @@ -29,50 +29,30 @@ set -e set -x export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_INSTALL_TESTONLY=1 - - export PROJECTS="openstack/ceilometer $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" + export DEVSTACK_GATE_TEMPEST_NOTESTS=1 + export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin" export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - - case "$ZUUL_BRANCH" in - "stable/ocata") - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" - export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1" - export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi" - ;; - *) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" - export PROJECTS="openstack/panko $PROJECTS" - ;; - esac + 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'"CEILOMETER_BACKEND=gnocchi" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_STORAGE_BACKEND=file" - + 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="oslo.messaging" - + export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME function post_test_hook { - cd /opt/stack/new/ceilometer/ceilometer/tests/integration/hooks/ + cd /opt/stack/new/telemetry-tempest-plugin/telemetry_tempest_plugin/integration/hooks/ ./post_test_hook.sh } export -f post_test_hook - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml index 928bf0ee3..ffff8dd45 100644 --- a/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml +++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml @@ -29,48 +29,27 @@ set -e set -x export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - - export PROJECTS="openstack/ceilometer openstack/aodh" - - # NOTE(sileht): This job runs on Aodh and Ceilometer. - # Gnocchi uses an independent release cycle. So we map here - # which Gnocchi version can be used with other OpenStack - # components and the reverse. - case "$ZUUL_BRANCH" in - "stable/ocata") - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" - export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1" - export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi" - ;; - *) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" - export PROJECTS="openstack/panko $PROJECTS" - ;; - esac + export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-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'"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/ceilometer/ceilometer/tests/integration/hooks/ + cd /opt/stack/new/telemetry-tempest-plugin/telemetry_tempest_plugin/integration/hooks/ ./post_test_hook.sh } export -f post_test_hook - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash