Compilation results for deployment-deploy04.deployment-prep.eqiad1.wikimedia.cloud: System changes detected

You can retrieve this result from host.json.

Catalog differences

Summary

Total Resources:	2360
Resources added:	38
Resources removed:	0
Resources modified:	42
Change percentage:	3.39%

Resources only in the new catalog

File[/srv/beta-update-logs]
Exec[systemd daemon-reload for wmf-beta-update-all.service (wmf-beta-update-all.service)]
File[/etc/rsyslog.d/40-wmf-beta-update-all.conf]
Systemd::Service[beta-autoupdater-prune-stale-logs]
Systemd::Unit[beta-autoupdater-prune-stale-logs.timer]
File[/var/log/wmf-beta-update-all]
File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.service]
Systemd::Timer[wmf-beta-update-all]
File[/etc/rsyslog.d/40-beta-autoupdater-prune-stale-logs.conf]
File[/lib/systemd/system/wmf-beta-update-all.service]
Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.service (beta-autoupdater-prune-stale-logs.service)]
Service[beta-autoupdater-prune-stale-logs.timer]
Systemd::Syslog[wmf-beta-update-all]
File[/etc/logrotate.d/beta-autoupdater-prune-stale-logs]
Service[wmf-beta-update-all.timer]
Systemd::Unit[wmf-beta-update-all.timer]
File[/lib/systemd/system/wmf-beta-update-all.timer]
Exec[systemd daemon-reload for wmf-beta-update-all.timer (wmf-beta-update-all.timer)]
File[/etc/apache2/sites-available/50-beta-autoupdater.conf]
Systemd::Timer[beta-autoupdater-prune-stale-logs]
Systemd::Syslog[beta-autoupdater-prune-stale-logs]
Rsyslog::Conf[beta-autoupdater-prune-stale-logs]
Systemd::Timer::Job[beta-autoupdater-prune-stale-logs]
Rsyslog::Conf[wmf-beta-update-all]
File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.timer]
Logrotate::Conf[beta-autoupdater-prune-stale-logs]
Systemd::Timer::Job[wmf-beta-update-all]
File[/var/log/beta-autoupdater-prune-stale-logs]
Systemd::Unit[beta-autoupdater-prune-stale-logs.service]
Httpd::Site[beta-autoupdater]
File[/etc/apache2/sites-enabled/50-beta-autoupdater.conf]
Httpd::Conf[beta-autoupdater]
File[/usr/local/bin/wmf-beta-update-all]
Logrotate::Conf[wmf-beta-update-all]
File[/etc/logrotate.d/wmf-beta-update-all]
Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.timer (beta-autoupdater-prune-stale-logs.timer)]
Systemd::Service[wmf-beta-update-all]
Systemd::Unit[wmf-beta-update-all.service]

Resources modified

Class[Beta::Autoupdater]

Parameters differences:

--- Class[Beta::Autoupdater].orig
+++ Class[Beta::Autoupdater]

+    apache_fqdn     => beta-update.wmcloud.org
+    run_updater     => True
+    update_interval => *:0/10

Systemd::Unit[beta-autoupdater-prune-stale-logs.service]

Parameters differences:

--- Systemd::Unit[beta-autoupdater-prune-stale-logs.service].orig
+++ Systemd::Unit[beta-autoupdater-prune-stale-logs.service]

+    restart           => False
+    override_filename => puppet-override.conf
+    override          => False
+    ensure            => present
+    unit              => beta-autoupdater-prune-stale-logs.service
+    require           => ['Class[Systemd]']

File[/var/log/beta-autoupdater-prune-stale-logs]

Parameters differences:

--- File[/var/log/beta-autoupdater-prune-stale-logs].orig
+++ File[/var/log/beta-autoupdater-prune-stale-logs]

+    backup => False
+    owner  => jenkins-deploy
+    group  => root
+    force  => True
+    mode   => 0755
+    ensure => directory

Systemd::Service[wmf-beta-update-all]

Parameters differences:

--- Systemd::Service[wmf-beta-update-all].orig
+++ Systemd::Service[wmf-beta-update-all]

+    restart                  => False
+    service_params           => {}
+    ensure                   => present
+    require                  => Systemd::Unit[wmf-beta-update-all.service]
+    monitoring_contact_group => admins
+    monitoring_critical      => False
+    monitoring_enabled       => False
+    override                 => False
+    unit_type                => timer
+    migration_task           => T407130

Class[Profile::Beta::Autoupdater]

Parameters differences:

--- Class[Profile::Beta::Autoupdater].orig
+++ Class[Profile::Beta::Autoupdater]

+    apache_fqdn     => beta-update.wmcloud.org
+    run_updater     => True
+    update_interval => *:0/10

Service[beta-autoupdater-prune-stale-logs.timer]

Parameters differences:

--- Service[beta-autoupdater-prune-stale-logs.timer].orig
+++ Service[beta-autoupdater-prune-stale-logs.timer]

+    enable   => True
+    ensure   => running
+    provider => systemd

Systemd::Unit[wmf-beta-update-all.timer]

Parameters differences:

--- Systemd::Unit[wmf-beta-update-all.timer].orig
+++ Systemd::Unit[wmf-beta-update-all.timer]

+    restart           => False
+    override_filename => puppet-override.conf
+    override          => False
+    ensure            => present
+    unit              => wmf-beta-update-all.timer
+    require           => ['Class[Systemd]']

File[/etc/apache2/sites-enabled/50-beta-autoupdater.conf]

Parameters differences:

--- File[/etc/apache2/sites-enabled/50-beta-autoupdater.conf].orig
+++ File[/etc/apache2/sites-enabled/50-beta-autoupdater.conf]

+    notify => Service[apache2]
+    group  => root
+    owner  => root
+    target => /etc/apache2/sites-available/50-beta-autoupdater.conf
+    ensure => link

Rsyslog::Conf[beta-autoupdater-prune-stale-logs]

Parameters differences:

--- Rsyslog::Conf[beta-autoupdater-prune-stale-logs].orig
+++ Rsyslog::Conf[beta-autoupdater-prune-stale-logs]

+    priority => 40
+    ensure   => present
+    mode     => 0444
+    require  => File[/var/log/beta-autoupdater-prune-stale-logs]

Systemd::Timer::Job[wmf-beta-update-all]

Parameters differences:

--- Systemd::Timer::Job[wmf-beta-update-all].orig
+++ Systemd::Timer::Job[wmf-beta-update-all]

+    fixed_random_delay        => False
+    monitoring_notes_url      => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+    ignore_errors             => False
+    monitoring_enabled        => False
+    syslog_force_stop         => True
+    environment               => {}
+    send_mail_only_on_error   => True
+    logfile_basedir           => /var/log
+    private_tmp               => False
+    command                   => /usr/local/bin/wmf-beta-update-all
+    description               => Update MediaWiki code, config, and databases
+    syslog_match_startswith   => True
+    send_mail                 => False
+    user                      => jenkins-deploy
+    ensure                    => present
+    send_mail_to              => root@deployment-deploy04.deployment-prep.eqiad1.wikimedia.cloud
+    interval                  => {'start': 'OnCalendar', 'interval': '*:0/10'}
+    logging_enabled           => True
+    require                   => ['File[/srv/beta-update-logs]', 'File[/usr/local/bin/wmf-beta-update-all]', 'File[/usr/local/bin/wmf-beta-update-databases.py]']
+    logfile_group             => root
+    logfile_perms             => all
+    success_exit_status       => []
+    logfile_name              => syslog.log
+    monitoring_contact_groups => admins

Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.service (beta-autoupdater-prune-stale-logs.service)]

Parameters differences:

--- Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.service (beta-autoupdater-prune-stale-logs.service)].orig
+++ Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.service (beta-autoupdater-prune-stale-logs.service)]

+    command     => /bin/systemctl daemon-reload
+    refreshonly => True

Systemd::Syslog[wmf-beta-update-all]

Parameters differences:

--- Systemd::Syslog[wmf-beta-update-all].orig
+++ Systemd::Syslog[wmf-beta-update-all]

+    group                  => root
+    ensure                 => present
+    programname_comparison => startswith
+    log_filename           => syslog.log
+    force_stop             => True
+    owner                  => jenkins-deploy
+    readable_by            => all
+    base_dir               => /var/log

File[/usr/local/bin/wmf-beta-autoupdate.py]

Parameters differences:

--- File[/usr/local/bin/wmf-beta-autoupdate.py].orig
+++ File[/usr/local/bin/wmf-beta-autoupdate.py]

-    require => Package[git]
-    mode    => 0555
+    ensure  => absent

Content differences:

--- /usr/local/bin/wmf-beta-autoupdate.py.orig
+++ /usr/local/bin/wmf-beta-autoupdate.py
@@ -1,148 +0,0 @@
-#!/usr/bin/env python
-#######################################################################
-# WARNING: this file is managed by Puppet
-# puppet:///beta/wmf-beta-autoupdate.py.erb
-#######################################################################
-
-"""
-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_PORTAL = '/srv/mediawiki-staging/portal-master'
-PATH_MWCORE = '/srv/mediawiki-staging/php-master'
-PATH_MWEXT = '/srv/mediawiki-staging/php-master/extensions'
-PATH_MWSKIN = '/srv/mediawiki-staging/php-master/skins'
-PATH_VENDOR = '/srv/mediawiki-staging/php-master/vendor'
-
-
-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(  # cyan
-        logging.DEBUG, "\033[36m%s\033[0m" %
-        logging.getLevelName(logging.DEBUG))
-    logging.addLevelName(  # green
-        logging.INFO, "\033[32m%s\033[0m" %
-        logging.getLevelName(logging.INFO))
-    logging.addLevelName(  # yellow
-        logging.WARNING, "\033[33m%s\033[0m" %
-        logging.getLevelName(logging.WARNING))
-    logging.addLevelName(  # red
-        logging.ERROR, "\033[31m%s\033[0m" %
-        logging.getLevelName(logging.ERROR))
-    logging.addLevelName(  # red background
-        logging.CRITICAL, "\033[41m%s\033[0m" %
-        logging.getLevelName(logging.CRITICAL))
-
-    logger = logging.getLogger('main')
-
-    logger.info("Starting updating tasks...")
-    # TODO refactor to use a dict with 'name' as keys and function value
-    exit_codes = [
-        pull_repo(name='mwcore', path=PATH_MWCORE),
-        pull_repo(name='mwvendor', path=PATH_VENDOR),
-        pull_repo(name='mwextpull', path=PATH_MWEXT),
-        submodule_sync(name='mwextpull', path=PATH_MWEXT),
-        update_repo(name='mwextupdate', path=PATH_MWEXT),
-        pull_repo(name='mwskinpull', path=PATH_MWSKIN),
-        submodule_sync(name='mwskinupdate', path=PATH_MWSKIN),
-        update_repo(name='mwskinupdate', path=PATH_MWSKIN),
-        pull_repo(name='portal', path=PATH_PORTAL),
-    ]
-
-    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 git_head_ts(git_dir):
-    """Returns timestamp of the HEAD committer date"""
-    proc = subprocess.check_output(
-        ['git', '--git-dir', git_dir, 'log',
-         '--pretty=tformat:%ct', '-1', 'HEAD'])
-    return proc.rstrip('\n')
-
-
-def pull_repo(name, path):
-    """Pull repository at path"""
-    return runner(name=name, path=path, cmd=['git', 'pull'])
-
-def submodule_sync(name, path):
-    """Syncs the submodules in path"""
-    return runner(name=name, path=path, cmd=[
-        'git', 'submodule', 'sync', '--recursive'])
-
-def update_repo(name, path):
-    """Registers and updates submodules in path"""
-    return runner(name=name, path=path, cmd=[
-        'git', 'submodule', 'update', '--init', '--recursive'])
-
-
-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())

File[/srv/beta-update-logs]

Parameters differences:

--- File[/srv/beta-update-logs].orig
+++ File[/srv/beta-update-logs]

+    mode   => 0655
+    ensure => directory
+    group  => root
+    owner  => jenkins-deploy

Httpd::Site[beta-autoupdater]

Parameters differences:

--- Httpd::Site[beta-autoupdater].orig
+++ Httpd::Site[beta-autoupdater]

+    priority => 50
+    ensure   => present
+    require  => File[/srv/beta-update-logs]

File[/usr/local/bin/wmf-beta-mwconfig-update]

Parameters differences:

--- File[/usr/local/bin/wmf-beta-mwconfig-update].orig
+++ File[/usr/local/bin/wmf-beta-mwconfig-update]

-    source  => puppet:///modules/beta/wmf-beta-mwconfig-update
-    require => ['Package[git]', 'File[/etc/profile.d/mediawiki.sh]']
-    mode    => 0555
+    ensure  => absent

Rsyslog::Conf[wmf-beta-update-all]

Parameters differences:

--- Rsyslog::Conf[wmf-beta-update-all].orig
+++ Rsyslog::Conf[wmf-beta-update-all]

+    priority => 40
+    ensure   => present
+    mode     => 0444
+    require  => File[/var/log/wmf-beta-update-all]

File[/etc/logrotate.d/beta-autoupdater-prune-stale-logs]

Parameters differences:

--- File[/etc/logrotate.d/beta-autoupdater-prune-stale-logs].orig
+++ File[/etc/logrotate.d/beta-autoupdater-prune-stale-logs]

+    mode   => 0444
+    ensure => present
+    group  => root
+    owner  => root

Content differences:

--- /etc/logrotate.d/beta-autoupdater-prune-stale-logs.orig
+++ /etc/logrotate.d/beta-autoupdater-prune-stale-logs
@@ -0,0 +1,12 @@
+# logrotate(8) config for beta-autoupdater-prune-stale-logs
+
+/var/log/beta-autoupdater-prune-stale-logs/*.log {
+    daily
+    copytruncate
+    missingok
+    compress
+    delaycompress
+    notifempty
+    rotate 15
+    size 256M
+}

File[/lib/systemd/system/wmf-beta-update-all.timer]

Parameters differences:

--- File[/lib/systemd/system/wmf-beta-update-all.timer].orig
+++ File[/lib/systemd/system/wmf-beta-update-all.timer]

+    notify => Exec[systemd daemon-reload for wmf-beta-update-all.timer (wmf-beta-update-all.timer)]
+    owner  => root
+    group  => root
+    mode   => 0444
+    ensure => present

Content differences:

--- /lib/systemd/system/wmf-beta-update-all.timer.orig
+++ /lib/systemd/system/wmf-beta-update-all.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of wmf-beta-update-all.service
+
+[Timer]
+Unit=wmf-beta-update-all.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=*:0/10
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target

File[/etc/apache2/sites-available/50-beta-autoupdater.conf]

Parameters differences:

--- File[/etc/apache2/sites-available/50-beta-autoupdater.conf].orig
+++ File[/etc/apache2/sites-available/50-beta-autoupdater.conf]

+    notify => Service[apache2]
+    owner  => root
+    group  => root
+    mode   => 0444
+    ensure => present

Content differences:

--- /etc/apache2/sites-available/50-beta-autoupdater.conf.orig
+++ /etc/apache2/sites-available/50-beta-autoupdater.conf
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+
+<VirtualHost *:80>
+    ServerName beta-update.wmcloud.org
+    ServerAdmin noc@wikimedia.org
+    DocumentRoot /srv/beta-update-logs
+    <Directory /srv/beta-update-logs>
+        Options Indexes FollowSymLinks MultiViews
+        AddType text/plain .log
+        AddCharset utf-8 .log
+
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+    LogLevel warn
+    ErrorLog /var/log/apache2/beta-update.wmcloud.org_error.log
+    CustomLog /var/log/apache2/beta-update.wmcloud.org_access.log wmf
+    ServerSignature Off
+</VirtualHost>
+

Systemd::Unit[wmf-beta-update-all.service]

Parameters differences:

--- Systemd::Unit[wmf-beta-update-all.service].orig
+++ Systemd::Unit[wmf-beta-update-all.service]

+    restart           => False
+    override_filename => puppet-override.conf
+    override          => False
+    ensure            => present
+    unit              => wmf-beta-update-all.service
+    require           => ['Class[Systemd]']

File[/etc/rsyslog.d/40-beta-autoupdater-prune-stale-logs.conf]

Parameters differences:

--- File[/etc/rsyslog.d/40-beta-autoupdater-prune-stale-logs.conf].orig
+++ File[/etc/rsyslog.d/40-beta-autoupdater-prune-stale-logs.conf]

+    notify => Service[rsyslog]
+    owner  => root
+    group  => root
+    mode   => 0444
+    ensure => present

Content differences:

--- /etc/rsyslog.d/40-beta-autoupdater-prune-stale-logs.conf.orig
+++ /etc/rsyslog.d/40-beta-autoupdater-prune-stale-logs.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "beta-autoupdater-prune-stale-logs" then {
+    action(
+        type="omfile" file="/var/log/beta-autoupdater-prune-stale-logs/syslog.log"
+        fileOwner="jenkins-deploy" fileGroup="root"
+        fileCreateMode="0644"
+    )
+    & stop
+}

File[/var/log/wmf-beta-update-all]

Parameters differences:

--- File[/var/log/wmf-beta-update-all].orig
+++ File[/var/log/wmf-beta-update-all]

+    backup => False
+    owner  => jenkins-deploy
+    group  => root
+    force  => True
+    mode   => 0755
+    ensure => directory

File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.service]

Parameters differences:

--- File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.service].orig
+++ File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.service]

+    notify => Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.service (beta-autoupdater-prune-stale-logs.service)]
+    owner  => root
+    group  => root
+    mode   => 0444
+    ensure => present

Content differences:

--- /lib/systemd/system/beta-autoupdater-prune-stale-logs.service.orig
+++ /lib/systemd/system/beta-autoupdater-prune-stale-logs.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Prune stale autoupdater logs
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=jenkins-deploy
+ExecStart=/usr/bin/find /srv/beta-update-logs -type f -mtime +3 -delete

File[/lib/systemd/system/wmf-beta-update-all.service]

Parameters differences:

--- File[/lib/systemd/system/wmf-beta-update-all.service].orig
+++ File[/lib/systemd/system/wmf-beta-update-all.service]

+    notify => Exec[systemd daemon-reload for wmf-beta-update-all.service (wmf-beta-update-all.service)]
+    owner  => root
+    group  => root
+    mode   => 0444
+    ensure => present

Content differences:

--- /lib/systemd/system/wmf-beta-update-all.service.orig
+++ /lib/systemd/system/wmf-beta-update-all.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Update MediaWiki code, config, and databases
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=jenkins-deploy
+ExecStart=/usr/local/bin/wmf-beta-update-all

Logrotate::Conf[beta-autoupdater-prune-stale-logs]

Parameters differences:

--- Logrotate::Conf[beta-autoupdater-prune-stale-logs].orig
+++ Logrotate::Conf[beta-autoupdater-prune-stale-logs]

+    ensure => present

Systemd::Unit[beta-autoupdater-prune-stale-logs.timer]

Parameters differences:

--- Systemd::Unit[beta-autoupdater-prune-stale-logs.timer].orig
+++ Systemd::Unit[beta-autoupdater-prune-stale-logs.timer]

+    restart           => False
+    override_filename => puppet-override.conf
+    override          => False
+    ensure            => present
+    unit              => beta-autoupdater-prune-stale-logs.timer
+    require           => ['Class[Systemd]']

Systemd::Timer[wmf-beta-update-all]

Parameters differences:

--- Systemd::Timer[wmf-beta-update-all].orig
+++ Systemd::Timer[wmf-beta-update-all]

+    timer_intervals    => [{'start': 'OnCalendar', 'interval': '*:0/10'}]
+    accuracy           => 15sec
+    splay              => 0
+    fixed_random_delay => False
+    unit_name          => wmf-beta-update-all.service
+    ensure             => present

Systemd::Timer::Job[beta-autoupdater-prune-stale-logs]

Parameters differences:

--- Systemd::Timer::Job[beta-autoupdater-prune-stale-logs].orig
+++ Systemd::Timer::Job[beta-autoupdater-prune-stale-logs]

+    fixed_random_delay        => False
+    monitoring_notes_url      => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+    ignore_errors             => False
+    monitoring_enabled        => False
+    syslog_force_stop         => True
+    environment               => {}
+    send_mail_only_on_error   => True
+    logfile_basedir           => /var/log
+    private_tmp               => False
+    command                   => /usr/bin/find /srv/beta-update-logs -type f -mtime +3 -delete
+    description               => Prune stale autoupdater logs
+    syslog_match_startswith   => True
+    send_mail                 => False
+    user                      => jenkins-deploy
+    ensure                    => present
+    send_mail_to              => root@deployment-deploy04.deployment-prep.eqiad1.wikimedia.cloud
+    interval                  => {'start': 'OnCalendar', 'interval': 'daily'}
+    logging_enabled           => True
+    require                   => File[/srv/beta-update-logs]
+    logfile_group             => root
+    logfile_perms             => all
+    success_exit_status       => []
+    logfile_name              => syslog.log
+    monitoring_contact_groups => admins

File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.timer]

Parameters differences:

--- File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.timer].orig
+++ File[/lib/systemd/system/beta-autoupdater-prune-stale-logs.timer]

+    notify => Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.timer (beta-autoupdater-prune-stale-logs.timer)]
+    owner  => root
+    group  => root
+    mode   => 0444
+    ensure => present

Content differences:

--- /lib/systemd/system/beta-autoupdater-prune-stale-logs.timer.orig
+++ /lib/systemd/system/beta-autoupdater-prune-stale-logs.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of beta-autoupdater-prune-stale-logs.service
+
+[Timer]
+Unit=beta-autoupdater-prune-stale-logs.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=daily
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target

Systemd::Service[beta-autoupdater-prune-stale-logs]

Parameters differences:

--- Systemd::Service[beta-autoupdater-prune-stale-logs].orig
+++ Systemd::Service[beta-autoupdater-prune-stale-logs]

+    restart                  => False
+    service_params           => {}
+    ensure                   => present
+    require                  => Systemd::Unit[beta-autoupdater-prune-stale-logs.service]
+    monitoring_contact_group => admins
+    monitoring_critical      => False
+    monitoring_enabled       => False
+    override                 => False
+    unit_type                => timer
+    migration_task           => T407130

Httpd::Conf[beta-autoupdater]

Parameters differences:

--- Httpd::Conf[beta-autoupdater].orig
+++ Httpd::Conf[beta-autoupdater]

+    conf_type => sites
+    priority  => 50
+    ensure    => present

File[/usr/local/bin/wmf-beta-update-all]

Parameters differences:

--- File[/usr/local/bin/wmf-beta-update-all].orig
+++ File[/usr/local/bin/wmf-beta-update-all]

+    owner => root
+    group => root
+    mode  => 0555

Content differences:

--- /usr/local/bin/wmf-beta-update-all.orig
+++ /usr/local/bin/wmf-beta-update-all
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+# Update the MediaWiki deployments and databases powering the Beta Cluster
+#
+# SPDX-License-Identifier: Apache-2.0
+#######################################################################
+# WARNING: this file is managed by Puppet
+# puppet:///modules/beta/templates/wmf-beta-update-all.sh.erb
+#######################################################################
+set -euxo pipefail
+
+RUN_ID=${1:-$(date +%Y%m%d%H%M)}
+LOG_DIR=/srv/beta-update-logs
+
+# Log everything output by this script
+# - `ts` adds a timestamp to each line
+# - `tee` duplicates the output to the shell
+exec &> >(ts '[%H:%M:%S]' | tee -a "${LOG_DIR}/${RUN_ID}.log")
+
+# T204762: scap/sh blindly closes all potentially available file
+# descriptors. With one million of them, that slows down each command
+# execution by 240 ms.
+ulimit -n 512
+
+# Clear a stale lock file if it exists
+# FIXME: Needed? This is cargo cult from beta-scap-sync-world Jenkins.
+LOCKFILE="/var/lock/scap.operations_mediawiki-config.lock"
+if [ -O "$LOCKFILE" ]; then
+  rm "$LOCKFILE"
+fi
+
+# Log the version of scap that is currently deployed.
+/usr/bin/scap version
+
+# Update git clones
+/usr/bin/scap prep auto
+
+# Push the current code and config out to the MediaWiki fleet
+/usr/bin/scap sync-world "wmf-beta-update-all run"
+
+# Update databases to match the current code and config
+/usr/local/bin/wmf-beta-update-databases.py

Exec[systemd daemon-reload for wmf-beta-update-all.service (wmf-beta-update-all.service)]

Parameters differences:

--- Exec[systemd daemon-reload for wmf-beta-update-all.service (wmf-beta-update-all.service)].orig
+++ Exec[systemd daemon-reload for wmf-beta-update-all.service (wmf-beta-update-all.service)]

+    command     => /bin/systemctl daemon-reload
+    refreshonly => True

File[/etc/rsyslog.d/40-wmf-beta-update-all.conf]

Parameters differences:

--- File[/etc/rsyslog.d/40-wmf-beta-update-all.conf].orig
+++ File[/etc/rsyslog.d/40-wmf-beta-update-all.conf]

+    notify => Service[rsyslog]
+    owner  => root
+    group  => root
+    mode   => 0444
+    ensure => present

Content differences:

--- /etc/rsyslog.d/40-wmf-beta-update-all.conf.orig
+++ /etc/rsyslog.d/40-wmf-beta-update-all.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "wmf-beta-update-all" then {
+    action(
+        type="omfile" file="/var/log/wmf-beta-update-all/syslog.log"
+        fileOwner="jenkins-deploy" fileGroup="root"
+        fileCreateMode="0644"
+    )
+    & stop
+}

Exec[systemd daemon-reload for wmf-beta-update-all.timer (wmf-beta-update-all.timer)]

Parameters differences:

--- Exec[systemd daemon-reload for wmf-beta-update-all.timer (wmf-beta-update-all.timer)].orig
+++ Exec[systemd daemon-reload for wmf-beta-update-all.timer (wmf-beta-update-all.timer)]

+    command     => /bin/systemctl daemon-reload
+    before      => ['Service[wmf-beta-update-all.timer]']
+    refreshonly => True

Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.timer (beta-autoupdater-prune-stale-logs.timer)]

Parameters differences:

--- Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.timer (beta-autoupdater-prune-stale-logs.timer)].orig
+++ Exec[systemd daemon-reload for beta-autoupdater-prune-stale-logs.timer (beta-autoupdater-prune-stale-logs.timer)]

+    command     => /bin/systemctl daemon-reload
+    before      => ['Service[beta-autoupdater-prune-stale-logs.timer]']
+    refreshonly => True

Systemd::Timer[beta-autoupdater-prune-stale-logs]

Parameters differences:

--- Systemd::Timer[beta-autoupdater-prune-stale-logs].orig
+++ Systemd::Timer[beta-autoupdater-prune-stale-logs]

+    timer_intervals    => [{'start': 'OnCalendar', 'interval': 'daily'}]
+    accuracy           => 15sec
+    splay              => 0
+    fixed_random_delay => False
+    unit_name          => beta-autoupdater-prune-stale-logs.service
+    ensure             => present

Logrotate::Conf[wmf-beta-update-all]

Parameters differences:

--- Logrotate::Conf[wmf-beta-update-all].orig
+++ Logrotate::Conf[wmf-beta-update-all]

+    ensure => present

File[/etc/logrotate.d/wmf-beta-update-all]

Parameters differences:

--- File[/etc/logrotate.d/wmf-beta-update-all].orig
+++ File[/etc/logrotate.d/wmf-beta-update-all]

+    mode   => 0444
+    ensure => present
+    group  => root
+    owner  => root

Content differences:

--- /etc/logrotate.d/wmf-beta-update-all.orig
+++ /etc/logrotate.d/wmf-beta-update-all
@@ -0,0 +1,12 @@
+# logrotate(8) config for wmf-beta-update-all
+
+/var/log/wmf-beta-update-all/*.log {
+    daily
+    copytruncate
+    missingok
+    compress
+    delaycompress
+    notifempty
+    rotate 15
+    size 256M
+}

Systemd::Syslog[beta-autoupdater-prune-stale-logs]

Parameters differences:

--- Systemd::Syslog[beta-autoupdater-prune-stale-logs].orig
+++ Systemd::Syslog[beta-autoupdater-prune-stale-logs]

+    group                  => root
+    ensure                 => present
+    programname_comparison => startswith
+    log_filename           => syslog.log
+    force_stop             => True
+    owner                  => jenkins-deploy
+    readable_by            => all
+    base_dir               => /var/log

Service[wmf-beta-update-all.timer]

Parameters differences:

--- Service[wmf-beta-update-all.timer].orig
+++ Service[wmf-beta-update-all.timer]

+    enable   => True
+    ensure   => running
+    provider => systemd

Compilation results for deployment-deploy04.deployment-prep.eqiad1.wikimedia.cloud: System changes detected

Catalog differences

Summary

Resources only in the new catalog

Resources modified

Relevant files