[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Silence execs in ores/ores_service roles

2017-09-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361639 )

Change subject: Silence execs in ores/ores_service roles
..


Silence execs in ores/ores_service roles

Fixes some execs resources which ran all the time and spammed
vagrant provision output.

Change-Id: Ia69bb7a55a84f336562a1e389c06089419fa9f61
---
M puppet/modules/ores/manifests/init.pp
M puppet/modules/role/manifests/ores.pp
2 files changed, 6 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Awight: Looks good to me, approved



diff --git a/puppet/modules/ores/manifests/init.pp 
b/puppet/modules/ores/manifests/init.pp
index fa37eb3..08f247e 100644
--- a/puppet/modules/ores/manifests/init.pp
+++ b/puppet/modules/ores/manifests/init.pp
@@ -42,9 +42,10 @@
 #FIXME this should happen as part of normal dependency management but for 
some reason it doesn't
 # pylru probably needs to be fixed in the revscoring pakcage, redis in ores
 exec { 'pip_install_revscoring_dependencies_hack':
-command => "curl 
https://raw.githubusercontent.com/wiki-ai/revscoring/master/requirements.txt | 
${deploy_dir}/bin/pip install pylru redis -r /dev/stdin",
-cwd => $deploy_dir,
-require => Virtualenv::Package['ores'],
+command => "curl 
https://raw.githubusercontent.com/wiki-ai/revscoring/master/requirements.txt | 
${deploy_dir}/bin/pip install pylru redis -r /dev/stdin",
+cwd => $deploy_dir,
+subscribe   => Virtualenv::Package['ores'],
+refreshonly => true,
 }
 $repo_dir = "${deploy_dir}/src/ores"
 
diff --git a/puppet/modules/role/manifests/ores.pp 
b/puppet/modules/role/manifests/ores.pp
index b51b052..8651e0e 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -5,6 +5,7 @@
 #
 class role::ores {
 include ::role::betafeatures
+include ::mysql
 
 mediawiki::extension { 'ORES':
 needs_update => true,
@@ -26,7 +27,7 @@
 
 mediawiki::maintenance { 'check ORES model versions':
 command => '/usr/local/bin/mwscript 
extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki',
-unless  => '/usr/bin/mysql -e "select * from ores_model" wiki | 
/bin/grep -q "damaging"',
+unless  => "/usr/bin/mysql -u root -p${::mysql::root_password} -e 
'select * from ores_model' wiki | /bin/grep -q 'damaging'",
 require => Mediawiki::Extension['ORES'],
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/361639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia69bb7a55a84f336562a1e389c06089419fa9f61
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Silence execs in ores/ores_service roles

2017-06-27 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361639 )

Change subject: Silence execs in ores/ores_service roles
..

Silence execs in ores/ores_service roles

Fixes some execs resources which ran all the time and spammed
vagrant provision output.

Change-Id: Ia69bb7a55a84f336562a1e389c06089419fa9f61
---
M puppet/modules/ores/manifests/init.pp
M puppet/modules/role/manifests/ores.pp
2 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/39/361639/1

diff --git a/puppet/modules/ores/manifests/init.pp 
b/puppet/modules/ores/manifests/init.pp
index fa37eb3..08f247e 100644
--- a/puppet/modules/ores/manifests/init.pp
+++ b/puppet/modules/ores/manifests/init.pp
@@ -42,9 +42,10 @@
 #FIXME this should happen as part of normal dependency management but for 
some reason it doesn't
 # pylru probably needs to be fixed in the revscoring pakcage, redis in ores
 exec { 'pip_install_revscoring_dependencies_hack':
-command => "curl 
https://raw.githubusercontent.com/wiki-ai/revscoring/master/requirements.txt | 
${deploy_dir}/bin/pip install pylru redis -r /dev/stdin",
-cwd => $deploy_dir,
-require => Virtualenv::Package['ores'],
+command => "curl 
https://raw.githubusercontent.com/wiki-ai/revscoring/master/requirements.txt | 
${deploy_dir}/bin/pip install pylru redis -r /dev/stdin",
+cwd => $deploy_dir,
+subscribe   => Virtualenv::Package['ores'],
+refreshonly => true,
 }
 $repo_dir = "${deploy_dir}/src/ores"
 
diff --git a/puppet/modules/role/manifests/ores.pp 
b/puppet/modules/role/manifests/ores.pp
index b51b052..8651e0e 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -5,6 +5,7 @@
 #
 class role::ores {
 include ::role::betafeatures
+include ::mysql
 
 mediawiki::extension { 'ORES':
 needs_update => true,
@@ -26,7 +27,7 @@
 
 mediawiki::maintenance { 'check ORES model versions':
 command => '/usr/local/bin/mwscript 
extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki',
-unless  => '/usr/bin/mysql -e "select * from ores_model" wiki | 
/bin/grep -q "damaging"',
+unless  => "/usr/bin/mysql -u root -p${::mysql::root_password} -e 
'select * from ores_model' wiki | /bin/grep -q 'damaging'",
 require => Mediawiki::Extension['ORES'],
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/361639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia69bb7a55a84f336562a1e389c06089419fa9f61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits