Page MenuHomePhabricator
Create Task
Maniphest T251276

Add TwoColConflict to the "gated" extensions list in core
Closed, ResolvedPublic
Actions

Description

We kindly ask to add the Two-Column-Edit-Conflict-Merge extension to the list of "gated extensions". Means, all changes made to core will trigger the TwoColConflict tests as well, and make the CI fail when a patch would break something in the extension.

Reasoning: We plan to enable the TwoColConflict interface on all Wikimedia wikis by default. As of now it's already enabled on German Wikipedia and a few more (see T244863), and available as a Beta-Feature on all other wikis.

See https://gerrit.wikimedia.org/r/514065 (T222802) for an example patch.

To do:

  • Mark slow tests as such, if needed.
  • Do we need to document this somewhere?

Details

SubjectRepoBranchLines +/-
gate: Add TwoColConflictintegration/configmaster+2 -0
Customize query in gerrit

Related Objects
Search...

Event Timeline

thiemowmde created this task.Apr 28 2020, 1:54 PM
Restricted Application added a project: TCB-Team (now WMDE-TechWish). · View Herald TranscriptApr 28 2020, 1:54 PM
Restricted Application added a subscriber: Aklapper. · View Herald Transcript
awight awarded a token.Apr 28 2020, 2:10 PM
hashar added a parent task: T249674: Have all Wikimedia production extensions and skins in the CI gate.May 3 2020, 9:15 PM
Jdforrester-WMF subscribed.May 15 2020, 5:27 PM

Per https://integration.wikimedia.org/ci/job/quibble-vendor-mysql-php72-docker/67170/testReport/ this will add about 0.1s, which seems fine.

gerritbot added a comment.May 15 2020, 5:33 PM

Change 596708 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[integration/config@master] gate: Add TwoColConflict

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

gerritbot added a project: Patch-For-Review.May 15 2020, 5:33 PM
Jdforrester-WMF added a comment.May 15 2020, 5:34 PM

We have BetaFeatures, EventLogging, and WikiEditor as CI injected dependencies; the middle one is already in the gate, and the third is in the tarball, but the first isn't. As it has no dependencies and is pretty trivial, I'll add that one too.

gerritbot added a comment.May 15 2020, 6:20 PM

Change 596708 merged by jenkins-bot:
[integration/config@master] gate: Add TwoColConflict

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

Stashbot added a comment.May 15 2020, 6:21 PM

Mentioned in SAL (#wikimedia-releng) [2020-05-15T18:21:23Z] <James_F> Zuul: Add TwoColConflict to the gate T251276

Jdforrester-WMF closed this task as Resolved.May 15 2020, 6:56 PM
Jdforrester-WMF claimed this task.

OK, this seems like it hasn't broken the world.

thiemowmde added a comment.May 15 2020, 7:07 PM

Amazing, thanks a lot!

We have BetaFeatures, EventLogging, and WikiEditor as CI injected dependencies […]

The tests in TwoColConflict are all written to work with and without any of these extensions. Don't worry, neither is critical for TwoColConflict. Independent from that I think it's indeed a good idea to have BetaFeatures added as well, as it is also deployed on the entire cluster, and many teams rely on it.

thiemowmde moved this task from Proposed to Currently in sprint on the WMDE-TechWish board.May 15 2020, 7:08 PM
thiemowmde added a project: WMDE-QWERTY-Sprint-2020-05-13.
Maintenance_bot removed a project: Patch-For-Review.May 15 2020, 7:10 PM
awight added a comment.EditedMay 17 2020, 6:41 AM

Per https://integration.wikimedia.org/ci/job/quibble-vendor-mysql-php72-docker/67170/testReport/
this will add about 0.1s, which seems fine.

Shouldn't we include the cost of browser tests as well? Those take about
4m30s:
https://integration.wikimedia.org/ci/job/wmf-quibble-selenium-php72-docker/38615/consoleFull#console-section-14

Jdforrester-WMF added a comment.May 18 2020, 3:39 PM
In T251276#6142825, @awight wrote:

Per https://integration.wikimedia.org/ci/job/quibble-vendor-mysql-php72-docker/67170/testReport/
this will add about 0.1s, which seems fine.

Shouldn't we include the cost of browser tests as well? Those take about
4m30s:
https://integration.wikimedia.org/ci/job/wmf-quibble-selenium-php72-docker/38615/consoleFull#console-section-14

I looked at that, but we're so far beyond bankrupt with inappropriately-long selenium tests. I don't want to block progress for this one extension when it's a shared anti-pattern.

Tobi_WMDE_SW moved this task from Sprint Backlog to Done on the WMDE-QWERTY-Sprint-2020-05-13 board.May 26 2020, 1:20 PM
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