Alex Monk has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332940 )
Change subject: Read closed-labs as closed tag on labs ...................................................................... Read closed-labs as closed tag on labs Bug: T115584 Change-Id: Ic14e033622140f45b04e3c12b682dac754365a86 --- M tests/cirrusTest.php M wmf-config/CommonSettings.php M wmf-config/DatabaseLists.php 3 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/40/332940/1 diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php index 30c540a..617b54c 100644 --- a/tests/cirrusTest.php +++ b/tests/cirrusTest.php @@ -99,12 +99,13 @@ } private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) { + global $wmfRealm; $wmfConfigDir = __DIR__ . "/../wmf-config"; require __DIR__ . '/TestServices.php'; $wgConf = $this->loadWgConf( $wmfRealm ); list( $site, $lang ) = $wgConf->siteFromDB( $wgDBname ); - $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname ); + $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname, $wmfRealm ); $dbSuffix = ( $site === 'wikipedia' ) ? 'wiki' : $site; $confParams = [ diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index e1486a3..4b8b574 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -163,7 +163,7 @@ # Get configuration from SiteConfiguration object require( "$wmfConfigDir/InitialiseSettings.php" ); - $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname ); + $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname, $wmfRealm ); $dbSuffix = ( $site === 'wikipedia' ) ? 'wiki' : $site; $confParams = [ @@ -713,7 +713,7 @@ ], ]; -$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile( 'closed' ); +$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile( $wmfRealm === 'labs' ? 'closed-labs' : 'closed' ); $wgSiteMatrixPrivateSites = MWWikiversions::readDbListFile( 'private' ); $wgSiteMatrixFishbowlSites = MWWikiversions::readDbListFile( 'fishbowl' ); diff --git a/wmf-config/DatabaseLists.php b/wmf-config/DatabaseLists.php index 59f44dc..405bd77 100644 --- a/wmf-config/DatabaseLists.php +++ b/wmf-config/DatabaseLists.php @@ -37,11 +37,15 @@ /** * @return string[] */ - public static function getTagsListsFor ( $databaseName ) { + public static function getTagsListsFor ( $databaseName, $realm ) { $tags = []; foreach ( self::getAllTagsLists() as $tag ) { - $databaseList = MWWikiversions::readDbListFile( $databaseName ); + $fname = $tag; + if ( $realm === 'labs' && $tag === 'closed' ) { + $fname .= '-labs'; + } + $databaseList = MWWikiversions::readDbListFile( $fname ); if ( in_array( $databaseName, $databaseList ) ) { $tags[] = $tag; } -- To view, visit https://gerrit.wikimedia.org/r/332940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic14e033622140f45b04e3c12b682dac754365a86 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk <kren...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits