Hashar has uploaded a new change for review.

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

Change subject: contint: remove obsoletes file { ensure => absent }
......................................................................

contint: remove obsoletes file { ensure => absent }

We had the files removed ages ago. There is no more need to have puppet
to ensure they are absent.

Bug: T146381
Change-Id: Ie9644b299e7f8009f0578b5637fecad5d6c90d06
---
M modules/role/manifests/ci/slave/browsertests.pp
M modules/role/manifests/ci/slave/labs/common.pp
2 files changed, 0 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/312275/1

diff --git a/modules/role/manifests/ci/slave/browsertests.pp 
b/modules/role/manifests/ci/slave/browsertests.pp
index dbc7376..d5df179 100644
--- a/modules/role/manifests/ci/slave/browsertests.pp
+++ b/modules/role/manifests/ci/slave/browsertests.pp
@@ -10,14 +10,6 @@
     include contint::browsertests
 
     # For CirrusSearch testing:
-    file { '/mnt/elasticsearch':
-        ensure => absent,
-    }
-    file { '/var/lib/elasticsearch':
-        ensure  => absent,
-    }
-
-    # For CirrusSearch testing:
     $redis_port = 6379
 
     redis::instance { $redis_port:
diff --git a/modules/role/manifests/ci/slave/labs/common.pp 
b/modules/role/manifests/ci/slave/labs/common.pp
index 8a9971e..4784c40 100644
--- a/modules/role/manifests/ci/slave/labs/common.pp
+++ b/modules/role/manifests/ci/slave/labs/common.pp
@@ -47,11 +47,6 @@
         mode   => '0775',
     }
 
-    # drop settings file with old proxy settings
-    file { '/mnt/home/jenkins-deploy/.m2/settings.xml':
-        ensure => absent
-    }
-
     git::userconfig { '.gitconfig for jenkins-deploy user':
         homedir  => '/mnt/home/jenkins-deploy',
         settings => {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9644b299e7f8009f0578b5637fecad5d6c90d06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>

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

Reply via email to