Faidon has submitted this change and it was merged.
Change subject: contint: java definitions are now in the module
......................................................................
contint: java definitions are now in the module
The java {} define a Package['openjdk-7-jre-headless'] which is used
in jenkins::slave. So whenever we apply both ::jenkins and
::jenkins::slave we end up with a duplicate definition of
Package['openjdk-7-jre-headless'].
Change-Id: Ibf8f42541b8792349b9ec35ba91c79c6d8403f97
---
M manifests/misc/contint.pp
M modules/contint/manifests/packages.pp
2 files changed, 11 insertions(+), 6 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 0807496..d2029f7 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -41,12 +41,6 @@
include contint::proxy_jenkins
- # Get several OpenJDK packages including the jdk.
- # (openjdk is the default distribution for the java define.
- # The java define is found in modules/java/manifests/init.pp )
- java { 'java-6-openjdk': version => 6, alternative => true }
- java { 'java-7-openjdk': version => 7, alternative => false }
-
include ::contint::tmpfs
file {
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 084dd93..07a26d6 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -9,6 +9,17 @@
# with android
include generic::packages::ant18
+ # Get several OpenJDK packages including the jdk to build mobile
+ # applications.
+ # (openjdk is the default distribution for the java define.
+ # The java define is found in modules/java/manifests/init.pp )
+ package { 'java-6-openjdk':
+ ensure => present,
+ }
+ package { 'java-7-openjdk':
+ ensure => present,
+ }
+
include generic::packages::maven
# Get perl dependencies so we can lint the wikibugs perl script
--
To view, visit https://gerrit.wikimedia.org/r/63866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf8f42541b8792349b9ec35ba91c79c6d8403f97
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
