From 1850fd8269e5e2a5de83aeb6ff9c7826e97e69bf Mon Sep 17 00:00:00 2001
From: Ryan Brandt <ryan.brandt@hp.com>
Date: Fri, 4 Dec 2015 12:33:42 -0700
Subject: [PATCH] Move Monasca tempest check job to gate

Change tempest job to voting and gate
Add java tempest job to non-voting check

Change-Id: I3f79059a1c91249ed4a054e64e559bc23d00f4ec
---
 jenkins/jobs/monasca.yaml | 44 +++++++++++++++++++++++++++++++++++++++
 zuul/layout.yaml          |  4 +++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml
index a3370f3cf9..3a3277e2ec 100644
--- a/jenkins/jobs/monasca.yaml
+++ b/jenkins/jobs/monasca.yaml
@@ -38,3 +38,47 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job:
+    name: gate-monasca-api-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 $PROJECTS"
+
+          export MONASCA_API_IMPLEMENTATION_LANG=java
+          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
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 694320de50..6255afaf89 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2223,7 +2223,7 @@ jobs:
   - name: gate-python-fuelclient-python27
     branch: ^(?!stable/(?:6\.1)).*$
 
-  - name: gate-monasca-api-tempest-dsvm
+  - name: gate-monasca-api-java-tempest-dsvm
     voting: false
 
   - name: watcher-coverage
@@ -6081,10 +6081,12 @@ projects:
       - gate-monasca-api-python27
       - gate-monasca-api-build
       - gate-monasca-api-tempest-dsvm
+      - gate-monasca-api-java-tempest-dsvm
     gate:
       - gate-monasca-api-pep8
       - gate-monasca-api-python27
       - gate-monasca-api-build
+      - gate-monasca-api-tempest-dsvm
     post:
       - monasca-api-localrepo-upload