Hashar has uploaded a new change for review.

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

Change subject: contint: drop pip obsolete download-cache option
......................................................................

contint: drop pip obsolete download-cache option

The pip setting install.download-cache is deprecated. Pip nowadays
managed the cache automatically under the user homedir.

Make sure the pip.conf is removed.

Change-Id: I2cee18281ceec94e87c19c399c476a43283ed310
---
M manifests/role/ci.pp
D modules/contint/files/pip-labs-slaves.conf
2 files changed, 1 insertion(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/226730/1

diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 15f5e0b..8762e39 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -290,18 +290,8 @@
         require => File['/mnt/home/jenkins-deploy'],
     }
 
-    file { '/mnt/home/jenkins-deploy/.pip':
-        ensure => directory,
-        owner  => 'jenkins-deploy',
-        group  => 'wikidev',
-        mode   => '0775',
-    }
     file { '/mnt/home/jenkins-deploy/.pip/pip.conf':
-        ensure => present,
-        owner  => 'jenkins-deploy',
-        group  => 'wikidev',
-        mode   => '0775',
-        source => 'puppet:///modules/contint/pip-labs-slaves.conf',
+        ensure => absent,
     }
 
     git::userconfig { '.gitconfig for jenkins-deploy user':
diff --git a/modules/contint/files/pip-labs-slaves.conf 
b/modules/contint/files/pip-labs-slaves.conf
deleted file mode 100644
index 3335c09..0000000
--- a/modules/contint/files/pip-labs-slaves.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is managed by puppet
-# file:///contint/pip-labs-slaves.conf
-
-# Configure a shared cache to speedup dependencies
-[install]
-download-cache = ~/cache/pip

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cee18281ceec94e87c19c399c476a43283ed310
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to