Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356243 )
Change subject: jenkins: Install java 8 on stretch and greater
......................................................................
jenkins: Install java 8 on stretch and greater
If on stretch or greater, set Java version to 8, otherwise
keep installing version 7 as before.
Bug: T166611
Bug: T162828
Change-Id: If6a134bbaa3bb879a11921b6c667932c198da9a2
---
M modules/jenkins/manifests/slave/requisites.pp
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/jenkins/manifests/slave/requisites.pp
b/modules/jenkins/manifests/slave/requisites.pp
index 172e1fe..9eea8a1 100644
--- a/modules/jenkins/manifests/slave/requisites.pp
+++ b/modules/jenkins/manifests/slave/requisites.pp
@@ -4,6 +4,13 @@
#
class jenkins::slave::requisites() {
- ensure_packages(['openjdk-7-jre-headless'])
+ if os_version('debian >= stretch') {
+ $jdk_version = '8'
+ } else {
+ $jdk_version = '7'
+ }
+ $jdk_package = "openjdk-${jdk_version}-jre-headless"
+
+ ensure_packages($jdk_package)
}
--
To view, visit https://gerrit.wikimedia.org/r/356243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If6a134bbaa3bb879a11921b6c667932c198da9a2
Gerrit-PatchSet: 13
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
