Matanya has uploaded a new change for review.

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


Change subject: Fundrising: removed non-WMF jenkins.
......................................................................

Fundrising: removed non-WMF jenkins.

The Fundrising should be using the jenkins from WMF apt repo.

Change-Id: Ib9cf4f6da88cd78ecfcd9878bc5ba5d5ab9ed632
---
M manifests/misc/fundraising.pp
1 file changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/86818/1

diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index f53eef5..2b856fd 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -354,23 +354,6 @@
 
        system_role { 'misc::fundraising::jenkins': description => 'fundraising 
jenkins server' }
 
-       # FIXME: remove and use Jenkins from the WMF repository
-       exec {
-               'jenkins-apt-repo-key':
-                       unless => '/bin/grep "deb 
http://pkg.jenkins-ci.org/debian-stable binary/" /etc/apt/sources.list.d/*',
-                       command => '/usr/bin/wget -q -O - 
http://pkg.jenkins-ci.org/debian-stable/jenkins-ci.org.key | /usr/bin/apt-key 
add -';
-
-               'jenkins-apt-repo-add':
-                       subscribe => Exec['jenkins-apt-repo-key'],
-                       refreshonly => true,
-                       command => '/bin/echo "deb 
http://pkg.jenkins-ci.org/debian-stable binary/" > 
/etc/apt/sources.list.d/jenkins.list';
-
-               'do-an-apt-get-update':
-                       subscribe => Exec['jenkins-apt-repo-add'],
-                       refreshonly => true,
-                       command => '/usr/bin/apt-get update';
-       }
-
        package { jenkins:
                ensure => latest;
        }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9cf4f6da88cd78ecfcd9878bc5ba5d5ab9ed632
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <matanya.mo...@gmail.com>

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

Reply via email to