Merge "Move monasca-log tempest job to check queue"

jenkins/jobs/monasca.yaml

@@ -110,10 +110,9 @@
       - 'gate-tempest-dsvm-monasca-java-full{job-suffix}':
           job-suffix: '-nv'
 
-- job:
+- job-template:
-    name: 'gate-tempest-dsvm-monasca-log'
+    name: 'gate-tempest-dsvm-monasca-log-api-{node}{suffix}'
-
+    node: '{node}'
-    node: ubuntu-trusty
 
     wrappers:
       - build-timeout:
@@ -135,15 +134,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

jenkins/jobs/projects.yaml

@@ -6758,6 +6758,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

zuul/layout.yaml

@@ -11134,6 +11134,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
@@ -11142,8 +11143,6 @@ projects:
       - gate-monasca-log-api-build
     post:
       - monasca-log-api-localrepo-upload
-    experimental:
-      - gate-tempest-dsvm-monasca-log
 
   - name: openstack/monasca-notification
     template: