Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397618 )
Change subject: Check out both ores and revscoring as editable modules
......................................................................
Check out both ores and revscoring as editable modules
Bug: T181850
Change-Id: Ifcaa471006a90b8e76118fbb4e91523656ae740d
---
M puppet/modules/ores/manifests/init.pp
1 file changed, 44 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/18/397618/1
diff --git a/puppet/modules/ores/manifests/init.pp
b/puppet/modules/ores/manifests/init.pp
index 0a01fb3..5ea7579 100644
--- a/puppet/modules/ores/manifests/init.pp
+++ b/puppet/modules/ores/manifests/init.pp
@@ -26,31 +26,67 @@
# revscoring
require_package('python3-dev', 'g++', 'gfortran', 'liblapack-dev',
'libopenblas-dev', 'libenchant-dev')
+ file { $deploy_dir:
+ ensure => directory,
+ }
+
# ORES (in a venv as it needs Python 3)
- virtualenv::environment { $deploy_dir:
+ $venv_dir = "${deploy_dir}/venv"
+ virtualenv::environment { $venv_dir:
ensure => present,
owner => $::share_owner,
group => $::share_group,
python => 'python3',
- require => Package['python3-dev', 'g++', 'gfortran', 'liblapack-dev',
'libopenblas-dev', 'libenchant-dev'],
+ require => [
+ Package['python3-dev', 'g++', 'gfortran', 'liblapack-dev',
'libopenblas-dev', 'libenchant-dev'],
+ File[$deploy_dir],
+ ],
+ }
+
+ $src_root = "${deploy_dir}/src"
+ file { $src_root:
+ ensure => directory,
+ }
+ git::clone { 'revscoring':
+ directory => "${src_root}/revscoring",
+ remote => "https://github.com/wiki-ai/revscoring";,
+ require => File[$src_root],
+ }
+ git::clone { 'ores':
+ directory => "${src_root}/ores",
+ remote => "https://github.com/wiki-ai/ores";,
+ require => File[$src_root],
+ }
+
+ virtualenv::package { 'revscoring':
+ package => "${src_root}/revscoring",
+ path => $venv_dir,
+ editable => true,
+ require => [
+ Virtualenv::Environment[$venv_dir],
+ Git::Clone['revscoring'],
+ ],
}
virtualenv::package { 'ores[redis]':
- package => 'git+https://github.com/wiki-ai/ores.git#egg=ores',
- path => $deploy_dir,
+ package => "${src_root}/ores",
+ path => $venv_dir,
editable => true,
- require => Virtualenv::Environment[$deploy_dir],
+ require => [
+ Virtualenv::Environment[$venv_dir],
+ Virtualenv::Package['revscoring'],
+ Git::Clone['ores'],
+ ],
}
- $repo_dir = "${deploy_dir}/src/ores"
apache::reverse_proxy { 'ores':
port => $port,
}
- $cfg_file = "${repo_dir}/config/999-vagrant.yaml"
+ $cfg_file = "${src_root}/ores/config/999-vagrant.yaml"
file { $cfg_file:
ensure => present,
content => template('ores/ores.yaml.erb'),
- require => Virtualenv::Environment[$deploy_dir],
+ require => Virtualenv::Package['ores[redis]'],
}
systemd::service { 'ores-wsgi':
--
To view, visit https://gerrit.wikimedia.org/r/397618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcaa471006a90b8e76118fbb4e91523656ae740d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
