From 1dd5d42708a64d5e7fcaf4b3becf20412cafef33 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 30 May 2012 12:16:02 -0400
Subject: [PATCH] Add pypi-mirror to jobs config.

Change-Id: I722e5cbd2446c0837364392e0c5c08a444c2c75f
---
 manifests/site.pp                             | 10 +++
 .../files/projects/openstack/pypi-mirror.yml  | 89 +++++++++++++++++++
 .../files/zuul/layout.yaml                    | 13 ++-
 3 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml

diff --git a/manifests/site.pp b/manifests/site.pp
index d7e532bfa5..ba857bc1eb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -156,6 +156,12 @@ node "review.openstack.org" {
                          name => 'openstack-ci/meetbot',
                          close_pull => 'true'
                          }, {
+                         name => 'openstack-ci/zuul',
+                         close_pull => 'true'
+                         }, {
+                         name => 'openstack-ci/pypi-mirror',
+                         close_pull => 'true'
+                         }, {
                          name => 'openstack/openstack-common',
                          close_pull => 'true'
                          }, {
@@ -170,6 +176,9 @@ node "review.openstack.org" {
                          }, {
                          name => 'openstack/python-cinderclient',
                          close_pull => 'true'
+                         }, {
+                         name => 'openstack/python-swiftclient',
+                         close_pull => 'true'
                          } ],
     upstream_projects => [ {
                          name => 'openstack-ci/gerrit',
@@ -231,6 +240,7 @@ node "jenkins.openstack.org" {
       'keystone',
       'melange',
       'nova',
+      'pypi-mirror',
       'python-cinderclient',
       'python-glanceclient',
       'python-keystoneclient',
diff --git a/modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml b/modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml
new file mode 100644
index 0000000000..75ae74fd6c
--- /dev/null
+++ b/modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml
@@ -0,0 +1,89 @@
+---
+# pyflakes-gate
+modules:
+  - properties
+  - scm
+  - assignednode
+  - builders
+  - publisher_none
+
+main:
+  name: 'gate-pypi-mirror-pyflakes'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'pypi-mirror'
+  disabled: 'false'
+  concurrent: 'true'
+
+parameters:
+  - name: UUID
+    type: string
+    description: Zuul provided key to link builds with Gerrit events
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_CHANGES
+    type: string
+    description: Zuul provided list of dependent changes to merge
+
+notification_endpoints:
+  - protocol: HTTP
+    URL: http://127.0.0.1:8001/jenkins_endpoint
+
+builders:
+  - gerrit_git_prep
+  - pyflakes
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'oneiric'
+
+---
+# merge-gate
+modules:
+  - properties
+  - scm
+  - assignednode
+  - builders
+  - publisher_none
+
+main:
+  name: 'gate-pypi-mirror-merge'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'pypi-mirror'
+  disabled: 'false'
+  concurrent: 'true'
+
+parameters:
+  - name: UUID
+    type: string
+    description: Zuul provided key to link builds with Gerrit events
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_CHANGES
+    type: string
+    description: Zuul provided list of dependent changes to merge
+
+notification_endpoints:
+  - protocol: HTTP
+    URL: http://127.0.0.1:8001/jenkins_endpoint
+
+builders:
+  - gerrit_git_prep
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'oneiric'
+
diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml
index 254c3a9b98..660ac9f348 100644
--- a/modules/openstack-ci-config/files/zuul/layout.yaml
+++ b/modules/openstack-ci-config/files/zuul/layout.yaml
@@ -2,7 +2,7 @@ queue:
   - name: check
     manager: IndependentQueueManager
     trigger:
-      - event: patchset-uploaded
+      - event: patchset-created
     success:
       verified: 1
     failure:
@@ -20,7 +20,9 @@ queue:
       verified: -2
 
 jobs:
-  - name: zuul-merge
+  - name: gate-zuul-merge
+    failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
+  - name: gate-pypi-mirror-merge
     failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
 
 projects:
@@ -33,3 +35,10 @@ projects:
       - gate-zuul-merge:
         - gate-zuul-pep8
         - gate-zuul-pyflakes
+  - name: openstack-ci/pypi-mirror
+    check:
+      - gate-pypi-mirror-merge:
+        - gate-pypi-mirror-pyflakes
+    gate:
+      - gate-pypi-mirror-merge:
+        - gate-pypi-mirror-pyflakes