jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327377 )
Change subject: Beta Cluster: Make it easy to run Flow scripts only on enabled
wikis
......................................................................
Beta Cluster: Make it easy to run Flow scripts only on enabled wikis
Add flow_computed_labs.dblist, so we can use that to run
foreachwikiindblist without getting a huge number of errors (which
happens if you use flow.dblist).
Change-Id: I80dd50888d6ff58dfa24f47d62d0dbc4c73202af
---
A dblists/flow_computed_labs.dblist
A dblists/flow_only_labs.dblist
M tests/dblistTest.php
M wmf-config/InitialiseSettings-labs.php
4 files changed, 21 insertions(+), 5 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
Catrope: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/dblists/flow_computed_labs.dblist
b/dblists/flow_computed_labs.dblist
new file mode 100644
index 0000000..faf230c
--- /dev/null
+++ b/dblists/flow_computed_labs.dblist
@@ -0,0 +1 @@
+%% all-labs.dblist - nonflow.dblist - private.dblist - fishbowl.dblist +
flow_only_labs.dblist
diff --git a/dblists/flow_only_labs.dblist b/dblists/flow_only_labs.dblist
new file mode 100644
index 0000000..3335cc5
--- /dev/null
+++ b/dblists/flow_only_labs.dblist
@@ -0,0 +1,2 @@
+enwiki
+en_rtlwiki
diff --git a/tests/dblistTest.php b/tests/dblistTest.php
index 78b6c89..ea3c78d 100644
--- a/tests/dblistTest.php
+++ b/tests/dblistTest.php
@@ -55,9 +55,12 @@
# FIXME ideally we want to clean those files from any old
dbnames
$skip = array(
- # 'all-labs' is for the 'beta' project which has wikis
not yet
- # available in production ('all'). So we do not verify
it.
+ # 'all-labs' and 'flow_only_labs' are for the 'beta'
project, which
+ # has wikis not yet available in production ('all'). So
we do not
+ # verify it.
'all-labs',
+ 'flow_computed_labs',
+ 'flow_only_labs',
'closed',
'deleted',
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 2130cf5..8619227 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -26,9 +26,19 @@
// Add a wikitag of 'beta' that can be used to merge beta specific and
// default settings by using `'+beta' => array(...),`
$wgConf->siteParamsCallback = function( $conf, $wiki ) {
+ $wikiTags = [ 'beta' ];
+
+ $betaDblistTags = [ 'flow_only_labs' ];
+ foreach ( $betaDblistTags as $tag ) {
+ $dblist = MWWikiversions::readDbListFile( $tag );
+ if ( in_array( $wiki, $dblist ) ) {
+ $wikiTags[] = $tag;
+ }
+ }
+
return [
'params' => [ 'variant' => 'beta' ],
- 'tags' => [ 'beta' ],
+ 'tags' => $wikiTags
];
};
@@ -355,8 +365,8 @@
],
'wmgUseFlow' => [
- 'enwiki' => true,
- 'en_rtlwiki' => true,
+ // 'flow_computed_labs' is full set applicable on Beta
Cluster.
+ 'flow_only_labs' => true,
],
# No separate Flow DB or cluster (yet) for labs.
'-wmgFlowDefaultWikiDb' => [
--
To view, visit https://gerrit.wikimedia.org/r/327377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80dd50888d6ff58dfa24f47d62d0dbc4c73202af
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
