From a4d235ea0062778caf066294832a15264fc8f1dd Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 23 Aug 2016 17:19:52 +0000
Subject: [PATCH] Update zuul-env on job nodes

Improve the zuul-env handling in openstack_project::slave_common to
rely on a Vcsrepo source and update whenever it changes. This allows
us to increase the version of Zuul installed in the virtualenv over
time on persistent job nodes.

Change-Id: If07b31f3a735cf7bcf6bfb8591ed37577f5ae201
---
 .../openstack_project/files/zuul-env-reqs.txt |  1 -
 .../manifests/slave_common.pp                 | 20 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 modules/openstack_project/files/zuul-env-reqs.txt

diff --git a/modules/openstack_project/files/zuul-env-reqs.txt b/modules/openstack_project/files/zuul-env-reqs.txt
deleted file mode 100644
index 3faadb4e6e..0000000000
--- a/modules/openstack_project/files/zuul-env-reqs.txt
+++ /dev/null
@@ -1 +0,0 @@
--e git+https://git.openstack.org/openstack-infra/zuul#egg=zuul
diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp
index fdc1557f24..1a20e6dce6 100644
--- a/modules/openstack_project/manifests/slave_common.pp
+++ b/modules/openstack_project/manifests/slave_common.pp
@@ -144,20 +144,24 @@ class openstack_project::slave_common(
     }
   }
 
-  file { '/etc/zuul-env-reqs.txt':
-    ensure => present,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0444',
-    source => 'puppet:///modules/openstack_project/zuul-env-reqs.txt',
+  vcsrepo { '/opt/zuul':
+    ensure   => latest,
+    provider => git,
+    revision => 'master',
+    source   => 'https://git.openstack.org/openstack-infra/zuul.git',
   }
 
   python::virtualenv { '/usr/zuul-env':
     ensure       => present,
-    requirements => '/etc/zuul-env-reqs.txt',
     owner        => 'root',
     group        => 'root',
     timeout      => 0,
-    require      => File['/etc/zuul-env-reqs.txt'],
+  }
+
+  exec { 'zuul-env-update':
+    command     => '/usr/zuul-env/bin/pip --log /usr/zuul-env/pip.log install /opt/zuul',
+    refreshonly => true,
+    subscribe   => Vcsrepo['/opt/zuul'],
+    require     => Python::Virtualenv['/usr/zuul-env'],
   }
 }