[MediaWiki-commits] [Gerrit] Add Taxonomy cron job - change (labs...wikibugs2)

2015-01-12 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Add Taxonomy cron job
..


Add Taxonomy cron job

Bug: T85096
Change-Id: I7a176c915b97c1f84f9e983e5ee7601863dc1093
---
M fabfile.py
1 file changed, 19 insertions(+), 3 deletions(-)

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



diff --git a/fabfile.py b/fabfile.py
index 5d8dd33..12afa70 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,14 +1,18 @@
+from io import StringIO
 from fabric.api import *  # noqa
 from fabric.contrib.console import confirm
 
+tool_name = 'wikibugs'
+
 env.hosts = ['tools-login.wmflabs.org']
-env.sudo_user = 'tools.wikibugs'
+env.sudo_user = 'tools.{}'.format(tool_name)
 env.sudo_prefix = 'sudo -ni '
 env.use_ssh_config = True
 
-code_dir = '/data/project/wikibugs/wikibugs2'
+home_dir = '/data/project/{}'.format(tool_name)
+code_dir = '{}/wikibugs2'.format(home_dir)
+python = '{}/py-wikibugs2/bin/python'.format(home_dir)
 
-python = '/data/project/wikibugs/py-wikibugs2/bin/python'
 jobs = {
 'wb2-phab': '{python} {code_dir}/wikibugs.py',
 'wb2-irc': '{python} {code_dir}/redis2irc.py',
@@ -28,6 +32,18 @@
 sudo('git pull')
 
 
+@task
+def crontab():
+with cd(home_dir):
+contents = StringIO(u# This crontab was auto-generated by Fabric
+#m   h   dom mon dow cmd
+ 0   0   *   *   0   /usr/bin/jsub -N taxonomy -mem 512m -once {python} 
{code_dir}/taxonomy.py  /dev/null
+.format(**globals())
+)
+put(contents, 'crontab', mode=0o664)
+sudo('crontab crontab')
+
+
 def start_job(name):
 # string formatting as fab doesn't get list-style commands...
 sudo('jstart -N {name} -l release=trusty -mem 1G -once {command}'.format(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a176c915b97c1f84f9e983e5ee7601863dc1093
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Add Taxonomy cron job - change (labs...wikibugs2)

2015-01-10 Thread Merlijn van Deen (Code Review)
Merlijn van Deen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/184128

Change subject: Add Taxonomy cron job
..

Add Taxonomy cron job

Bug: T85096
Change-Id: I7a176c915b97c1f84f9e983e5ee7601863dc1093
---
M fabfile.py
1 file changed, 20 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/28/184128/1

diff --git a/fabfile.py b/fabfile.py
index 5d8dd33..f582cca 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,14 +1,18 @@
+from io import StringIO
 from fabric.api import *  # noqa
 from fabric.contrib.console import confirm
 
+tool_name = 'wikibugs'
+
 env.hosts = ['tools-login.wmflabs.org']
-env.sudo_user = 'tools.wikibugs'
+env.sudo_user = 'tools.{}'.format(tool_name)
 env.sudo_prefix = 'sudo -ni '
 env.use_ssh_config = True
 
-code_dir = '/data/project/wikibugs/wikibugs2'
+home_dir = '/data/project/{}'.format(tool_name)
+code_dir = '{}/wikibugs2'.format(home_dir)
+python = '{}/py-wikibugs2/bin/python'.format(home_dir)
 
-python = '/data/project/wikibugs/py-wikibugs2/bin/python'
 jobs = {
 'wb2-phab': '{python} {code_dir}/wikibugs.py',
 'wb2-irc': '{python} {code_dir}/redis2irc.py',
@@ -28,6 +32,19 @@
 sudo('git pull')
 
 
+@task
+def crontab():
+with cd(home_dir):
+contents = StringIO(
+u# This crontab was auto-generated by Fabric
+#m   h   dom mon dow cmd
+ 0   0   *   *   0   /usr/bin/jsub -N taxonomy -mem 512m -once {python} 
{code_dir}/taxonomy.py  /dev/null
+.format(**globals())
+)
+put(contents, 'crontab', mode=0o664)
+sudo('crontab crontab')
+
+
 def start_job(name):
 # string formatting as fab doesn't get list-style commands...
 sudo('jstart -N {name} -l release=trusty -mem 1G -once {command}'.format(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a176c915b97c1f84f9e983e5ee7601863dc1093
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl

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