From 9db1c9632c505ac762dc5f1fb72eeefba92935af Mon Sep 17 00:00:00 2001
From: dukhlov <dukhlov@mirantis.com>
Date: Thu, 28 Jan 2016 18:07:57 +0200
Subject: [PATCH] Adds non voting ceilometer tests  for oslo.messaging drivers

Change-Id: I4bd0716a3a33044b393fe2313460a6828064caf5
---
 jenkins/jobs/ceilometer.yaml | 59 ++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml   |  6 ++++
 zuul/layout.yaml             | 10 ++++++
 3 files changed, 75 insertions(+)

diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml
index 5ac4c2cfe0..2e0f73b8d1 100644
--- a/jenkins/jobs/ceilometer.yaml
+++ b/jenkins/jobs/ceilometer.yaml
@@ -259,3 +259,62 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: 'gate-oslo.messaging-telemetry-dsvm-integration-{plugin}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+
+          export DEVSTACK_GATE_TIMEOUT=60
+          export DEVSTACK_GATE_HEAT=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+
+          # Add just the needed telemetry services for this job (ceilometer-alarm* must be disabled)
+          s="ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-anotification,"
+          s+="aodh-api,aodh-alarm-notifier,aodh-alarm-evaluator,"
+          s+="gnocchi-api"
+          export ENABLE_SERVICES="$s"
+
+          export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi openstack/oslo.messaging"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
+          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'"GNOCCHI_ARCHIVE_POLICY=high"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_COORDINATOR_URL=redis://localhost:6379?timeout=5"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_STORAGE_BACKEND=file"
+
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-{plugin} git://git.openstack.org/openstack/devstack-plugin-{plugin}"
+
+          export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
+
+          function post_test_hook {{
+              cd /opt/stack/new/ceilometer/ceilometer/tests/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
+
+    publishers:
+      - devstack-logs
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index b0023abb37..72b8ff4df2 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4387,6 +4387,12 @@
           plugin-repo: openstack/devstack-plugin-pika
           job-suffix: ''
       - 'gate-telemetry-dsvm-integration-{name}'
+      - 'gate-oslo.messaging-telemetry-dsvm-integration-{plugin}':
+          node: devstack-trusty
+          plugin: pika
+      - 'gate-oslo.messaging-telemetry-dsvm-integration-{plugin}':
+          node: devstack-trusty
+          plugin: zmq
 
 - project:
     name: oslo.middleware
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8e09b34699..96f435cb49 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1832,6 +1832,14 @@ jobs:
     branch: ^(?!stable/(?:kilo|liberty)).*$
     voting: false
 
+  - name: gate-oslo.messaging-telemetry-dsvm-integration-zmq
+    branch: ^(?!stable/(?:kilo|liberty)).*$
+    voting: false
+
+  - name: gate-oslo.messaging-telemetry-dsvm-integration-pika
+    branch: ^(?!stable/(?:kilo|liberty)).*$
+    voting: false
+
   - name: gate-manila-tempest-dsvm-hdfs
     voting: false
 
@@ -7567,6 +7575,8 @@ projects:
       - gate-oslo.messaging-src-grenade-dsvm
       - gate-oslo.messaging-src-grenade-dsvm-multinode
       - gate-telemetry-dsvm-integration-oslo.messaging
+      - gate-oslo.messaging-telemetry-dsvm-integration-pika
+      - gate-oslo.messaging-telemetry-dsvm-integration-zmq
     post:
       - oslo.messaging-coverage