From 0c51d82242e2b62397bce08bb43ba95ba8717af0 Mon Sep 17 00:00:00 2001
From: Ryan Brandt <ryan.brandt@hp.com>
Date: Tue, 8 Dec 2015 12:07:31 -0700
Subject: [PATCH] Add tempest jobs as non-voting check for monasca persister

Change-Id: I6bbf8afcfca2cdcc829e929e909f5185d3ad7000
---
 jenkins/jobs/monasca.yaml | 84 ++++++++++++++++++++++++++++++++++++++-
 zuul/layout.yaml          |  8 ++++
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml
index 3a3277e2ec..1fd343946b 100644
--- a/jenkins/jobs/monasca.yaml
+++ b/jenkins/jobs/monasca.yaml
@@ -21,7 +21,6 @@
           export PROJECTS="openstack/monasca-api $PROJECTS"
 
           function pre_test_hook {
-              # Configure and run tempest on monasca-api installation
               source $BASE/new/monasca-api/devstack/pre_test_hook.sh
           }
           export -f pre_test_hook
@@ -65,7 +64,88 @@
           export MONASCA_PERSISTER_IMPLEMENTATION_LANG=java
 
           function pre_test_hook {
-              # Configure and run tempest on monasca-api installation
+              source $BASE/new/monasca-api/devstack/pre_test_hook.sh
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              # Configure and run tempest on monasca-api installation
+              source $BASE/new/monasca-api/devstack/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
+
+- job:
+    name: gate-monasca-persister-tempest-dsvm
+    node: 'devstack-precise || devstack-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+            export PYTHONUNBUFFERED=true
+            export DEVSTACK_GATE_TIMEOUT=120
+            export DEVSTACK_GATE_TEMPEST=1
+            export DEVSTACK_GATE_TEMPEST_FULL=1
+            export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api"
+            export PROJECTS="openstack/monasca-api openstack/monasca-persister $PROJECTS"
+
+            function pre_test_hook {
+                source $BASE/new/monasca-api/devstack/pre_test_hook.sh
+            }
+            export -f pre_test_hook
+
+            function post_test_hook {
+                # Configure and run tempest on monasca-api installation
+                source $BASE/new/monasca-api/devstack/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
+
+- job:
+    name: gate-monasca-persister-java-tempest-dsvm
+    node: 'devstack-precise || devstack-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_NEUTRON=1
+          export ENABLED_SERVICES=tempest
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api"
+          export PROJECTS="openstack/monasca-api openstack/monasca-persister $PROJECTS"
+
+          export MONASCA_API_IMPLEMENTATION_LANG=java
+          export MONASCA_PERSISTER_IMPLEMENTATION_LANG=java
+
+          function pre_test_hook {
               source $BASE/new/monasca-api/devstack/pre_test_hook.sh
           }
           export -f pre_test_hook
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b0e849dab4..0710628b91 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2055,6 +2055,12 @@ jobs:
   - name: gate-monasca-api-java-tempest-dsvm
     voting: false
 
+  - name: gate-monasca-persister-tempest-dsvm
+    voting: false
+
+  - name: gate-monasca-persister-java-tempest-dsvm
+    voting: false
+
   - name: watcher-coverage
     voting: false
 
@@ -5948,6 +5954,8 @@ projects:
       - gate-monasca-persister-pep8
       - gate-monasca-persister-python27
       - gate-monasca-persister-build
+      - gate-monasca-persister-tempest-dsvm
+      - gate-monasca-persister-java-tempest-dsvm
     gate:
       - gate-monasca-persister-pep8
       - gate-monasca-persister-python27