From 3df4e8b9cadb49318d8084269b027da0828d74c9 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Mon, 24 Jun 2019 13:12:53 -0700
Subject: [PATCH] Move existing Zuul project config to projects.yaml

There was a project stanza in zuul.d/jobs.yaml which was unexpected.
Move it to projects.yaml and combine it with the one just added.

Change-Id: Ie3b2e31833423ae8658861e8cc85300d45882f8e
---
 .zuul.d/jobs.yaml    | 26 --------------------------
 .zuul.d/project.yaml | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 195a9f10..e7a23dad 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -1,29 +1,3 @@
-- project:
-    templates:
-      - openstack-lower-constraints-jobs
-      - tripleo-buildimage-jobs
-    check:
-      jobs:
-        - dib-functests-centos7-python2
-        - dib-functests-centos7-python2-image
-        - dib-functests-centos7-python2-extras
-        - dib-functests-trusty-python2
-        - dib-functests-trusty-python2-image
-        - dib-functests-trusty-python2-extras
-        - dib-functests-xenial-python3
-        - dib-functests-xenial-python3-image
-        - dib-functests-xenial-python3-extras
-        - dib-functests-xenial-python3-containers
-        - dib-functests-bionic-python3
-        - dib-functests-bionic-python3-image
-        - dib-functests-bionic-python3-extras
-        - dib-functests-bionic-python3-containers
-    gate:
-      jobs:
-        - dib-functests-trusty-python2
-        - dib-functests-xenial-python3
-        - dib-functests-centos7-python2
-
 - job:
     name: dib-functests-base
     abstract: true
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index e308ca61..10d7bbe2 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -2,19 +2,38 @@
     templates:
       - openstack-cover-jobs
       - check-requirements
+      - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python35-jobs
       - release-notes-jobs
+      - tripleo-buildimage-jobs
     check:
       jobs:
         - openstack-tox-pylint
         - nodepool-functional-py35-redhat-src
         - nodepool-functional-py35-ubuntu-src
+        - dib-functests-centos7-python2
+        - dib-functests-centos7-python2-image
+        - dib-functests-centos7-python2-extras
+        - dib-functests-trusty-python2
+        - dib-functests-trusty-python2-image
+        - dib-functests-trusty-python2-extras
+        - dib-functests-xenial-python3
+        - dib-functests-xenial-python3-image
+        - dib-functests-xenial-python3-extras
+        - dib-functests-xenial-python3-containers
+        - dib-functests-bionic-python3
+        - dib-functests-bionic-python3-image
+        - dib-functests-bionic-python3-extras
+        - dib-functests-bionic-python3-containers
     gate:
       jobs:
         - openstack-tox-pylint
         - nodepool-functional-py35-redhat-src
         - nodepool-functional-py35-ubuntu-src
+        - dib-functests-trusty-python2
+        - dib-functests-xenial-python3
+        - dib-functests-centos7-python2
     experimental:
       jobs:
         - nodepool-functional-py35-gentoo-src