From 39d9cfad64645b6c51598f617597bc386b7e3686 Mon Sep 17 00:00:00 2001
From: Witold Bedyk <witold.bedyk@est.fujitsu.com>
Date: Mon, 5 Sep 2016 16:32:25 +0200
Subject: [PATCH] Move monasca-log tempest job to check queue

* Rework test to be a job-template following best practices for naming.
* Run the tests on ubuntu-xenial node
* Typo in comment

Change-Id: Ib09a507562dd9ad0eb79c3b94e5c1a66d5ffdcee
---
 jenkins/jobs/monasca.yaml  | 15 +++++++--------
 jenkins/jobs/projects.yaml |  3 +++
 zuul/layout.yaml           |  5 ++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml
index 3119c6686b..4957207f9b 100644
--- a/jenkins/jobs/monasca.yaml
+++ b/jenkins/jobs/monasca.yaml
@@ -104,10 +104,9 @@
       - 'gate-tempest-dsvm-monasca-java-full{job-suffix}':
           job-suffix: '-nv'
 
-- job:
-    name: 'gate-tempest-dsvm-monasca-log'
-
-    node: ubuntu-trusty
+- job-template:
+    name: 'gate-tempest-dsvm-monasca-log-api-{node}{suffix}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -129,15 +128,15 @@
           PROJECTS="openstack/monasca-api $PROJECTS"
           export PROJECTS="openstack/monasca-log-api $PROJECTS"
 
-          function pre_test_hook {
+          function pre_test_hook {{
               source $BASE/new/monasca-log-api/devstack/pre_test_hook.sh
-          }
+          }}
           export -f pre_test_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               # Configure and run tempest on monasca-log-api installation
               source $BASE/new/monasca-log-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
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 162b2fc31f..6d6dfd904e 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6124,6 +6124,9 @@
       - python-jobs
       - pypi-jobs
       - maven-plugin-jobs
+      - gate-tempest-dsvm-monasca-log-api-{node}{suffix}:
+          node: ubuntu-xenial
+          suffix: '-nv'
 
 - project:
     name: monasca-notification
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index af4c57a56e..bc177e78d9 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1168,7 +1168,7 @@ jobs:
   - name: ^.*-nv$
     voting: false
   # Restrict explicit ubuntu-trusty jobs to < Newton
-  # and xenila to >= Newton.
+  # and xenial to >= Newton.
   - name: ^.*-ubuntu-trusty(-nv)?$
     branch: ^stable/(liberty|mitaka)$
   - name: ^.*-ubuntu-xenial(-nv)?$
@@ -10372,6 +10372,7 @@ projects:
       - gate-monasca-log-api-pep8-ubuntu-xenial
       - gate-monasca-log-api-python27-ubuntu-xenial
       - gate-monasca-log-api-build
+      - gate-tempest-dsvm-monasca-log-api-ubuntu-xenial-nv
     gate:
       - gate-monasca-log-api-pep8-ubuntu-trusty
       - gate-monasca-log-api-python27-ubuntu-trusty
@@ -10380,8 +10381,6 @@ projects:
       - gate-monasca-log-api-build
     post:
       - monasca-log-api-localrepo-upload
-    experimental:
-      - gate-tempest-dsvm-monasca-log
 
   - name: openstack/monasca-notification
     template: