Mark Bergsma has submitted this change and it was merged. Change subject: rewrite beta autoupdater in python ......................................................................
rewrite beta autoupdater in python Should be invoked by the mwdeploy user with '--verbose'. The old shell script is still around to let me handle the migration asynchronously. Change-Id: Ia1ec567790f5ed6806ace511fd1d8fd8a00202a6 --- A files/misc/beta/wmf-beta-autoupdate.py M manifests/misc/beta.pp 2 files changed, 142 insertions(+), 1 deletion(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/files/misc/beta/wmf-beta-autoupdate.py b/files/misc/beta/wmf-beta-autoupdate.py new file mode 100755 index 0000000..bf684d6 --- /dev/null +++ b/files/misc/beta/wmf-beta-autoupdate.py @@ -0,0 +1,132 @@ +#!/usr/bin/env python +####################################################################### +# WARNING: this file is managed by Puppet +# puppet:///files/misc/beta/wmf-beta-autoupdate.py +####################################################################### + +""" +Updates MediaWiki core and extensions on the Beta cluster + +MUST be run as the `mwdeploy` user although that is not enforced by the script. +""" + +import argparse +import logging +import subprocess +import sys + +PATH_MWCORE = '/home/wikipedia/common/php-master' +PATH_MWEXT = '/home/wikipedia/common/php-master/extensions' + + +def main(): + """ + Entry point for the script. + + Parse script arguments, initialize the logger withnice colors and trigger + the updating tasks. + + Returns 0 on success of ALL tasks, 1 otherwise + """ + # Parse arguments, init logger to use some colors + + options = parse_args() + logging.basicConfig(level=options.log_level) + # Color codes http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x329.html + logging.addLevelName( + logging.DEBUG, "\033[0;37m%s\033[1;m" % + logging.getLevelName(logging.DEBUG)) + logging.addLevelName( + logging.INFO, "\033[1;33m%s\033[1;m" % + logging.getLevelName(logging.INFO)) + logging.addLevelName( + logging.WARNING, "\033[1;31m%s\033[1;m" % + logging.getLevelName(logging.WARNING)) + logging.addLevelName( + logging.ERROR, "\033[1;41m%s\033[1;m" % + logging.getLevelName(logging.ERROR)) + + logger = logging.getLogger('main') + logger.info("Starting updating tasks...") + exit_codes = [ + pull_mediawiki(), + pull_extensions(), + update_extensions(), + update_l10n(), + ] + logger.info("Executions completed %s", exit_codes) + + final_exit = 0 + for code in exit_codes: + if code is not 0: + final_exit = 1 + break + + logger.info("Final exit code: %s", final_exit) + return final_exit + + +def parse_args(): + """Parse command line arguments using argparse""" + + parser = argparse.ArgumentParser(description=__doc__) + + log_options = parser.add_mutually_exclusive_group() + log_options.add_argument( + '--debug', dest='log_level', + action='store_const', const=logging.DEBUG, + help='Print out internal processing') + log_options.add_argument( + '-v', '--verbose', '--info', dest='log_level', + action='store_const', const=logging.INFO, + help='Give a bit more information about what is going on') + log_options.add_argument( + '-q', '--quiet', dest='log_level', + action='store_const', const=logging.WARNING, + help='Only shows up warning and errors') + + return parser.parse_args() + + +def pull_mediawiki(): + """Updates MediaWiki core""" + return runner(name='mwcore', path=PATH_MWCORE, cmd=['git', 'pull']) + + +def pull_extensions(): + """Pull MediaWiki extensions repository""" + return runner(name='mwextpull', path=PATH_MWEXT, cmd=['git', 'pull']) + + +def update_extensions(): + """Registers and updates MediaWiki extensions submodules""" + return runner(name='mwext', path=PATH_MWEXT, cmd=[ + 'git', 'submodule', 'update', '--init', '--recursive']) + + +def update_l10n(): + """Localisation cache update""" + return runner(name='mw-update-l10n', cmd=['mw-update-l10n']) + + +def runner(cmd, path=None, name=None): + """Wrapper around subprocess.Popen with logging output""" + log_target = name if name else 'runner' + logger = logging.getLogger(log_target) + + try: + if path: + logger.info("cwd: %s", path) + logger.info("running: %s", ' '.join(cmd)) + + cmd = subprocess.Popen(args=cmd, cwd=path) + exit_code = cmd.wait() + logger.info("Exit code: %s", exit_code) + except OSError, exception: + logger.error(exception) + return False + + return exit_code + +if __name__ == '__main__': + sys.exit(main()) diff --git a/manifests/misc/beta.pp b/manifests/misc/beta.pp index 24ea713..66d45d7 100644 --- a/manifests/misc/beta.pp +++ b/manifests/misc/beta.pp @@ -3,15 +3,24 @@ require misc::deployment::common_scripts file { + # Shell version, FIXME need to be removed "/usr/local/bin/wmf-beta-autoupdate": owner => root, group => root, mode => 0555, require => [ - #File["/usr/local/bin/mw-update-l10n"], Package["git-core"], ], source => "puppet:///files/misc/beta/wmf-beta-autoupdate"; + # Python rewrite + "/usr/local/bin/wmf-beta-autoupdate.py": + owner => root, + group => root, + mode => 0555, + require => [ + Package['git-core'], + ], + source => 'puppet:///files/misc/beta/wmf-beta-autoupdate.py'; "/etc/default/wmf-beta-autoupdate": ensure => absent; "/etc/init/wmf-beta-autoupdate.conf": -- To view, visit https://gerrit.wikimedia.org/r/76897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1ec567790f5ed6806ace511fd1d8fd8a00202a6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
