Merge "Sort taskflow properly"

jenkins/jobs/projects.yaml

@@ -448,27 +448,6 @@
     jobs:
       - specs-jobs
 
-
-- project:
-    name: taskflow
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-    doc-publisher-site: docs.openstack.org
-
-    jobs:
-      - python-jobs
-      - openstack-publish-jobs
-      - pypi-jobs
-      - gate-{name}-unittests-{envlist}:
-          # NOTE(harlowja): the 'py' prefix will be added on automatically.
-          envlist: "26-sa7-mysql"
-          node: bare-centos6
-      - gate-{name}-unittests-{envlist}:
-          envlist: "27-sa8-mysql"
-      - 'lib-forward-testing-{name}'
-      - 'stable-compat-jobs-{name}'
-
-
 - project:
     name: trove
     tarball-site: tarballs.openstack.org
@@ -1170,6 +1149,25 @@
       - openstack-publish-jobs
       - 'stable-compat-jobs-{name}'
 
+- project:
+    name: taskflow
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - python-jobs
+      - openstack-publish-jobs
+      - pypi-jobs
+      - gate-{name}-unittests-{envlist}:
+          # NOTE(harlowja): the 'py' prefix will be added on automatically.
+          envlist: "26-sa7-mysql"
+          node: bare-centos6
+      - gate-{name}-unittests-{envlist}:
+          envlist: "27-sa8-mysql"
+      - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
+
 ########################################################################
 # Section: Other OpenStack projects
 ########################################################################

zuul/layout.yaml

@@ -1465,25 +1465,6 @@ projects:
       - name: merge-check
       - name: openstack-specs-jobs
 
-  - name: openstack/taskflow
-    template:
-      - name: merge-check
-      - name: python-jobs
-      - name: python3-jobs
-      - name: openstack-server-publish-jobs
-      - name: publish-to-pypi
-      - name: lib-forward-testing
-      - name: stable-compat-jobs
-    check:
-      - gate-taskflow-python26
-      - gate-taskflow-python34
-      - gate-taskflow-unittests-26-sa7-mysql
-      - gate-taskflow-unittests-27-sa8-mysql
-    gate:
-      - gate-taskflow-python26
-      - gate-taskflow-unittests-26-sa7-mysql
-      - gate-taskflow-unittests-27-sa8-mysql
-
   - name: openstack/trove
     template:
       - name: merge-check
@@ -2300,6 +2281,25 @@ projects:
     gate:
       - gate-stevedore-python26
 
+  - name: openstack/taskflow
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: python3-jobs
+      - name: openstack-server-publish-jobs
+      - name: publish-to-pypi
+      - name: lib-forward-testing
+      - name: stable-compat-jobs
+    check:
+      - gate-taskflow-python26
+      - gate-taskflow-python34
+      - gate-taskflow-unittests-26-sa7-mysql
+      - gate-taskflow-unittests-27-sa8-mysql
+    gate:
+      - gate-taskflow-python26
+      - gate-taskflow-unittests-26-sa7-mysql
+      - gate-taskflow-unittests-27-sa8-mysql
+
 ########################################################################
 # Section: Other OpenStack projects
 ########################################################################