Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Get rid of deprecated HHVM module
......................................................................
Get rid of deprecated HHVM module
This module set up a test environment with Facebook's HHVM packages and the
build dependencies for compiling HHVM locally. We used it to set up osmium, but
it has no further value.
Change-Id: Ia9ed63297956fe22adc02a49da5f96b471293b16
---
M modules/contint/manifests/packages/labs.pp
D modules/hhvm/manifests/backports.pp
D modules/hhvm/manifests/dev.pp
D modules/hhvm/manifests/init.pp
4 files changed, 0 insertions(+), 102 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index 357191d..9be9714 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -67,9 +67,6 @@
]: ensure => present,
}
- # Facebook Hiphop virtual machine
- include ::hhvm
-
# Bring tox/virtualenv... from pip bug 44443
# TODO: Reevaluate this once we switch to trusty. Maybe provider being apt
# would be better then
diff --git a/modules/hhvm/manifests/backports.pp
b/modules/hhvm/manifests/backports.pp
deleted file mode 100644
index ee552b7..0000000
--- a/modules/hhvm/manifests/backports.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# == Class hhvm::backports
-#
-# Recent hhvm versions requires liboost 1.0.49 which is not shipped by
-# Ubuntu Precise. We rely on a third-party PPA.
-#
-# Can only be applied on Labs.
-#
-# You most probably want to use the 'hhvm' puppet class instead.
-class hhvm::backports {
- if $::realm != 'labs' {
- fail( 'hhvm::backports may only be deployed to Labs.' )
- }
-
- apt::repository { 'boost_backports':
- uri => 'http://ppa.launchpad.net/mapnik/boost/ubuntu',
- dist => 'precise',
- components => 'main',
- keyfile => 'puppet:///files/misc/boost-backports.key',
- }
-}
diff --git a/modules/hhvm/manifests/dev.pp b/modules/hhvm/manifests/dev.pp
deleted file mode 100644
index 114e086..0000000
--- a/modules/hhvm/manifests/dev.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-# == Class: hhvm::dev
-#
-# Builds Wikimedia's fork of HHVM, for testing HHVM in production.
-#
-class hhvm::dev {
- $build_deps = [
- 'autoconf', 'automake', 'binutils-dev', 'build-essential', 'cmake',
- 'g++', 'git', 'libboost-dev', 'libboost-filesystem-dev',
- 'libboost-program-options-dev', 'libboost-regex-dev',
- 'libboost-system-dev', 'libboost-thread-dev', 'libbz2-dev',
- 'libc-client-dev', 'libc-client2007e-dev', 'libcap-dev',
- 'libcurl4-openssl-dev', 'libdwarf-dev', 'libelf-dev', 'libexpat-dev',
- 'libgd2-xpm-dev', 'libgoogle-glog-dev', 'libgoogle-perftools-dev',
- 'libicu-dev', 'libjemalloc-dev', 'libmcrypt-dev', 'libmemcached-dev',
- 'libmysqlclient-dev', 'libncurses-dev', 'libonig-dev', 'libpcre3-dev',
- 'libreadline-dev', 'libtbb-dev', 'libtool', 'libxml2-dev',
'zlib1g-dev',
- 'libevent-dev', 'libmagickwand-dev', 'libinotifytools0-dev',
- 'libiconv-hook-dev', 'libedit-dev', 'libiberty-dev', 'libxslt1-dev',
- 'ocaml-native-compilers'
- ]
-
- package { $build_deps:
- ensure => present,
- before => Git::Clone['operations/software/hhvm-dev'],
- }
-
- git::clone { 'operations/software/hhvm-dev':
- directory => '/srv/hhvm-dev',
- branch => 'master',
- owner => 'mwdeploy',
- group => 'mwdeploy',
- recurse_submodules => true,
- }
-
- git::clone { 'mediawiki/php/luasandbox':
- directory => '/srv/luasandbox',
- branch => 'master',
- owner => 'mwdeploy',
- group => 'mwdeploy',
- recurse_submodules => true,
- }
-
- git::clone { 'mediawiki/php/FastStringSearch':
- directory => '/srv/fss',
- branch => 'master',
- owner => 'mwdeploy',
- group => 'mwdeploy',
- recurse_submodules => true,
- }
-
- package { 'libthai-dev': } # dependency for building wikidiff2
-
- git::clone { 'mediawiki/php/wikidiff2':
- directory => '/srv/wikidiff2',
- branch => 'master',
- owner => 'mwdeploy',
- group => 'mwdeploy',
- recurse_submodules => true,
- }
-}
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
deleted file mode 100644
index 83a9246..0000000
--- a/modules/hhvm/manifests/init.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# == Class hhvm
-#
-# Install hhvm and its dependencies.
-#
-# Can only be applied on Labs.
-#
-class hhvm {
- if $::realm != 'labs' {
- fail( 'hhvm may only be deployed to Labs.' )
- }
-
- include hhvm::backports
-
- package { 'hhvm':
- ensure => present,
- require => Class['hhvm::backports'],
- }
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/147833
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9ed63297956fe22adc02a49da5f96b471293b16
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
