From 69cdb6a44996e524b731ebe48f172b6c6e4072f5 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 6 Oct 2013 13:41:53 -0400
Subject: [PATCH] Update projects.yaml for new upstream tracking

jeepyb gets a new upstream tracking syntax in
https://review.openstack.org/#/c/35535/

Switch to use it.

The new syntax will operate via git push, so that changes to upstream
can trigger zuul events.

Change-Id: Ideca999aca0e8583cce9a1227089243216175158
---
 doc/source/jeepyb.rst                                 | 11 ++++++-----
 modules/gerrit/manifests/remotes.pp                   | 10 ++++++++--
 modules/openstack_project/files/zuul/layout.yaml      |  4 ++++
 .../templates/review.projects.yaml.erb                |  5 ++++-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/doc/source/jeepyb.rst b/doc/source/jeepyb.rst
index 55ac7c0f98..441f938a33 100644
--- a/doc/source/jeepyb.rst
+++ b/doc/source/jeepyb.rst
@@ -178,12 +178,13 @@ that periodically marks reviews that have seen little activity as
 `Abandoned`.  Their owners may use the Gerrit interface to restore
 them when they are ready for further review.
 
-Fetching Remotes
-----------------
+Manage Projects
+---------------
 
-Some projects may have remotes defined in Jeepyb; the
-``fetch-remotes`` cron job will update these remotes so that their
-commits are available in Gerrit.
+Some projects may have upstreams defined in Jeepyb; the
+``manage-projects`` cron job will update these remotes so that their
+commits are available in Gerrit. It will also ensure that project metadata
+is set up as defined in projects.yaml.
 
 RSS feeds
 ---------
diff --git a/modules/gerrit/manifests/remotes.pp b/modules/gerrit/manifests/remotes.pp
index 9637f0b88b..43c426bda1 100644
--- a/modules/gerrit/manifests/remotes.pp
+++ b/modules/gerrit/manifests/remotes.pp
@@ -5,8 +5,14 @@ class gerrit::remotes($ensure=present) {
       ensure  => $ensure,
       user    => 'gerrit2',
       minute  => '*/30',
-      command => 'sleep $((RANDOM\%60+90)) && /usr/local/bin/fetch-remotes',
-      require => Class['jeepyb'],
+      command => 'sleep $((RANDOM\%60+90)) && /usr/local/bin/manage-projects',
+      require => [Class['jeepyb'], File['/var/lib/jeepyb']],
+    }
+
+    file { '/var/lib/jeepyb':
+      ensure  => directory,
+      owner   => 'gerrit2',
+      require => User['gerrit2'],
     }
 
     file { '/home/gerrit2/remotes.config':
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 74a110720c..d91c2bfc38 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -170,6 +170,10 @@ jobs:
     voting: false
   - name: check-tempest-devstack-vm-cells-full-stable-havana
     voting: false
+  - name: ^(gate|check)-gerrit-unittests$
+    branch: ^openstack/.*$
+  - name: gerrit-package
+    branch: ^openstack/.*$
   - name: gate-nova-pylint
     voting: false
   - name: gate-cinder-pylint
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 7a37082413..2b09dba16d 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -47,7 +47,10 @@
   description: The jenkins gearman plugin
 - project: openstack-infra/gerrit
   description: Fork of Gerrit used by OpenStack
-  remote: https://gerrit.googlesource.com/gerrit
+  upstream: https://gerrit.googlesource.com/gerrit
+  upstream-prefix: upstream
+  options:
+    - track-upstream
 - project: openstack-infra/gerritbot
 - project: openstack-infra/gerritlib
 - project: openstack-infra/git-review