Filippo Giunchedi has submitted this change and it was merged.
Change subject: jenkins: use openjdk-7-jre-headless
......................................................................
jenkins: use openjdk-7-jre-headless
Set java to version 7 by using Debian 'alternatives' system. That would
make Jenkins start using it.
It is not needed on Jenkins slaves since the Java version to use is
configured in Jenkins.
For jobs, the list of JDK to use is configured in the global Jenkins
configuration and does not depends on Debian alternatives system.
Impact:
- have to restart Jenkins on gallium.wikimedia.org and ensure it works
fine after.
Change-Id: I7cb798611b2880bf75037397cb3889cde880ad10
---
M modules/jenkins/manifests/init.pp
M modules/jenkins/manifests/slave/requisites.pp
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index 58d8cef..c55fd9e 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -2,11 +2,20 @@
require jenkins::user
require jenkins::group
+ # We want to run Jenkins under Java 7.
+ ensure_packages(['openjdk-7-jre-headless'])
+
+ alternatives::select { 'java':
+ path => '/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java',
+ require => Package['openjdk-7-jre-headless'],
+ }
+
# 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,
+ ensure => present,
+ require => Package['openjdk-7-jre-headless'],
}
# Graphiz on Jenkins master for the 'job dependency graph' plugin
@@ -82,6 +91,7 @@
group => 'root',
mode => '0444',
source => 'puppet:///modules/jenkins/etc_default_jenkins',
+ require => Package['openjdk-7-jre-headless'],
}
}
diff --git a/modules/jenkins/manifests/slave/requisites.pp
b/modules/jenkins/manifests/slave/requisites.pp
index 8e85be8..1137410 100644
--- a/modules/jenkins/manifests/slave/requisites.pp
+++ b/modules/jenkins/manifests/slave/requisites.pp
@@ -4,8 +4,6 @@
#
class jenkins::slave::requisites() {
- package { 'openjdk-7-jre-headless':
- ensure => present,
- }
+ ensure_packages(['openjdk-7-jre-headless'])
}
--
To view, visit https://gerrit.wikimedia.org/r/153764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cb798611b2880bf75037397cb3889cde880ad10
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
