[MediaWiki-commits] [Gerrit] Force CommonsMetadata on beta to recalculate data from prod - change (operations/mediawiki-config)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Force CommonsMetadata on beta to recalculate data from prod
......................................................................

Force CommonsMetadata on beta to recalculate data from prod

This will cause CMD on beta to throw away the CMD results received
from (non-beta) Commons and derive the metadata locally. This
helps testing changes in CMD logic which have been deployed on
beta but not on production.

Soft-depends on I721dfcdb283b81c63cc4241786f593b1e5dcd065.

Also remove a duplicate key from labs config.

Change-Id: I40a62571cbe2fc0ace202df4f0d7ae1845457c1b
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/71/177271/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0656dd6..0dbe399 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1921,6 +1921,7 @@
 if ( $wmgUseCommonsMetadata ) {
        require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
        $wgCommonsMetadataSetTrackingCategories = 
$wmgCommonsMetadataSetTrackingCategories;
+       $wgCommonsMetadataForceRecalculate = 
$wmgCommonsMetadataForceRecalculate;
 }
 
 if ( $wmgUseGWToolset ) {
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 066f91b..558a5c8 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -270,6 +270,9 @@
        'wmgUseCommonsMetadata' => array(
                'default' => true,
        ),
+       'wmgCommonsMetadataForceRecalculate' => array(
+               'default' => true,
+       ),
 
        'wmgUseGWToolset' => array(
                'default' => false,
@@ -289,10 +292,6 @@
        // Enable all Beta Features in Beta Labs, even if not in production 
whitelist
        'wmgBetaFeaturesWhitelist' => array(
                'default' => false,
-       ),
-
-       'wmgUseCommonsMetadata' => array(
-               'default' => true,
        ),
 
        'wmgUseMultimediaViewer' => array(
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3dfa2b6..88624db 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11281,6 +11281,10 @@
        'default' => true,
 ),
 
+'wmgCommonsMetadataForceRecalculate' => array(
+       'default' => false,
+),
+
 // NOTE: Extension:Popups has a hard dependency on TextExtracts and PageImages.
 // @todo The pattern "everywhere but loginwiki and votewiki" repeats 32 times 
in this file.
 'wmgUsePopups' => array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40a62571cbe2fc0ace202df4f0d7ae1845457c1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

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