Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385169 )
Change subject: Switch use of jenkins for >= stretch to thirdparty/ci
......................................................................
Switch use of jenkins for >= stretch to thirdparty/ci
Starting with stretch, there will no general thirdparty repository,
but it will be split into sections which are installed depending on
the roles.
Switch jenkins to use thirdparty/ci when running on stretch (the
contint servers are currently on jessie, but this applies to jenkins
as used on releases* already)
Change-Id: I4d05f3a15b073acc86ff3518e924517abea1985c
---
M modules/jenkins/manifests/init.pp
1 file changed, 16 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index de27c66..ffd57c5 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -63,12 +63,22 @@
ensure_packages('openjdk-8-jdk')
- # Upgrades are usually done manually by upload the Jenkins
- # package at apt.wikimedia.org then restarting jenkins and
- # double checking everything went fine.
- package { 'jenkins':
- ensure => present,
- require => Package['openjdk-8-jdk'],
+ if os_version('debian >= stretch') {
+ apt::repository { 'jenkins-thirdparty-ci':
+ uri => 'http://apt.wikimedia.org/wikimedia',
+ dist => "${::lsbdistcodename}-wikimedia",
+ components => 'thirdparty/ci',
+ }
+
+ package { 'jenkins':
+ ensure => present,
+ require => [Package['openjdk-8-jdk'],
Apt::Repository['jenkins-thirdparty-ci'], Exec['apt-get update']],
+ }
+ } else {
+ package { 'jenkins':
+ ensure => present,
+ require => Package['openjdk-8-jdk'],
+ }
}
file { '/var/lib/jenkins/.daemonrc':
--
To view, visit https://gerrit.wikimedia.org/r/385169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d05f3a15b073acc86ff3518e924517abea1985c
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
