From 8e1d64aee8b63b76e60669054bf42cd76406cc04 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 10 Oct 2017 15:51:07 +0200
Subject: [PATCH] Remove infra specific pipelines and enable pipelines

Remove infra-gate and infra-post; remove infra-check everywhere except
for project-config so that we can quickly iterate on it.

Enable the pipelines for all projects.

Move infra-check pipeline after check to have those related pipelines
displayed together.

This partially reverts I084b819ea0a4b67f36df61ccb3bfd6963cc3940d and
reverts Ieced5db4bb8a29eb494dffce3bed030a528f46a1 and
I5646ab81eb1a6515b32c42a2c3c4e64a94be4748.

Depends-On: I738f7c48b8f47e05c95de645a2d3403363204737
Depends-On: I48b14f2d26972cc06ab2293885b37b61c687e83b
Depends-On: Ib325a20839db3fe7884564db2a877ff4edb920e2
Change-Id: I8ed5d777f077b4ebda42c57a5871f38bd1762f88
---
 zuul.d/pipelines.yaml | 60 -------------------------------------------
 zuul.d/projects.yaml  | 47 ++++++++++++---------------------
 2 files changed, 16 insertions(+), 91 deletions(-)

diff --git a/zuul.d/pipelines.yaml b/zuul.d/pipelines.yaml
index dd575c49e4..bbcf174d04 100644
--- a/zuul.d/pipelines.yaml
+++ b/zuul.d/pipelines.yaml
@@ -342,63 +342,3 @@
     ignore-dependencies: true
     precedence: low
     trigger: {}
-
-- pipeline:
-    name: infra-gate
-    description: |
-      Infra-specific pipeline for Changes that have been approved by core
-      developers. Changes are enqueued in order in this pipeline, and if they
-      pass tests, will be merged.
-    success-message: Build succeeded (gate pipeline).
-    failure-message: |
-      Build failed (gate pipeline).  For information on how to proceed, see
-      http://docs.openstack.org/infra/manual/developers.html#automated-testing
-    manager: dependent
-    precedence: high
-    require:
-      gerrit:
-        open: True
-        current-patchset: True
-        approval:
-          - Verified: [1,2]
-            username: zuul
-          - Workflow: 1
-    trigger:
-      gerrit:
-        - event: comment-added
-          approval:
-            - Workflow: 1
-        - event: comment-added
-          approval:
-            - Verified: 1
-          username: zuul
-    start:
-      gerrit:
-        Verified: 0
-    success:
-      gerrit:
-        Verified: 2
-        submit: true
-      mysql:
-    failure:
-      gerrit:
-        Verified: -2
-      mysql:
-    window-floor: 20
-    window-increase-factor: 2
-
-- pipeline:
-    name: infra-post
-    description: |
-      Infra-specific pipeline for running jobs that operate after each change
-      is merged.
-    manager: independent
-    precedence: high
-    trigger:
-      gerrit:
-        - event: ref-updated
-          ref: ^refs/heads/.*$
-    success:
-      mysql:
-    failure:
-      mysql:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index e6afc54eae..9b094551ac 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -764,13 +764,13 @@
     name: openstack-infra/infra-manual
     templates:
       - system-required
-    infra-check:
+    check:
       jobs:
         - build-openstack-sphinx-docs
-    infra-gate:
+    gate:
       jobs:
         - build-openstack-sphinx-docs
-    infra-post:
+    post:
       jobs:
         - publish-infra-manual
 
@@ -778,19 +778,7 @@
     name: openstack-infra/infra-specs
     templates:
       - system-required
-      # TODO(jaegerandi): use the openstack-specs-jobs once we moved
-      # to zuul v3 everywhere:
-      # - openstack-specs-jobs
-    infra-check:
-      jobs:
-        - build-openstack-sphinx-docs
-    infra-gate:
-      jobs:
-        - build-openstack-sphinx-docs
-    infra-post:
-      jobs:
-        - publish-openstack-specs
-
+      - openstack-specs-jobs
 
 - project:
     name: openstack-infra/irc-meetings
@@ -974,13 +962,13 @@
 
 - project:
     name: openstack-infra/openstack-zuul-jobs
-    infra-check:
+    check:
       jobs:
         - build-openstack-sphinx-docs
-    infra-gate:
+    gate:
       jobs:
         - build-openstack-sphinx-docs
-    infra-post:
+    post:
       jobs:
         - publish-openstack-sphinx-docs-infra:
             branches: ^(?!bug/).*$
@@ -1042,6 +1030,8 @@
     name: openstack-infra/project-config
     templates:
       - system-required
+    # This is the only project that use this pipeline so that
+    # we can iterate quickly on changes.
     infra-check:
       jobs:
         - build-openstack-specs-site
@@ -1093,7 +1083,7 @@
               - bindep.txt
               - jenkins/data/bindep-fallback.txt
               - other-requirements.txt
-    infra-gate:
+    gate:
       queue: project-config
       jobs:
         - build-openstack-specs-site
@@ -1140,7 +1130,7 @@
               - bindep.txt
               - jenkins/data/bindep-fallback.txt
               - other-requirements.txt
-    infra-post:
+    post:
       jobs:
         - publish-infra-index
         - publish-openstack-specs-site
@@ -2828,11 +2818,9 @@
 
 - project:
     name: openstack-infra/zuul-jobs
-    # TODO(jaegerandi): Use template again once we do not need the
-    # infra-X pipelines.
-    # templates:
-    #  - publish-openstack-sphinx-docs-infra
-    infra-check:
+    templates:
+      - publish-openstack-sphinx-docs-infra
+    check:
       jobs:
         - base-integration-centos-7
         - base-integration-debian-jessie
@@ -2842,8 +2830,7 @@
         - base-integration-opensuse423
         - tox-linters
         - tox-py35-on-zuul
-        - build-openstack-sphinx-docs
-    infra-gate:
+    gate:
       jobs:
         - base-integration-centos-7
         - base-integration-debian-jessie
@@ -2853,12 +2840,10 @@
         - base-integration-opensuse423
         - tox-linters
         - tox-py35-on-zuul
-        - build-openstack-sphinx-docs
-    infra-post:
+    post:
       jobs:
         - publish-openstack-sphinx-docs-infra:
             branches: ^(?!bug/).*$
-        - build-openstack-sphinx-docs
 
 - project:
     name: openstack-infra/zuul-packaging