Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382425 )
Change subject: dib: rely on jenkins::comon Jenkins agent jre
......................................................................
dib: rely on jenkins::comon Jenkins agent jre
Bug: T162828
Depends-On: I7f761484f092e3c04ee6d8069ecbb653248cb85f
Change-Id: I4c52a99e6f05608e1aa8bb7c08272aa1dc7b4b2b
---
M dib/puppet/ciimage.pp
1 file changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/25/382425/1
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index f5d8481..d90e1ba 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -18,7 +18,7 @@
# Jenkins provision jre by itself but it sounds better to have it already in
# the image. T126246.
-include jenkins::slave::requisites
+include jenkins::common
include contint::slave_scripts
include contint::packages::base
@@ -178,12 +178,6 @@
# For mediawiki/extensions/Collection/OfflineContentGenerator/bundler
ensure_packages(['zip', 'unzip'])
-
-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/382425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c52a99e6f05608e1aa8bb7c08272aa1dc7b4b2b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
