Page MenuHomePhabricator
Create Task
Maniphest T326333

Update quibble jobs to run maintenance scripts via maintenance/run.php
Closed, ResolvedPublic
Actions

Description

Since the merge of https://gerrit.wikimedia.org/r/c/mediawiki/core/+/874922 all runs for master in CI showing a big note:

16:34:07 *******************************************************************************
16:34:07 NOTE: Do not run maintenance scripts directly, use maintenance/run.php instead!
16:34:07       Running scripts directly has been deprecated in MediaWiki 1.40.
16:34:07       It may not work for some (or any) scripts in the future.
16:34:07 *****************************************************************************

Needs some update to quibble or the CI infrastructure in the future

(That was done as part of T99268)

Details

Related Changes in Gerrit:
SubjectRepoBranchLines +/-
jjb: switch jobs to Quibble 1.5.0integration/configmaster+23 -23
dockerfiles: update to Quibble 1.5.0integration/configmaster+55 -1
release: Quibble 1.5.0integration/quibblemaster+20 -3
maintenance: Use run.php if it exists (MW 1.40+)integration/quibblemaster+104 -4
Customize query in gerrit

Related Objects
Search...

Event Timeline

Umherirrender created this task.Jan 5 2023, 3:59 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJan 5 2023, 3:59 PM
Umherirrender updated the task description. (Show Details)Jan 5 2023, 4:01 PM
Umherirrender added a project: Quibble.Jan 5 2023, 4:08 PM
Ladsgroup subscribed.Jan 5 2023, 4:45 PM

The biggest complexity is that run.php is not in older versions of mw. Maybe we should backport the chain?

Jdforrester-WMF subscribed.Jan 5 2023, 5:34 PM
In T326333#8502138, @Ladsgroup wrote:

The biggest complexity is that run.php is not in older versions of mw. Maybe we should backport the chain?

Might be simple enough to just do an existence check for the file, and use the existing logic for branches where it doesn't yet exist?

hashar subscribed.Jan 5 2023, 5:39 PM
In T326333#8502138, @Ladsgroup wrote:

The biggest complexity is that run.php is not in older versions of mw. Maybe we should backport the chain?

One can introduce a method which forge the maintenance script command line by checking whether maintenance/run.php exists. The maintenance script should all be called from quibble/mediawiki/maintenance.py.

Something such as:

def getMaintenanceScript(script):
  if os.path.exists('maintenance/run.php'):
    return ['php', 'maintenance/run.php', os.path.splitext(script)[0]]
  else:
    return ['php', 'maintenance/%s' % script]

Then one can:

cmd = getMaintenanceScript('rebuildLocalisationCache.php')
cmd.extend(['--lang', 'fr'])

Which would yield either:

maintenance/rebuildLocalisationCache.php --lang fr

Or

  1. run.php with script stripped from the .php extension maintenance/run.php rebuildLocalisationCache --lang fr

Quibble currently invokes the following maintenance script:

update.php
install.php
rebuildLocalisationCache.php
addSite.php
gerritbot added a comment.Jan 5 2023, 5:41 PM

Change 875981 had a related patch set uploaded (by Jforrester; author: Jforrester):

[integration/quibble@master] maintenance: Use run.php if it exists (MW 1.40+)

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

gerritbot added a project: Patch-For-Review.Jan 5 2023, 5:41 PM
hashar added a comment.Jan 5 2023, 5:41 PM

Additionally, maintenance/run.php could be made to hide the banner when MW_QUIBBLE_CI is defined (it is set by Quibble in LocalSettings.php and supersedes the old $wgWikimediaJenkinsCI global variable). Then I guess it would not apply to install.php ;)

Jdforrester-WMF added a comment.Jan 5 2023, 5:41 PM
In T326333#8502295, @hashar wrote:
In T326333#8502138, @Ladsgroup wrote:

The biggest complexity is that run.php is not in older versions of mw. Maybe we should backport the chain?

One can introduce a method which forge the maintenance script command line by checking whether maintenance/run.php exists. The maintenance script should all be called from quibble/mediawiki/maintenance.py.

Something such as:

def getMaintenanceScript(script):
  if os.path.exists('maintenance/run.php'):
    return ['php', 'maintenance/run.php', os.path.splitext(script)[0]]
  else:
    return ['php', 'maintenance/%s' % script]

Then one can:

cmd = getMaintenanceScript('rebuildLocalisationCache.php')
cmd.extend(['--lang', 'fr'])

Which would yield either:

maintenance/rebuildLocalisationCache.php --lang fr

Or

  1. run.php with script stripped from the .php extension maintenance/run.php rebuildLocalisationCache --lang fr

Quibble currently invokes the following maintenance script:

update.php
install.php
rebuildLocalisationCache.php
addSite.php

Your model is nicer. :-) Feel free to hijack/ignore my quick hack version.

Umherirrender mentioned this in T326522: Vagrant mediawiki::maintenance resource broken by new maintenance script output.Jan 9 2023, 4:24 PM
hashar claimed this task.Jan 12 2023, 2:40 PM
hashar added a parent task: T99268: RfC: Create a proper command-line runner for MediaWiki maintenance tasks.Jan 12 2023, 2:57 PM
gerritbot added a comment.Jan 15 2023, 11:26 AM

Change 875981 merged by jenkins-bot:

[integration/quibble@master] maintenance: Use run.php if it exists (MW 1.40+)

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

Maintenance_bot removed a project: Patch-For-Review.Jan 15 2023, 11:30 AM
Umherirrender unsubscribed.Feb 10 2023, 7:22 PM
gerritbot added a comment.Feb 21 2023, 12:53 PM

Change 890809 had a related patch set uploaded (by Kosta Harlan; author: Kosta Harlan):

[integration/quibble@master] release: Quibble 1.5.0

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

gerritbot added a project: Patch-For-Review.Feb 21 2023, 12:53 PM
gerritbot added a comment.Feb 21 2023, 1:28 PM

Change 890809 merged by jenkins-bot:

[integration/quibble@master] release: Quibble 1.5.0

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

Maintenance_bot removed a project: Patch-For-Review.Feb 21 2023, 1:29 PM
gerritbot added a comment.Feb 21 2023, 1:46 PM

Change 890817 had a related patch set uploaded (by Hashar; author: Hashar):

[integration/config@master] dockerfiles: update to Quibble 1.5.0

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

gerritbot added a project: Patch-For-Review.Feb 21 2023, 1:46 PM
gerritbot added a comment.Feb 21 2023, 1:49 PM

Change 890817 merged by jenkins-bot:

[integration/config@master] dockerfiles: update to Quibble 1.5.0

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

Maintenance_bot removed a project: Patch-For-Review.Feb 21 2023, 2:10 PM
gerritbot added a comment.Feb 23 2023, 2:09 PM

Change 891548 had a related patch set uploaded (by Hashar; author: Hashar):

[integration/config@master] jjb: switch jobs to Quibble 1.5.0

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

gerritbot added a project: Patch-For-Review.Feb 23 2023, 2:09 PM
gerritbot added a comment.Feb 23 2023, 2:19 PM

Change 891548 merged by jenkins-bot:

[integration/config@master] jjb: switch jobs to Quibble 1.5.0

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

Maintenance_bot removed a project: Patch-For-Review.Feb 23 2023, 2:30 PM
hashar closed this task as Resolved.Feb 28 2023, 9:25 AM

Quibble 1.5.0 uses maintenance/run.php when it exists (else fallback to directly invoke the requested PHP script). It has been deployed for all CI jobs.

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits