jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382424 )
Change subject: dib: switch Nodepool Jenkins agent to java 8
......................................................................
dib: switch Nodepool Jenkins agent to java 8
Bug: T162828
Change-Id: I69a383962ea52bc9a6eb46276d3473449a145ef4
---
M dib/puppet/ciimage.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 4c39b95..f5d8481 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -179,7 +179,11 @@
# For mediawiki/extensions/Collection/OfflineContentGenerator/bundler
ensure_packages(['zip', 'unzip'])
-ensure_packages(['openjdk-7-jre-headless'])
+ensure_packages(['openjdk-8-jre-headless'])
+alternatives::select { 'java':
+ path => '/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java',
+ require => Package['openjdk-8-jre-headless'],
+}
# Following should later be included in contint::packages::ops once GeoIP
# is installable.
--
To view, visit https://gerrit.wikimedia.org/r/382424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69a383962ea52bc9a6eb46276d3473449a145ef4
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[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
