Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312312

Change subject: labs: Temporary hack to make git-sync-upstream to work
......................................................................

labs: Temporary hack to make git-sync-upstream to work

Right now it runs as root, and hence the pre-commit-hooks
prevent it from doing its job. Temp fix until we get that
script to run as gitpuppet

Change-Id: Ief15d5840fed0b262406aefa10e080241422e2ff
---
M modules/role/manifests/labs/puppetmaster.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/312312/1

diff --git a/modules/role/manifests/labs/puppetmaster.pp 
b/modules/role/manifests/labs/puppetmaster.pp
index 732cc94..44c998e 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -20,7 +20,9 @@
 
     class { 'role::puppetmaster::standalone':
         autosign            => true,
-        prevent_cherrypicks => true,
+        # FIXME: Temporarily set to false until we make git-sync-upstream
+        # work as non-root.
+        prevent_cherrypicks => false,
         allow_from          => $allow_from,
         git_sync_minutes    => '1',
         use_enc             => $use_enc,

-- 
To view, visit https://gerrit.wikimedia.org/r/312312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief15d5840fed0b262406aefa10e080241422e2ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to