Andrew Bogott has submitted this change and it was merged.
Change subject: Move android::sdk and packages::ant18 into contint module.
......................................................................
Move android::sdk and packages::ant18 into contint module.
Change-Id: I5397ef0b5fd2a50d07c6fba5493568c5947bbda4
---
M manifests/generic-definitions.pp
M manifests/misc/contint.pp
M manifests/site.pp
A modules/contint/manifests/android-sdk.pp
M modules/contint/manifests/packages.pp
5 files changed, 49 insertions(+), 46 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 23b3590..a732169 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -74,26 +74,3 @@
}
}
-
-class generic::packages::ant18 {
-
- if ($::lsbdistcodename == "lucid") {
- # When specifying 'latest' for package 'ant' on Lucid it will
actually
- # install ant1.7 which might not be the version we want. This
is similar to
- # the various gcc version packaged in Debian, albeit ant1.7 and
ant1.8 are
- # conflicting with each others.
- # Thus, this let us explicitly install ant version 1.8
- package { [
- "ant1.8"
- ]: ensure => installed;
- }
- package { [
- "ant",
- "ant1.7"
- ]: ensure => absent;
- }
- } else {
- # Ubuntu post Lucid ship by default with ant 1.8 or later
- package { ["ant"]: ensure => installed; }
- }
-}
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index ea902f3..edd53f7 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -1,27 +1,6 @@
# vim: set ts=2 sw=2 et :
# continuous integration (CI)
-class misc::contint::android::sdk {
- # Class installing prerequisites to the Android SDK
- # The SDK itself need to be installed manually for now.
- #
- # Help link: http://developer.android.com/sdk/installing.html
-
- include generic::packages::ant18
-
- # 32bit libs needed by Android SDK
- # ..but NOT just all of ia32-libs ..
- package { [
- 'libstdc++6:i386',
- 'libgcc1:i386',
- 'zlib1g:i386',
- 'libncurses5:i386',
- 'libsdl1.2debian:i386',
- 'libswt-gtk-3.5-java'
- ]: ensure => installed;
- }
-}
-
# CI test server as per RT #1204
class misc::contint::test {
diff --git a/manifests/site.pp b/manifests/site.pp
index 1247f5f..7e7c036 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1091,7 +1091,7 @@
contint::firewall,
misc::contint::test, # Setup iptables rules
misc::contint::test::jenkins, # FIXME slave scripts
- misc::contint::android::sdk,
+ contint::android-sdk,
role::ci::master,
role::ci::slave,
role::ci::testswarm,
diff --git a/modules/contint/manifests/android-sdk.pp
b/modules/contint/manifests/android-sdk.pp
new file mode 100644
index 0000000..681dde3
--- /dev/null
+++ b/modules/contint/manifests/android-sdk.pp
@@ -0,0 +1,23 @@
+# vim: set ts=2 sw=2 et :
+# continuous integration (CI)
+
+class contint::android-sdk {
+ # Class installing prerequisites to the Android SDK
+ # The SDK itself need to be installed manually for now.
+ #
+ # Help link: http://developer.android.com/sdk/installing.html
+
+ include contint::packages::ant18
+
+ # 32bit libs needed by Android SDK
+ # ..but NOT just all of ia32-libs ..
+ package { [
+ 'libstdc++6:i386',
+ 'libgcc1:i386',
+ 'zlib1g:i386',
+ 'libncurses5:i386',
+ 'libsdl1.2debian:i386',
+ 'libswt-gtk-3.5-java'
+ ]: ensure => installed;
+ }
+}
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 069241a..81782dd 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -7,7 +7,7 @@
# Make sure we use ant version 1.8 or we will have a conflict
# with android
- include generic::packages::ant18
+ include contint::packages::ant18
# Get several OpenJDK packages including the jdk to build mobile
# applications.
@@ -172,3 +172,27 @@
ensure => present;
}
}
+
+
+class contint::packages::ant18 {
+
+ if ($::lsbdistcodename == "lucid") {
+ # When specifying 'latest' for package 'ant' on Lucid it will
actually
+ # install ant1.7 which might not be the version we want. This
is similar to
+ # the various gcc version packaged in Debian, albeit ant1.7 and
ant1.8 are
+ # conflicting with each others.
+ # Thus, this let us explicitly install ant version 1.8
+ package { [
+ "ant1.8"
+ ]: ensure => installed;
+ }
+ package { [
+ "ant",
+ "ant1.7"
+ ]: ensure => absent;
+ }
+ } else {
+ # Ubuntu post Lucid ship by default with ant 1.8 or later
+ package { ["ant"]: ensure => installed; }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/94257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5397ef0b5fd2a50d07c6fba5493568c5947bbda4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
