From 0646dcc78543d876e92e8079c8146a3c4b9b4bb5 Mon Sep 17 00:00:00 2001
From: Nguyen Hai <nguyentrihai93@gmail.com>
Date: Sat, 18 Aug 2018 14:56:39 +0900
Subject: [PATCH] import zuul job settings from project-config

This is a mechanically generated patch to complete step 1 of moving
the zuul job settings out of project-config and into each project
repository.

Because there will be a separate patch on each branch, the branch
specifiers for branch-specific jobs have been removed.

Because this patch is generated by a script, there may be some
cosmetic changes to the layout of the YAML file(s) as the contents are
normalized.

See the python3-first goal document for details:
https://governance.openstack.org/tc/goals/stein/python3-first.html

Change-Id: I1625aa8becf4b5a4d59c3e0a0ffc1eab490f1881
Story: #2002586
Task: #24311
---
 .zuul.yaml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 483b5f2..0f9af1f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,19 +21,19 @@
         TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/mistral-tempest-plugin'"
         SWIFT_HASH: secrethash
         MYSQL_ROOT_PW: secretdatabase
-        MISTRAL_USE_MOD_WSGI: True
+        MISTRAL_USE_MOD_WSGI: true
         MISTRAL_RPC_IMPLEMENTATION: oslo
       devstack_services:
-        heat: True
-        h-api: True
-        h-api-cfn: True
-        h-api-cw: True
-        h-eng: True
-        s-proxy: True
-        s-object: True
-        s-container: True
-        s-account: True
-        tempest: True
+        heat: true
+        h-api: true
+        h-api-cfn: true
+        h-api-cw: true
+        h-eng: true
+        s-proxy: true
+        s-object: true
+        s-container: true
+        s-account: true
+        tempest: true
       devstack_plugins:
         mistral: https://git.openstack.org/openstack/mistral
         heat: https://git.openstack.org/openstack/heat
@@ -55,9 +55,12 @@
     parent: mistral-devstack-tempest-base
     vars:
       devstack_localrc:
-        MISTRAL_USE_MOD_WSGI: False
+        MISTRAL_USE_MOD_WSGI: false
 
 - project:
+    templates:
+      - check-requirements
+      - tempest-plugin-jobs
     check:
       jobs:
         - mistral-devstack
@@ -67,6 +70,7 @@
             branches: ^(?!stable/newton).*$
         - build-openstack-sphinx-docs
     gate:
+      queue: mistral
       jobs:
         - mistral-devstack
         - mistral-devstack-non-apache