[MediaWiki-commits] [Gerrit] Add .jshintrc - change (mediawiki...Campaigns)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70373
Change subject: Add .jshintrc
..
Add .jshintrc
Change-Id: I61e61ee343a4e822e0afc88c0bbb34f6b10f6258
---
A .jshintrc
1 file changed, 34 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Campaigns
refs/changes/73/70373/1
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..7fa138d
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,34 @@
+{
+ "predef": [
+ "mediaWiki",
+ "jQuery",
+ "QUnit"
+ ],
+
+ "bitwise": true,
+ "camelcase": true,
+ "curly": true,
+ "eqeqeq": true,
+ "forin": false,
+ "immed": true,
+ "latedef": true,
+ "newcap": true,
+ "noarg": true,
+ "noempty": true,
+ "nonew": true,
+ "quotmark": "single",
+ "regexp": false,
+ "undef": true,
+ "unused": true,
+ "strict": false,
+ "trailing": true,
+
+ "laxbreak": true,
+ "smarttabs": true,
+ "multistr": true,
+
+ "browser": true,
+
+ "nomen": true,
+ "onevar": true
+}
--
To view, visit https://gerrit.wikimedia.org/r/70373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61e61ee343a4e822e0afc88c0bbb34f6b10f6258
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Campaigns
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [ArticleFeedback] Remove from Wikimedia group - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/70374 Change subject: [ArticleFeedback] Remove from Wikimedia group .. [ArticleFeedback] Remove from Wikimedia group Not longer used on WMF https://git.wikimedia.org/commitdiff/operations%2Fmediawiki-config/80be5eb9f486456f3f72b159d44f8d67f32ab588 Change-Id: I0c1e1836a4f3a0fabe2719ff02d44ba63652da32 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/74/70374/1 diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 6acb2d3..47c78ef 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -13,7 +13,6 @@ - ext-accountaudit # cedda98d6dd46cccfb88bdb32597feb0d8a6ca6b - ext-antibot # anti spam and such (usually all wikis) - ext-apisandbox # r104698, enabled on all wikis - - ext-articlefeedback - ext-articlefeedbackv5 - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage - ext-charinsert -- To view, visit https://gerrit.wikimedia.org/r/70374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c1e1836a4f3a0fabe2719ff02d44ba63652da32 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobs for mw/ext/Campaigns - change (integration/jenkins-job-builder-config)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/70376 Change subject: jobs for mw/ext/Campaigns .. jobs for mw/ext/Campaigns Change-Id: I07dd31c22336daa60dfeac7ba4d10adaac8d5a17 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/76/70376/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index d5f3256..d62aa72 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -184,6 +184,7 @@ - BlameMaps - BookManager - Calendar + - Campaigns - CategoryTree - CentralAuth - CentralNotice -- To view, visit https://gerrit.wikimedia.org/r/70376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07dd31c22336daa60dfeac7ba4d10adaac8d5a17 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mw/ext/Campaigns - change (integration/zuul-config)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/70375 Change subject: triggers for mw/ext/Campaigns .. triggers for mw/ext/Campaigns Change-Id: Idd34da68e880b32c7d6fcf7cb06a1c9a972d381e --- M layout.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/75/70375/1 diff --git a/layout.yaml b/layout.yaml index 134b2ea..a587d7f 100644 --- a/layout.yaml +++ b/layout.yaml @@ -933,6 +933,11 @@ - name: extension-checks extname: Calendar + - name: mediawiki/extensions/Campaigns +template: + - name: extension-checks +extname: Campaigns + - name: mediawiki/extensions/CategoryTree template: - name: extension-checks -- To view, visit https://gerrit.wikimedia.org/r/70375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd34da68e880b32c7d6fcf7cb06a1c9a972d381e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .jshintrc - change (mediawiki...Campaigns)
Ori.livneh has submitted this change and it was merged.
Change subject: Add .jshintrc
..
Add .jshintrc
Change-Id: I61e61ee343a4e822e0afc88c0bbb34f6b10f6258
---
A .jshintrc
1 file changed, 34 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..7fa138d
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,34 @@
+{
+ "predef": [
+ "mediaWiki",
+ "jQuery",
+ "QUnit"
+ ],
+
+ "bitwise": true,
+ "camelcase": true,
+ "curly": true,
+ "eqeqeq": true,
+ "forin": false,
+ "immed": true,
+ "latedef": true,
+ "newcap": true,
+ "noarg": true,
+ "noempty": true,
+ "nonew": true,
+ "quotmark": "single",
+ "regexp": false,
+ "undef": true,
+ "unused": true,
+ "strict": false,
+ "trailing": true,
+
+ "laxbreak": true,
+ "smarttabs": true,
+ "multistr": true,
+
+ "browser": true,
+
+ "nomen": true,
+ "onevar": true
+}
--
To view, visit https://gerrit.wikimedia.org/r/70373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61e61ee343a4e822e0afc88c0bbb34f6b10f6258
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Campaigns
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean the aliases of Proofread Page managed namespaces - change (operations/mediawiki-config)
Tpt has uploaded a new change for review. https://gerrit.wikimedia.org/r/70377 Change subject: Clean the aliases of Proofread Page managed namespaces .. Clean the aliases of Proofread Page managed namespaces Removes the aliases "Index" and "Page" that are now setup directly by the extension as canonical names. Removes also the setup of namespace numbers for uk and th wikisources (250 and 252 are the numbers by default) Change-Id: I8218934679da29a502e0a988c815598f332ce73d --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 158 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/77/70377/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5a21939..4e0a72c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2297,12 +2297,6 @@ "বাটচ'ৰা" => 100, "বাটচ'ৰা_আলোচনা" => 101, ), - 'aswikisource' => array( - 'Page' => 104,// Bug 43129 - 'Page_talk' => 105, - 'Index' => 106, // Bug 43129 - 'Index_talk' => 107, - ), '+azwikiquote' => array( 'Wikiquote' => NS_PROJECT, 'Wikiquote_talk' => NS_PROJECT_TALK, @@ -2330,10 +2324,6 @@ 'ВК' => NS_PROJECT, // Bug 41322 'Author' => 102,// Bug 41322 'Author_talk' => 103, - 'Page' => 104, // Bug 41322 - 'Page_talk' => 105, - 'Index' => 106, // Bug 41322 - 'Index_talk' => 107, ), '+bgwikisource' => array( 'Author' => 100, @@ -2368,10 +2358,6 @@ '+brwiki' => array( 'Discussion_Wikipedia' => NS_PROJECT_TALK, ), '+brwikiquote' => array( 'Wikiquote' => NS_PROJECT ), '+brwikisource' => array( - 'Index' => 100, - 'Index_talk' => 101, - 'Page' => 102, - 'Page_talk' => 103, 'Author' => 104, 'Author_talk' => 105, ), @@ -2384,10 +2370,6 @@ 'Portal_talk' => 101, // Bug 37226 ), '+cawikisource' => array( - 'Page' => 102, - 'Page_talk' => 103, - 'Index' => 104, - 'Index_talk' => 105, 'Author' => 106, 'Author_talk' => 107, ), @@ -2485,10 +2467,6 @@ '+dawikisource' => array( 'Author' => 102, // http://bugzilla.wikimedia.org/show_bug.cgi?id=7796 'Author_talk' => 103, - 'Page' => 104, - 'Page_talk' => 105, - 'Index' => 106, - 'Index_talk' => 107, ), '+dewiki' => array( 'WP' => NS_PROJECT, @@ -2509,10 +2487,6 @@ ), '+dewikisource' => array( 'WS' => 4, - 'Page' => 102, - 'Page_talk' => 103, - 'Index' => 104, - 'Index_talk' => 105, ), '+dewikivoyage' => array( 'News' => 106, @@ -2531,12 +2505,6 @@ ), '+dvwiktionary' => array( 'Wiktionary_talk' => NS_PROJECT_TALK, // Bug 46846 - ), - '+elwikisource' => array( - 'Page' => 100, - 'Page_talk' => 101, - 'Index' => 102, - 'Index_talk' => 103, ), '+enwiki' => array( // bug 6313 @@ -2575,20 +2543,12 @@ '+eswikisource' => array( 'Auxtoro' => 102, 'Auxtoro-Diskuto' => 103, - 'Page' => 104, - 'Page_talk' => 105, - 'Index' => 106, - 'Index_talk' => 107, ), '+etwiki' => array( 'Portal' => 100, 'Portal_talk' => 101, ), '+etwikisource' => array( - 'Page' => 102, - 'Page_talk' => 103, - 'Index' => 104, - 'Index_talk' => 105, 'Author' => 106, 'Author_talk' => 107, ), @@ -2609,10 +2569,6 @@ 'Author_talk' => 103, 'پدیدآورنده' => 102, 'گفتگو_پدیدآورنده' => 103, - 'Page' => 104, - 'Page_talk' => 105, - 'Index' => 106, - 'Index_talk' => 107, 'ون' => NS_PROJECT, ), '+fawiktionary' => array( @@ -2620,11 +2576,6 @@ ), '+fiwiki' => array( 'WP' => NS_PROJECT, - ), - '+frrwiki' => array( // Bug 38023 - 'Page' => 102, - 'Page_talk' => 103, - 'Index_talk' => 105, ), '+frwiki' => array( 'Wikipedia' => NS_PROJECT, @@ -2644,10 +
[MediaWiki-commits] [Gerrit] Fix missing whitespace - change (mediawiki...GettingStarted)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70378
Change subject: Fix missing whitespace
..
Fix missing whitespace
Change-Id: Icaa90576379a9b352adf9bc14935ac98340c9a2d
---
M resources/ext.gettingstarted.openTask.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/78/70378/1
diff --git a/resources/ext.gettingstarted.openTask.js
b/resources/ext.gettingstarted.openTask.js
index 29e2f5a..389181a 100644
--- a/resources/ext.gettingstarted.openTask.js
+++ b/resources/ext.gettingstarted.openTask.js
@@ -10,7 +10,7 @@
// No task or no schema.
// Expected to be task but not schemaAction in cases such as the
history view.
- if ( !task || !schemaAction) {
+ if ( !task || !schemaAction ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/70378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaa90576379a9b352adf9bc14935ac98340c9a2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobs for mw/ext/Campaigns - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: jobs for mw/ext/Campaigns .. jobs for mw/ext/Campaigns Change-Id: I07dd31c22336daa60dfeac7ba4d10adaac8d5a17 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index d5f3256..d62aa72 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -184,6 +184,7 @@ - BlameMaps - BookManager - Calendar + - Campaigns - CategoryTree - CentralAuth - CentralNotice -- To view, visit https://gerrit.wikimedia.org/r/70376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07dd31c22336daa60dfeac7ba4d10adaac8d5a17 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix missing whitespace - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix missing whitespace
..
Fix missing whitespace
Change-Id: Icaa90576379a9b352adf9bc14935ac98340c9a2d
---
M resources/ext.gettingstarted.openTask.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gettingstarted.openTask.js
b/resources/ext.gettingstarted.openTask.js
index 29e2f5a..389181a 100644
--- a/resources/ext.gettingstarted.openTask.js
+++ b/resources/ext.gettingstarted.openTask.js
@@ -10,7 +10,7 @@
// No task or no schema.
// Expected to be task but not schemaAction in cases such as the
history view.
- if ( !task || !schemaAction) {
+ if ( !task || !schemaAction ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/70378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaa90576379a9b352adf9bc14935ac98340c9a2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext: Sort ext-name list alphabetically (case-insensitive) - change (integration/jenkins-job-builder-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/70379 Change subject: mwext: Sort ext-name list alphabetically (case-insensitive) .. mwext: Sort ext-name list alphabetically (case-insensitive) Change-Id: I2cc39fc7a4855ba9b9cdf758e18f059f48663b04 --- M mediawiki-extensions.yaml 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/79/70379/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index d62aa72..a319c90 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -170,16 +170,16 @@ ext-name: - AbuseFilter - ActiveAbstract - - AntiBot - - AntiSpoof - AdminLinks - Agora + - AntiBot + - AntiSpoof + - AntiSpoof - APC - ApiSandbox - - ArticleFeedbackv5 - Arrays + - ArticleFeedbackv5 - Ask - - AntiSpoof - Babel - BlameMaps - BookManager @@ -206,8 +206,8 @@ - ContactPage - ContactPageFundraiser - ContributionReporting - - ContributionTracking - ContributionScores + - ContributionTracking - CoreEvents - CreditsSource - CustomData @@ -240,9 +240,9 @@ - GettingStarted - GlobalBlocking - GlobalUsage - - GoogleNewsSitemap - GoogleAdSense - GoogleCustomWikiSearch + - GoogleNewsSitemap - GuidedTour - I18nTags - ImageMap @@ -302,8 +302,8 @@ - RSS - Score - Scribunto - - SecurePoll - SearchExtraNS + - SecurePoll - SemanticACL - SemanticBundle - SemanticCompoundQueries @@ -340,8 +340,8 @@ - SubpageSortkey - Sudo - Survey - - SwiftCloudFiles - SVGEdit + - SwiftCloudFiles - SyntaxHighlight_GeSHi - TemplateData - TemplateSandbox -- To view, visit https://gerrit.wikimedia.org/r/70379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cc39fc7a4855ba9b9cdf758e18f059f48663b04 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext: Sort ext-name list alphabetically (case-insensitive) - change (integration/jenkins-job-builder-config)
Krinkle has submitted this change and it was merged. Change subject: mwext: Sort ext-name list alphabetically (case-insensitive) .. mwext: Sort ext-name list alphabetically (case-insensitive) Change-Id: I2cc39fc7a4855ba9b9cdf758e18f059f48663b04 --- M mediawiki-extensions.yaml 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index d62aa72..a319c90 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -170,16 +170,16 @@ ext-name: - AbuseFilter - ActiveAbstract - - AntiBot - - AntiSpoof - AdminLinks - Agora + - AntiBot + - AntiSpoof + - AntiSpoof - APC - ApiSandbox - - ArticleFeedbackv5 - Arrays + - ArticleFeedbackv5 - Ask - - AntiSpoof - Babel - BlameMaps - BookManager @@ -206,8 +206,8 @@ - ContactPage - ContactPageFundraiser - ContributionReporting - - ContributionTracking - ContributionScores + - ContributionTracking - CoreEvents - CreditsSource - CustomData @@ -240,9 +240,9 @@ - GettingStarted - GlobalBlocking - GlobalUsage - - GoogleNewsSitemap - GoogleAdSense - GoogleCustomWikiSearch + - GoogleNewsSitemap - GuidedTour - I18nTags - ImageMap @@ -302,8 +302,8 @@ - RSS - Score - Scribunto - - SecurePoll - SearchExtraNS + - SecurePoll - SemanticACL - SemanticBundle - SemanticCompoundQueries @@ -340,8 +340,8 @@ - SubpageSortkey - Sudo - Survey - - SwiftCloudFiles - SVGEdit + - SwiftCloudFiles - SyntaxHighlight_GeSHi - TemplateData - TemplateSandbox -- To view, visit https://gerrit.wikimedia.org/r/70379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cc39fc7a4855ba9b9cdf758e18f059f48663b04 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [ArticleFeedback] Remove from Wikimedia group - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [ArticleFeedback] Remove from Wikimedia group .. [ArticleFeedback] Remove from Wikimedia group Not longer used on WMF https://git.wikimedia.org/commitdiff/operations%2Fmediawiki-config/80be5eb9f486456f3f72b159d44f8d67f32ab588 Change-Id: I0c1e1836a4f3a0fabe2719ff02d44ba63652da32 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 6acb2d3..47c78ef 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -13,7 +13,6 @@ - ext-accountaudit # cedda98d6dd46cccfb88bdb32597feb0d8a6ca6b - ext-antibot # anti spam and such (usually all wikis) - ext-apisandbox # r104698, enabled on all wikis - - ext-articlefeedback - ext-articlefeedbackv5 - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage - ext-charinsert -- To view, visit https://gerrit.wikimedia.org/r/70374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c1e1836a4f3a0fabe2719ff02d44ba63652da32 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove two more "locked" extensions from Wikimedia - change (translatewiki)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/70380 Change subject: Remove two more "locked" extensions from Wikimedia .. Remove two more "locked" extensions from Wikimedia ClientSide is used only on usabilitywiki, locked. ActiveStrategy is used only on strategywiki, locked. Also added a question about another. Change-Id: I628faf94331f7f0a1d6234690ef37e2dc2fdc8bc --- M groups/MediaWiki/WikimediaAgg.yaml M groups/MediaWiki/WikimediaMainAgg.yaml 2 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/80/70380/1 diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index e47baca..dfd1a65 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -13,13 +13,11 @@ - ext-accountaudit # cedda98d6dd46cccfb88bdb32597feb0d8a6ca6b - ext-antibot # anti spam and such (usually all wikis) - ext-apisandbox # r104698, enabled on all wikis - - ext-articlefeedback - ext-articlefeedbackv5 - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage - ext-charinsert - ext-checkuser - ext-cldr # r88299 on all wikis - - ext-clientside # usability.wikimedia.org - ext-codeeditor # Change-Id: e4e8857a55b0a89707525ecdd9dff54a4cc02f6d - ext-codereview # MediaWiki.org - ext-collection-0-all @@ -83,7 +81,6 @@ - ext-shorturl # r108172 - ext-solarium # Change id: 1eddeb41816e3e3e3a2edf7fdcaeeeab38d76226 - ext-skinperpage # Wikimediafoundation.org - - ext-strategywiki-activestrategy # 2010-05-08: strategywiki.wikimedia.org - ext-subpagelist3 # r90651 - ext-subpagesortkey # a2b3abe7ebc6aac630e4e309cc17780b28ac4b04 for some wikibooks - ext-swiftcloudfiles # 110441 diff --git a/groups/MediaWiki/WikimediaMainAgg.yaml b/groups/MediaWiki/WikimediaMainAgg.yaml index f5c000f..8c18c7e 100644 --- a/groups/MediaWiki/WikimediaMainAgg.yaml +++ b/groups/MediaWiki/WikimediaMainAgg.yaml @@ -21,7 +21,7 @@ - ext-confirmeditfancycaptcha - ext-coreevents # 2013-06-13: all projects - ext-dismissablesitenotice - - ext-dontswitchmeover + - ext-dontswitchmeover # In use? - ext-featuredfeeds # r110030 for all projects - ext-gadgets - ext-globalblocking -- To view, visit https://gerrit.wikimedia.org/r/70380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I628faf94331f7f0a1d6234690ef37e2dc2fdc8bc Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nemo bis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mw/ext/Campaigns - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: triggers for mw/ext/Campaigns .. triggers for mw/ext/Campaigns Change-Id: Idd34da68e880b32c7d6fcf7cb06a1c9a972d381e --- M layout.yaml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 134b2ea..a587d7f 100644 --- a/layout.yaml +++ b/layout.yaml @@ -933,6 +933,11 @@ - name: extension-checks extname: Calendar + - name: mediawiki/extensions/Campaigns +template: + - name: extension-checks +extname: Campaigns + - name: mediawiki/extensions/CategoryTree template: - name: extension-checks -- To view, visit https://gerrit.wikimedia.org/r/70375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd34da68e880b32c7d6fcf7cb06a1c9a972d381e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Campaigns)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/70381 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Ifb2f5020b0bd7ba41ce6a5ad0957c0454b3af7b2 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Campaigns refs/changes/81/70381/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/70381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb2f5020b0bd7ba41ce6a5ad0957c0454b3af7b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Campaigns Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add campaign to login form's signup link. - change (mediawiki...Campaigns)
jenkins-bot has submitted this change and it was merged.
Change subject: Add campaign to login form's signup link.
..
Add campaign to login form's signup link.
A UserLoginForm hook adds &campaign=loginCTA to the [Join TheWiki]
button on the login form by changing the template parameter.
Change-Id: I75baaa225210faa0e013adc714f603794bb46db9
---
M Campaigns.php
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Campaigns.php b/Campaigns.php
index 9c4d380..9095e18 100644
--- a/Campaigns.php
+++ b/Campaigns.php
@@ -121,3 +121,20 @@
efLogServerSideEvent( 'ServerSideAccountCreation', 5487345, $event );
return true;
};
+
+/**
+ * Adds campaign param to link on login form.
+ *
+ * @param &$template template instance for the form
+ * @return bool True
+ */
+$wgHooks['UserLoginForm'][] = function( &$template ) {
+ if ( $template->haveData( 'createOrLoginHref' ) ) {
+ $url = $template->data[ 'createOrLoginHref' ];
+ $url .= strpos( $url, '?' ) ? '&' : '?';
+ $url .= 'campaign=loginCTA';
+ $template->set( 'createOrLoginHref', $url );
+ }
+
+ return true;
+};
--
To view, visit https://gerrit.wikimedia.org/r/69841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75baaa225210faa0e013adc714f603794bb46db9
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Campaigns
Gerrit-Branch: master
Gerrit-Owner: Spage
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Spage
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ULS deployment phase 3 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: ULS deployment phase 3 .. ULS deployment phase 3 https://www.mediawiki.org/wiki/UniversalLanguageSelector/Deployment/Planning#Phase_3:_Deploy_to_wikis_without_language_versions Change-Id: Ia9abbb283547872833ed1a17f26bf06eb938b3da --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 12 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5a21939..c1374fc 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12238,6 +12238,8 @@ 'wmgUseUniversalLanguageSelector' => array( 'default' => false, + 'special' => true, + 'wikimedia' => true, 'amwiki' => true, 'amwikiquote' => true, 'amwiktionary' => true, @@ -12253,7 +12255,6 @@ 'aswikisource' => true, 'aswiktionary' => true, 'betawikiversity' => true, - 'bewikimedia' => true, 'bhwiki' => true, 'bnwiki' => true, 'bnwikibooks' => true, @@ -12263,7 +12264,6 @@ 'bugwiki' => true, 'cawiki' => true, 'cebwiki' => true, - 'commonswiki' => true, // bug 48620 'dvwiki' => true, 'dvwiktionary' => true, 'enwikisource' => true, @@ -12280,7 +12280,6 @@ 'hiwikibooks' => true, 'hiwikiquote' => true, 'hiwiktionary' => true, - 'incubatorwiki' => true, 'jvwiki' => true, 'jvwiktionary' => true, 'kawiki' => true, @@ -12290,8 +12289,6 @@ 'knwikisource' => true, 'knwiktionary' => true, 'map_bmswiki' => true, - 'mediawikiwiki' => true, - 'metawiki' => true, 'mlwiki' => true, 'mlwikibooks' => true, 'mlwikiquote' => true, @@ -12310,7 +12307,6 @@ 'nowiki' => true, 'orwiki' => true, 'orwiktionary' => true, - 'outreachwiki' => true, 'pawiki' => true, 'pawikibooks' => true, 'pawiktionary' => true, @@ -12323,14 +12319,12 @@ 'siwiki' => true, 'siwikibooks' => true, 'siwiktionary' => true, - 'sourceswiki' => true, // Bug 44032 'tawiki' => true, 'tawikibooks' => true, 'tawikinews' => true, 'tawikiquote' => true, 'tawikisource' => true, 'tawiktionary' => true, - 'testwiki' => true, 'tewiki' => true, 'tewikibooks' => true, 'tewikiquote' => true, @@ -12339,10 +12333,6 @@ 'ukwiki' => true, 'viwiki' => true, 'warwiki' => true, - 'wikidata' => true, - 'wikimania2012wiki' => true, - 'wikimania2013wiki' => true, - 'wikimania2014wiki' => true, 'zhwiki' => true, ), -- To view, visit https://gerrit.wikimedia.org/r/69643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9abbb283547872833ed1a17f26bf06eb938b3da Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Nikerabbit Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Using delimiter string length splitting GeoCoordinate string - change (mediawiki...DataValues)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70382
Change subject: Using delimiter string length splitting GeoCoordinate string
..
Using delimiter string length splitting GeoCoordinate string
Change-Id: Ic06124afc6f060ea32be5810ba5c000d6016cd7c
---
M ValueParsers/includes/parsers/DdCoordinateParser.php
M ValueParsers/includes/parsers/DmCoordinateParser.php
M ValueParsers/includes/parsers/DmsCoordinateParser.php
3 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/82/70382/1
diff --git a/ValueParsers/includes/parsers/DdCoordinateParser.php
b/ValueParsers/includes/parsers/DdCoordinateParser.php
index 80b6eaf..c9c1445 100644
--- a/ValueParsers/includes/parsers/DdCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DdCoordinateParser.php
@@ -261,9 +261,11 @@
foreach( $delimiters as $delimiter ) {
$delimiterPos = mb_strpos(
$normalizedCoordinateString, $delimiter );
if( $delimiterPos !== false ) {
+ $delimiterLength = mb_strlen(
$delimiter );
+
$normalizedCoordinateSegments = array(
- mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + 1 ),
- mb_substr(
$normalizedCoordinateString, $delimiterPos + 1 )
+ mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + $delimiterLength ),
+ mb_substr(
$normalizedCoordinateString, $delimiterPos + $delimiterLength )
);
break;
}
diff --git a/ValueParsers/includes/parsers/DmCoordinateParser.php
b/ValueParsers/includes/parsers/DmCoordinateParser.php
index 96feb39..99caa91 100644
--- a/ValueParsers/includes/parsers/DmCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DmCoordinateParser.php
@@ -294,9 +294,11 @@
foreach( $delimiters as $delimiter ) {
$delimiterPos = mb_strpos(
$normalizedCoordinateString, $delimiter );
if( $delimiterPos !== false ) {
+ $delimiterLength = mb_strlen(
$delimiter );
+
$normalizedCoordinateSegments = array(
- mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + 1 ),
- mb_substr(
$normalizedCoordinateString, $delimiterPos + 1 )
+ mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + $delimiterLength ),
+ mb_substr(
$normalizedCoordinateString, $delimiterPos + $delimiterLength )
);
break;
}
diff --git a/ValueParsers/includes/parsers/DmsCoordinateParser.php
b/ValueParsers/includes/parsers/DmsCoordinateParser.php
index 9ad9f04..3640ebe 100644
--- a/ValueParsers/includes/parsers/DmsCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DmsCoordinateParser.php
@@ -312,9 +312,11 @@
foreach( $delimiters as $delimiter ) {
$delimiterPos = mb_strpos(
$normalizedCoordinateString, $delimiter );
if( $delimiterPos !== false ) {
+ $delimiterLength = mb_strlen(
$delimiter );
+
$normalizedCoordinateSegments = array(
- mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + 1 ),
- mb_substr(
$normalizedCoordinateString, $delimiterPos + 1 )
+ mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + $delimiterLength ),
+ mb_substr(
$normalizedCoordinateString, $delimiterPos + $delimiterLength )
);
break;
}
--
To view, visit https://gerrit.wikimedia.org/r/70382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic06124afc6f060ea32be5810ba5c000d6016cd7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://li
[MediaWiki-commits] [Gerrit] triggers for mwext-ProofreadPage - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/70383 Change subject: triggers for mwext-ProofreadPage .. triggers for mwext-ProofreadPage Change-Id: I872b8fb613cfcb856d201c9e028851e6be74d407 --- M layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/83/70383/1 diff --git a/layout.yaml b/layout.yaml index a587d7f..59610a0 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1567,7 +1567,7 @@ - name: mediawiki/extensions/ProofreadPage template: - - name: extension-checks + - name: extension-unittests extname: ProofreadPage - name: mediawiki/extensions/Quiz -- To view, visit https://gerrit.wikimedia.org/r/70383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I872b8fb613cfcb856d201c9e028851e6be74d407 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mwext-ProofreadPage - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: triggers for mwext-ProofreadPage .. triggers for mwext-ProofreadPage Change-Id: I872b8fb613cfcb856d201c9e028851e6be74d407 --- M layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index a587d7f..59610a0 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1567,7 +1567,7 @@ - name: mediawiki/extensions/ProofreadPage template: - - name: extension-checks + - name: extension-unittests extname: ProofreadPage - name: mediawiki/extensions/Quiz -- To view, visit https://gerrit.wikimedia.org/r/70383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I872b8fb613cfcb856d201c9e028851e6be74d407 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ProofreadPage)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/70384 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I96359121ad612242bea614e8b78b2e3cbec1c53e --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/84/70384/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/70384 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96359121ad612242bea614e8b78b2e3cbec1c53e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Register i18n file, fix typo in message key - change (mediawiki...OAuth)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/70385 Change subject: Register i18n file, fix typo in message key .. Register i18n file, fix typo in message key Change-Id: Iaf0dd534ef5d40366d10e0ee54f4701c10cc7408 --- M OAuth.php M frontend/language/OAuth.i18n.php 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth refs/changes/85/70385/1 diff --git a/OAuth.php b/OAuth.php index fabbaac..c0050f3 100644 --- a/OAuth.php +++ b/OAuth.php @@ -26,7 +26,7 @@ $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'OAuth 1.0a API authentication', - 'descriptionmsg' => 'oath-desc', + 'descriptionmsg' => 'oauth-desc', 'author' => array( 'Aaron Schulz' ), 'url'=> 'https://www.mediawiki.org/wiki/Extension:OAuth', ); @@ -35,6 +35,7 @@ require( __DIR__ . '/OAuth.config.php' ); # Define were PHP files and i18n files are located +$wgExtensionMessagesFiles['OAuth'] = __DIR__ . '/frontend/language/OAuth.i18n.php'; require( __DIR__ . '/OAuth.setup.php' ); OAuthSetup::defineSourcePaths( $wgAutoloadClasses, $wgExtensionMessagesFiles ); diff --git a/frontend/language/OAuth.i18n.php b/frontend/language/OAuth.i18n.php index 5c9deab..6f92f89 100644 --- a/frontend/language/OAuth.i18n.php +++ b/frontend/language/OAuth.i18n.php @@ -9,5 +9,5 @@ $messages = array(); $messages['en'] = array( - 'oath-desc' => 'OAuth 1.0a API authentication', + 'oauth-desc' => 'OAuth 1.0a API authentication', ); -- To view, visit https://gerrit.wikimedia.org/r/70385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf0dd534ef5d40366d10e0ee54f4701c10cc7408 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Using delimiter string length splitting GeoCoordinate string - change (mediawiki...DataValues)
jenkins-bot has submitted this change and it was merged.
Change subject: Using delimiter string length splitting GeoCoordinate string
..
Using delimiter string length splitting GeoCoordinate string
Change-Id: Ic06124afc6f060ea32be5810ba5c000d6016cd7c
---
M ValueParsers/includes/parsers/DdCoordinateParser.php
M ValueParsers/includes/parsers/DmCoordinateParser.php
M ValueParsers/includes/parsers/DmsCoordinateParser.php
3 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ValueParsers/includes/parsers/DdCoordinateParser.php
b/ValueParsers/includes/parsers/DdCoordinateParser.php
index 80b6eaf..c9c1445 100644
--- a/ValueParsers/includes/parsers/DdCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DdCoordinateParser.php
@@ -261,9 +261,11 @@
foreach( $delimiters as $delimiter ) {
$delimiterPos = mb_strpos(
$normalizedCoordinateString, $delimiter );
if( $delimiterPos !== false ) {
+ $delimiterLength = mb_strlen(
$delimiter );
+
$normalizedCoordinateSegments = array(
- mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + 1 ),
- mb_substr(
$normalizedCoordinateString, $delimiterPos + 1 )
+ mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + $delimiterLength ),
+ mb_substr(
$normalizedCoordinateString, $delimiterPos + $delimiterLength )
);
break;
}
diff --git a/ValueParsers/includes/parsers/DmCoordinateParser.php
b/ValueParsers/includes/parsers/DmCoordinateParser.php
index 96feb39..99caa91 100644
--- a/ValueParsers/includes/parsers/DmCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DmCoordinateParser.php
@@ -294,9 +294,11 @@
foreach( $delimiters as $delimiter ) {
$delimiterPos = mb_strpos(
$normalizedCoordinateString, $delimiter );
if( $delimiterPos !== false ) {
+ $delimiterLength = mb_strlen(
$delimiter );
+
$normalizedCoordinateSegments = array(
- mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + 1 ),
- mb_substr(
$normalizedCoordinateString, $delimiterPos + 1 )
+ mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + $delimiterLength ),
+ mb_substr(
$normalizedCoordinateString, $delimiterPos + $delimiterLength )
);
break;
}
diff --git a/ValueParsers/includes/parsers/DmsCoordinateParser.php
b/ValueParsers/includes/parsers/DmsCoordinateParser.php
index 9ad9f04..3640ebe 100644
--- a/ValueParsers/includes/parsers/DmsCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DmsCoordinateParser.php
@@ -312,9 +312,11 @@
foreach( $delimiters as $delimiter ) {
$delimiterPos = mb_strpos(
$normalizedCoordinateString, $delimiter );
if( $delimiterPos !== false ) {
+ $delimiterLength = mb_strlen(
$delimiter );
+
$normalizedCoordinateSegments = array(
- mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + 1 ),
- mb_substr(
$normalizedCoordinateString, $delimiterPos + 1 )
+ mb_substr(
$normalizedCoordinateString, 0, $delimiterPos + $delimiterLength ),
+ mb_substr(
$normalizedCoordinateString, $delimiterPos + $delimiterLength )
);
break;
}
--
To view, visit https://gerrit.wikimedia.org/r/70382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic06124afc6f060ea32be5810ba5c000d6016cd7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.o
[MediaWiki-commits] [Gerrit] GeoCoordinateParser: Improved direction detection - change (mediawiki...DataValues)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70386
Change subject: GeoCoordinateParser: Improved direction detection
..
GeoCoordinateParser: Improved direction detection
Direction may be specified either at the end or the beginning of a coordinate
segment.
Change-Id: Iebbb52ac0d52a537af1524ce1d7107a6de01848c
---
M ValueParsers/includes/parsers/DdCoordinateParser.php
M ValueParsers/includes/parsers/DmCoordinateParser.php
M ValueParsers/includes/parsers/DmsCoordinateParser.php
M ValueParsers/includes/parsers/FloatCoordinateParser.php
M ValueParsers/tests/phpunit/parsers/DdCoordinateParserTest.php
M ValueParsers/tests/phpunit/parsers/DmCoordinateParserTest.php
M ValueParsers/tests/phpunit/parsers/DmsCoordinateParserTest.php
M ValueParsers/tests/phpunit/parsers/FloatCoordinateParserTest.php
M ValueParsers/tests/phpunit/parsers/GeoCoordinateParserTest.php
9 files changed, 230 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/86/70386/1
diff --git a/ValueParsers/includes/parsers/DdCoordinateParser.php
b/ValueParsers/includes/parsers/DdCoordinateParser.php
index c9c1445..bcf6b94 100644
--- a/ValueParsers/includes/parsers/DdCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DdCoordinateParser.php
@@ -139,24 +139,34 @@
* @return string
*/
protected function resolveDirection( $coordinate ) {
- // Get the last char, which could be a direction indicator
- $lastChar = strtoupper( substr( $coordinate, -1 ) );
-
$n = $this->getOption( self::OPT_NORTH_SYMBOL );
$e = $this->getOption( self::OPT_EAST_SYMBOL );
$s = $this->getOption( self::OPT_SOUTH_SYMBOL );
$w = $this->getOption( self::OPT_WEST_SYMBOL );
- // If there is a direction indicator, remove it, and prepend a
minus sign for south and west directions.
- // If there is no direction indicator, the coordinate is
already non-directional and no work is required.
- if ( in_array( $lastChar, array( $n, $e, $s, $w ) ) ) {
- $coordinate = substr( $coordinate, 0, -1 );
+ // If there is a direction indicator, remove it, and prepend a
minus sign for south and west
+ // directions. If there is no direction indicator, the
coordinate is already non-directional
+ // and no work is required.
+ foreach( array( $n, $e, $s, $w ) as $direction ) {
+ // The coordinate segment may either start or end with
a direction symbol.
+ preg_match(
+ '/^(' . $direction . '|)([^' . $direction .
']+)(' . $direction . '|)$/i',
+ $coordinate,
+ $matches
+ );
- if ( in_array( $lastChar, array( $s, $w ) ) ) {
- $coordinate = '-' . $coordinate;
+ if( $matches[1] === $direction || $matches[3] ===
$direction ) {
+ $coordinate = $matches[2];
+
+ if ( in_array( $direction, array( $s, $w ) ) ) {
+ $coordinate = '-' . $coordinate;
+ }
+
+ return $coordinate;
}
}
+ // Coordinate segment does not include a direction symbol.
return $coordinate;
}
@@ -253,19 +263,39 @@
// Separator not present within the string, trying to
figure out the segments by
// splitting after the first direction character or
degree symbol:
$delimiters = array(
- $this->getOption( self::OPT_NORTH_SYMBOL ),
- $this->getOption( self::OPT_SOUTH_SYMBOL ),
'°'
);
+
+ $ns = array(
+ $this->getOption( self::OPT_NORTH_SYMBOL ),
+ $this->getOption( self::OPT_SOUTH_SYMBOL )
+ );
+
+ $ew = array(
+ $this->getOption( self::OPT_EAST_SYMBOL ),
+ $this->getOption( self::OPT_WEST_SYMBOL )
+ );
+
+ foreach( $ns as $delimiter ) {
+ if( mb_strpos( $normalizedCoordinateString,
$delimiter ) === 0 ) {
+ // String starts with "north" or "west"
symbol: Separation needs to be done
+ // before the "east" or "west" symbol.
+
[MediaWiki-commits] [Gerrit] Prepare Parsoid cache manifests for new servers - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70387
Change subject: Prepare Parsoid cache manifests for new servers
..
Prepare Parsoid cache manifests for new servers
Change-Id: I121e5ed58a3dc27f1ee7cf363cb7e109ed59f3fd
---
M manifests/role/cache.pp
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/70387/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3937880..c01020f 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -982,13 +982,13 @@
include standard,
nrpe
- $storage_size_main = $::realm ? { 'labs' => 5, default => 139 }
+ $storage_size_main = $::realm ? { 'labs' => 5, default => 300 }
$storage_partitions = $::realm ? {
'production' => $::hostname ? {
# FIXME: Use consistent partitions on the new
servers
"titanium" => ["sdb1", "sdd1"],
"cerium" => ["sda1", "sdb1"],
- default => []
+ default => ['sda3', 'sdb3'],
},
'labs' => ["vdb"],
}
@@ -1008,8 +1008,9 @@
storage => $::realm ? {
# FIXME: Use consistent partitions on the new
servers
'production' => $::hostname ? {
- "titanium" => "-s
main1=persistent,/srv/sdb1/varnish.persist,${storage_size_main}G -s
main2=persistent,/srv/sdd1/varnish.persist,${storage_size_main}G",
- "cerium" => "-s
main1=persistent,/srv/sda1/varnish.persist,${storage_size_main}G -s
main2=persistent,/srv/sdb1/varnish.persist,${storage_size_main}G",
+ "titanium" => "-s
main1=persistent,/srv/sdb1/varnish.persist,139G -s
main2=persistent,/srv/sdd1/varnish.persist,139G",
+ "cerium" => "-s
main1=persistent,/srv/sda1/varnish.persist,139G -s
main2=persistent,/srv/sdb1/varnish.persist,139G",
+ default => "-s
main1=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s
main2=persistent,/srv/sdb3/varnish.persist,${storage_size_main}G",
},
'labs' => "-s
main1=persistent,/srv/vdb/varnish.main1,${storage_size_main}G -s
main2=persistent,/srv/vdb/varnish.main2,${storage_size_main}G",
},
@@ -1043,6 +1044,9 @@
"backend" =>
$::role::cache::configuration::active_nodes[$::realm]['parsoid'][$::site],
},
director_type => "chash",
+ director_options => {
+ 'retries' => $backend_weight *
size($::role::cache::configuration::active_nodes[$::realm]['parsoid'][$::site]),
+ }
vcl_config => {
'retry5xx' => 0,
},
--
To view, visit https://gerrit.wikimedia.org/r/70387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I121e5ed58a3dc27f1ee7cf363cb7e109ed59f3fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setup cp1045 and cp1058 as Parsoid caches - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70388
Change subject: Setup cp1045 and cp1058 as Parsoid caches
..
Setup cp1045 and cp1058 as Parsoid caches
Change-Id: Ia96718382341adb48dfa1090df380ba769f9dfe1
---
M manifests/site.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/70388/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 04a5beb..ed452d1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -370,6 +370,12 @@
include role::cache::mobile
}
+node 'cp1045.eqiad.wmnet', 'cp1058.eqiad.wmnet' {
+ $ganglia_aggregator = true
+
+ include role::cache::parsoid
+}
+
node /^cp300[12]\.esams\.wikimedia\.org$/ {
interface_aggregate { "bond0": orig_interface => "eth0", members => [
"eth0", "eth1" ] }
--
To view, visit https://gerrit.wikimedia.org/r/70388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia96718382341adb48dfa1090df380ba769f9dfe1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare Parsoid cache manifests for new servers - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Prepare Parsoid cache manifests for new servers
..
Prepare Parsoid cache manifests for new servers
Change-Id: I121e5ed58a3dc27f1ee7cf363cb7e109ed59f3fd
---
M manifests/role/cache.pp
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3937880..716211e 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -982,13 +982,13 @@
include standard,
nrpe
- $storage_size_main = $::realm ? { 'labs' => 5, default => 139 }
+ $storage_size_main = $::realm ? { 'labs' => 5, default => 300 }
$storage_partitions = $::realm ? {
'production' => $::hostname ? {
# FIXME: Use consistent partitions on the new
servers
"titanium" => ["sdb1", "sdd1"],
"cerium" => ["sda1", "sdb1"],
- default => []
+ default => ['sda3', 'sdb3'],
},
'labs' => ["vdb"],
}
@@ -1008,8 +1008,9 @@
storage => $::realm ? {
# FIXME: Use consistent partitions on the new
servers
'production' => $::hostname ? {
- "titanium" => "-s
main1=persistent,/srv/sdb1/varnish.persist,${storage_size_main}G -s
main2=persistent,/srv/sdd1/varnish.persist,${storage_size_main}G",
- "cerium" => "-s
main1=persistent,/srv/sda1/varnish.persist,${storage_size_main}G -s
main2=persistent,/srv/sdb1/varnish.persist,${storage_size_main}G",
+ "titanium" => "-s
main1=persistent,/srv/sdb1/varnish.persist,139G -s
main2=persistent,/srv/sdd1/varnish.persist,139G",
+ "cerium" => "-s
main1=persistent,/srv/sda1/varnish.persist,139G -s
main2=persistent,/srv/sdb1/varnish.persist,139G",
+ default => "-s
main1=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s
main2=persistent,/srv/sdb3/varnish.persist,${storage_size_main}G",
},
'labs' => "-s
main1=persistent,/srv/vdb/varnish.main1,${storage_size_main}G -s
main2=persistent,/srv/vdb/varnish.main2,${storage_size_main}G",
},
@@ -1043,6 +1044,9 @@
"backend" =>
$::role::cache::configuration::active_nodes[$::realm]['parsoid'][$::site],
},
director_type => "chash",
+ director_options => {
+ 'retries' => $backend_weight *
size($::role::cache::configuration::active_nodes[$::realm]['parsoid'][$::site]),
+ },
vcl_config => {
'retry5xx' => 0,
},
--
To view, visit https://gerrit.wikimedia.org/r/70387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I121e5ed58a3dc27f1ee7cf363cb7e109ed59f3fd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setup cp1045 and cp1058 as Parsoid caches - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Setup cp1045 and cp1058 as Parsoid caches
..
Setup cp1045 and cp1058 as Parsoid caches
Change-Id: Ia96718382341adb48dfa1090df380ba769f9dfe1
---
M manifests/site.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 04a5beb..ed452d1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -370,6 +370,12 @@
include role::cache::mobile
}
+node 'cp1045.eqiad.wmnet', 'cp1058.eqiad.wmnet' {
+ $ganglia_aggregator = true
+
+ include role::cache::parsoid
+}
+
node /^cp300[12]\.esams\.wikimedia\.org$/ {
interface_aggregate { "bond0": orig_interface => "eth0", members => [
"eth0", "eth1" ] }
--
To view, visit https://gerrit.wikimedia.org/r/70388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia96718382341adb48dfa1090df380ba769f9dfe1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 50154) The parameter of the header template should be i... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 50154) The parameter of the header template should be in
lower case
..
(bug 50154) The parameter of the header template should be in lower case
This fix the break of the automatic header template feature.
Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Kipcool: Looks good to me, but someone else must approve
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index c4ca736..278f2e4 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -827,7 +827,7 @@
}
$attributes = $indexPage->getIndexEntriesForHeader();
foreach( $attributes as $attribute ) {
- $key = $attribute->getKey();
+ $key = strtolower( $attribute->getKey() );
if( array_key_exists( $key, $args ) ) {
$val = $args[$key];
} else {
--
To view, visit https://gerrit.wikimedia.org/r/70372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt
Gerrit-Reviewer: Kipcool
Gerrit-Reviewer: Tpt
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 50154) The parameter of the header template should be i... - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70389
Change subject: (bug 50154) The parameter of the header template should be in
lower case
..
(bug 50154) The parameter of the header template should be in lower case
This fix the break of the automatic header template feature.
Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/89/70389/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 215d2a1..36e7d95 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -846,7 +846,7 @@
}
$attributes = $indexPage->getIndexEntriesForHeader();
foreach( $attributes as $attribute ) {
- $key = $attribute->getKey();
+ $key = strtolower( $attribute->getKey() );
if( array_key_exists( $key, $args ) ) {
$val = $args[$key];
} else {
--
To view, visit https://gerrit.wikimedia.org/r/70389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: 1.22wmf8
Gerrit-Owner: Tpt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deprecated $wgDataValues - change (mediawiki...DataValues)
jenkins-bot has submitted this change and it was merged. Change subject: Deprecated $wgDataValues .. Deprecated $wgDataValues Change-Id: I17e8c899215ca53945f3de7b0eb5e3a249ed76fd --- M DataValues/DataValues.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/DataValues/DataValues.php b/DataValues/DataValues.php index 9d16d15..3f19d75 100644 --- a/DataValues/DataValues.php +++ b/DataValues/DataValues.php @@ -70,6 +70,9 @@ } global $wgDataValues; +/** + * @deprecated since 0.1 This is a global registry that provides no control over object lifecycle + */ $wgDataValues = array(); $wgDataValues['boolean'] = 'DataValues\BooleanValue'; -- To view, visit https://gerrit.wikimedia.org/r/65677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17e8c899215ca53945f3de7b0eb5e3a249ed76fd Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/DataValues Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw Gerrit-Reviewer: Anja Jentzsch Gerrit-Reviewer: Ataherivand Gerrit-Reviewer: Aude Gerrit-Reviewer: Daniel Kinzler Gerrit-Reviewer: Daniel Werner Gerrit-Reviewer: Denny Vrandecic Gerrit-Reviewer: Henning Snater Gerrit-Reviewer: Jens Ohlig Gerrit-Reviewer: Jeroen De Dauw Gerrit-Reviewer: John Erling Blad Gerrit-Reviewer: Lydia Pintscher Gerrit-Reviewer: Markus Kroetzsch Gerrit-Reviewer: Nikola Smolenski Gerrit-Reviewer: Silke Meyer Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 50154) The parameter of the header template should be i... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 50154) The parameter of the header template should be in
lower case
..
(bug 50154) The parameter of the header template should be in lower case
This fix the break of the automatic header template feature.
Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 215d2a1..36e7d95 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -846,7 +846,7 @@
}
$attributes = $indexPage->getIndexEntriesForHeader();
foreach( $attributes as $attribute ) {
- $key = $attribute->getKey();
+ $key = strtolower( $attribute->getKey() );
if( array_key_exists( $key, $args ) ) {
$val = $args[$key];
} else {
--
To view, visit https://gerrit.wikimedia.org/r/70389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: 1.22wmf8
Gerrit-Owner: Tpt
Gerrit-Reviewer: Tpt
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ProofreadPage to track 1.22wmf8 branch - change (mediawiki/core)
Tpt has uploaded a new change for review. https://gerrit.wikimedia.org/r/70390 Change subject: Update ProofreadPage to track 1.22wmf8 branch .. Update ProofreadPage to track 1.22wmf8 branch Change-Id: I9368483779ae190e6b2f53ef3c058849f884c931 --- M extensions/ProofreadPage 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/90/70390/1 diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage index 7d5ed49..5c301d4 16 --- a/extensions/ProofreadPage +++ b/extensions/ProofreadPage -Subproject commit 7d5ed4973b6e22dcf0ec17f4c83692b5626de26e +Subproject commit 5c301d4e1d252e34812524ce25df0fb8dcfeb39c -- To view, visit https://gerrit.wikimedia.org/r/70390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9368483779ae190e6b2f53ef3c058849f884c931 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf8 Gerrit-Owner: Tpt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use quick hasEntity in EntityExistsValidator - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Use quick hasEntity in EntityExistsValidator
..
Use quick hasEntity in EntityExistsValidator
Change-Id: I8b050e35cb62c524b279bd9f7e5c4ee0e3327ae5
---
M lib/includes/Validators/EntityExistsValidator.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/Validators/EntityExistsValidator.php
b/lib/includes/Validators/EntityExistsValidator.php
index a7c0708..e9b0bb6 100644
--- a/lib/includes/Validators/EntityExistsValidator.php
+++ b/lib/includes/Validators/EntityExistsValidator.php
@@ -81,9 +81,7 @@
throw new \InvalidArgumentException( "Expected an
EntityId object" );
}
- //TODO: We don't actually need to load the entity to check here!
- // Add a hasEntity() method to EntityLookup. so we can
check quickly
- if ( $this->lookup->getEntity( $value ) === null ) {
+ if ( !$this->lookup->hasEntity( $value ) ) {
return Result::newError( array(
//XXX: we are passing an EntityId as a message
parameter here - make sure to turn it into a string later!
Error::newError( "Entity not found: " . $value,
null, 'no-such-entity', array( $value ) ),
--
To view, visit https://gerrit.wikimedia.org/r/69846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b050e35cb62c524b279bd9f7e5c4ee0e3327ae5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Daniel Werner
Gerrit-Reviewer: Denny Vrandecic
Gerrit-Reviewer: Jeroen De Dauw
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improved rounding of globe coordinates - change (mediawiki...DataValues)
jenkins-bot has submitted this change and it was merged.
Change subject: Improved rounding of globe coordinates
..
Improved rounding of globe coordinates
Fixes the rounding of coordinates for precision greater than 1.
Change-Id: I7573a726d34b517ddb1bbde9fe045e3db76c3145
---
M DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
M DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
2 files changed, 52 insertions(+), 21 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
index 524d781..7b141f1 100644
--- a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
+++ b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
@@ -181,8 +181,9 @@
* @return {Object}
*/
toDegree: function( value, precision ) {
- var value = Math.abs( value ),
- result = {};
+ var result = {};
+
+ value = Math.abs( value );
result.degree = Math.floor( value + 0.0001 );
@@ -206,7 +207,14 @@
} else {
result.second = Math.abs( Math.round(
result.second * 1000 ) / 1000 );
}
+ }
+ if( precision > 1 ) {
+ var index = this.getPrecisionIndex( precision );
+ if( index !== -1 ) {
+ var level =
this.settings.precisions[index].level;
+ result.degree = Math.round(
result.degree / level ) * level;
+ }
}
return result;
diff --git
a/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
b/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
index eacf35a..b54fa09 100644
--- a/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
+++ b/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
@@ -9,124 +9,147 @@
( function( QUnit, $, globeCoordinate ) {
'use strict';
- var values = [0, 0.06, 0.4, 0.5, 1, 10];
+ var values = [0, 0.06, 0.4, 0.5, 1, 10, 17];
var precisions = {
0: {
tech: '±0°',
earth: '1 mm',
- toDecimal: [0, 0.06, 0.4, 0.5, 1, 10],
+ toDecimal: [0, 0.06, 0.4, 0.5, 1, 10, 17],
toDegree: [
{ degree: 0, minute: 0, second: 0 },
{ degree: 0, minute: 3, second: 36 },
{ degree: 0, minute: 24, second: 0 },
{ degree: 0, minute: 30, second: 0 },
{ degree: 1, minute: 0, second: 0 },
- { degree: 10, minute: 0, second: 0 }
+ { degree: 10, minute: 0, second: 0 },
+ { degree: 17, minute: 0, second: 0 }
]
},
1: {
tech: 1,
earth: '100 km',
- toDecimal: [0, 0, 0, 1, 1, 10],
+ toDecimal: [0, 0, 0, 1, 1, 10, 17],
toDegree: [
{ degree: 0, minute: undefined, second:
undefined },
{ degree: 0, minute: undefined, second:
undefined },
{ degree: 0, minute: undefined, second:
undefined },
{ degree: 0, minute: undefined, second:
undefined },
{ degree: 1, minute: undefined, second:
undefined },
- { degree: 10, minute: undefined, second:
undefined }
+ { degree: 10, minute: undefined, second:
undefined },
+ { degree: 17, minute: undefined, second:
undefined }
]
},
2: {
tech: '±2°',
earth: '200 km',
- toDecimal: [0, 0, 0, 1, 1, 10],
+ toDecimal: [0, 0, 0, 1, 1, 10, 17],
toDegree: [
{ degree: 0, minute: undefined, second:
undefined },
{ degree: 0, minute: undefined, second:
undefined },
{ degree: 0, minute: undefined, second:
undefined },
[MediaWiki-commits] [Gerrit] Remove RTL-specific CSS rules - change (mediawiki...TocTree)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove RTL-specific CSS rules
..
Remove RTL-specific CSS rules
CSSJanus does a sane job without them.
Bug: 46864
Change-Id: Id4549ccb9c8153d0ac62563facf90149996acfb9
---
M modules/ext.toctree.css
1 file changed, 3 insertions(+), 22 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.toctree.css b/modules/ext.toctree.css
index beb56bc..8ead7fa 100644
--- a/modules/ext.toctree.css
+++ b/modules/ext.toctree.css
@@ -1,5 +1,5 @@
/*
- * Style sheets for the TocTree extension
+ * Style sheets for the TocTree extension
* to display the toc structure
*
* @package MediaWiki
@@ -14,19 +14,10 @@
padding-left: 2em;
}
-body.rtl #toc .tocUl {
- padding-right: 2em;
-}
-
#toc.tocFloat {
float: left;
margin: 0 2em 1em 0;
width: 20em;
-}
-
-body.rtl #toc.tocFloat {
- float: right;
- margin: 0 0 1em 2em;
}
.toggleSymbol {
@@ -40,11 +31,7 @@
left: -2em;
}
-body.rtl .toggleNode {
- right: 2em;
-}
-
-.noFloat #toc.tocFloat, body.rtl .noFloat #toc.tocFloat {
+.noFloat #toc.tocFloat {
float: none;
margin: 0;
width: auto;
@@ -57,13 +44,7 @@
max-width: 20em;
}
-body.rtl #toc.tocFloat {
- float: right;
- margin: 0 0 1em 2em;
- max-width: 20em;
-}
-
-.noFloat #toc.tocFloat, body.rtl .noFloat.tocFloat #toc {
+.noFloat #toc.tocFloat {
float: none;
margin: 0;
max-width: auto;
--
To view, visit https://gerrit.wikimedia.org/r/61051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4549ccb9c8153d0ac62563facf90149996acfb9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TocTree
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Vogone
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Css cleanup - change (mediawiki...TocTree)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70391
Change subject: Css cleanup
..
Css cleanup
* Fix encoding
* Remove version which is not kept up to date
* Use ** for file comment and add space before */
Change-Id: Ibff8b6f003fbca90fc3f82cb518f0ec12efed66b
---
M modules/ext.toctree.css
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TocTree
refs/changes/91/70391/1
diff --git a/modules/ext.toctree.css b/modules/ext.toctree.css
index 8ead7fa..5c2562c 100644
--- a/modules/ext.toctree.css
+++ b/modules/ext.toctree.css
@@ -1,14 +1,13 @@
-/*
+/**
* Style sheets for the TocTree extension
* to display the toc structure
*
* @package MediaWiki
* @subpackage Extensions
* @author Roland Unger
- * @copyright © 2007 Roland Unger
- * v1.01 of 2007/11/13
+ * @copyright © 2007 Roland Unger
* @licence GNU General Public Licence 2.0 or later
-*/
+ */
#toc .tocUl {
padding-left: 2em;
--
To view, visit https://gerrit.wikimedia.org/r/70391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibff8b6f003fbca90fc3f82cb518f0ec12efed66b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TocTree
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed globeCoordinate's decimalText() - change (mediawiki...DataValues)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed globeCoordinate's decimalText()
..
Fixed globeCoordinate's decimalText()
Change-Id: Ie8bc8ee2b2db872ffef54a9c0b9530b292891f7b
---
M DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
M DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
2 files changed, 20 insertions(+), 14 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
index 7b141f1..bcbd5e7 100644
--- a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
+++ b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
@@ -162,15 +162,9 @@
*/
decimalText: function( latitude, longitude, precision ) {
return ''
- + Math.abs( this.toDecimal( latitude, precision
) )
- + this.settings.degree
- + ' '
- + ( ( latitude < 0 ) ? this.settings.south :
this.settings.north )
+ + this.toDecimal( latitude, precision )
+ this.settings.latLongCombinator
- + Math.abs( this.toDecimal( longitude,
precision ) )
- + this.settings.degree
- + ' '
- + ( ( longitude < 0 ) ? this.settings.west :
this.settings.east );
+ + this.toDecimal( longitude, precision );
},
/**
diff --git
a/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
b/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
index b54fa09..e541d43 100644
--- a/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
+++ b/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
@@ -250,20 +250,26 @@
assert.equal(
globeCoordinate.decimalText( 0, 0, 0 ),
- '0° N, 0° E',
- 'Verified output: 0° N, 0° E'
+ '0, 0',
+ 'Verified output: 0, 0'
);
assert.equal(
globeCoordinate.decimalText( 1, 1, 1 ),
- '1° N, 1° E',
- 'Verified output: 1° N, 1° E'
+ '1, 1',
+ 'Verified output: 1, 1'
);
assert.equal(
globeCoordinate.decimalText( -10, -1.5, 0.1 ),
- '10° S, 1.5° W',
- 'Verified output: 10° S, 1.5° W'
+ '-10, -1.5',
+ 'Verified output: -10, -1.5'
+ );
+
+ assert.equal(
+ globeCoordinate.decimalText( 24, -1.5, 10 ),
+ '20, 0',
+ 'Verified output: 20, 0'
);
// degreeText():
@@ -286,6 +292,12 @@
'Verified output: 10°0\'S, 2°30\'W'
);
+ assert.equal(
+ globeCoordinate.degreeText( 24, -1.5, 10 ),
+ '20°N, 0°W',
+ 'Verified output: 20°N, 0°W'
+ );
+
} );
}( QUnit, jQuery, globeCoordinate ) );
--
To view, visit https://gerrit.wikimedia.org/r/69645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8bc8ee2b2db872ffef54a9c0b9530b292891f7b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Search page from redirects to pages - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Move Search page from redirects to pages
..
Move Search page from redirects to pages
Having it in "Redirecting special pages" seems wrong to me. It's better to
have it in the company of "Lists of pages" like Special:PrefixIndex,
Special:AllPages and friends.
Change-Id: I8c59275e64dce158cd7a5b027c7efbbdb941e4c4
---
M includes/specials/SpecialSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index 94995db..8a2163b 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -1183,6 +1183,6 @@
}
protected function getGroupName() {
- return 'redirects';
+ return 'pages';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c59275e64dce158cd7a5b027c7efbbdb941e4c4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: IAlex
Gerrit-Reviewer: Jeroen De Dauw
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Slightly up the cache paritition size / free space ratio - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70392
Change subject: Slightly up the cache paritition size / free space ratio
..
Slightly up the cache paritition size / free space ratio
Change-Id: Icf139d39d7b2e974df4ef8e213340b0dc54117b7
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/70392/1
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index 547eda1..e07dd83 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -24,7 +24,7 @@
100010001000raid\
$primary{ } method{ raid } \
. \
- 0 400 10 xfs \
+ 0 500 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
--
To view, visit https://gerrit.wikimedia.org/r/70392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf139d39d7b2e974df4ef8e213340b0dc54117b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Slightly up the cache paritition size / free space ratio - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Slightly up the cache paritition size / free space ratio
..
Slightly up the cache paritition size / free space ratio
Change-Id: Icf139d39d7b2e974df4ef8e213340b0dc54117b7
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index 547eda1..befc4df 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -24,12 +24,12 @@
100010001000raid\
$primary{ } method{ raid } \
. \
- 0 400 10 xfs \
+ 0 417 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
. \
- 0 100 2 linux-swap \
+ 0 83 2 linux-swap \
$primary{ } method{ keep } \
.
--
To view, visit https://gerrit.wikimedia.org/r/70392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf139d39d7b2e974df4ef8e213340b0dc54117b7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve code quality of DbConnectors - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70393
Change subject: Improve code quality of DbConnectors
..
Improve code quality of DbConnectors
Change-Id: I915ec58eeecd09f83dc1b5aa85121948c850442d
---
M ProofreadPage.php
M includes/ProofreadPageDbConnector.php
M includes/index/ProofreadIndexDbConnector.php
3 files changed, 134 insertions(+), 98 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/93/70393/1
diff --git a/ProofreadPage.php b/ProofreadPage.php
index 5aab7a4..c7c2e8c 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -40,15 +40,14 @@
$wgExtensionMessagesFiles['ProofreadPageAlias'] = $dir .
'ProofreadPage.alias.php';
$wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php';
-$wgAutoloadClasses['ProofreadIndexDbConnector'] = $dir .
'includes/index/ProofreadIndexDbConnector.php';
$wgAutoloadClasses['ProofreadPageDbConnector'] = $dir .
'includes/ProofreadPageDbConnector.php';
$wgAutoloadClasses['ProofreadPageInit'] = $dir .
'includes/ProofreadPageInit.php';
-
$wgAutoloadClasses['EditProofreadIndexPage'] = $dir .
'includes/index/EditProofreadIndexPage.php';
$wgAutoloadClasses['ProofreadIndexEntry'] = $dir .
'includes/index/ProofreadIndexEntry.php';
$wgAutoloadClasses['ProofreadIndexValue'] = $dir .
'includes/index/ProofreadIndexValue.php';
$wgAutoloadClasses['ProofreadIndexPage'] = $dir .
'includes/index/ProofreadIndexPage.php';
+$wgAutoloadClasses['ProofreadIndexDbConnector'] = $dir .
'includes/index/ProofreadIndexDbConnector.php';
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
diff --git a/includes/ProofreadPageDbConnector.php
b/includes/ProofreadPageDbConnector.php
index 2c8af7d..a40dc3f 100644
--- a/includes/ProofreadPageDbConnector.php
+++ b/includes/ProofreadPageDbConnector.php
@@ -1,19 +1,38 @@
http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup ProofreadPage
+ */
class ProofreadPageDbConnector {
+
/**
* @param $values array
* @param ResultWrapper
*/
public static function getCategoryNamesForPageIds( $pageIds ) {
$dbr = wfGetDB( DB_SLAVE );
- $res = $dbr->select(
- array( 'categorylinks' ),
- array( 'cl_from', 'cl_to' ),
- array( 'cl_from IN(' . implode( ',', $pageIds )
. ')' ),
- __METHOD__
- );
- return $res;
+ return $dbr->select(
+ array( 'categorylinks' ),
+ array( 'cl_from', 'cl_to' ),
+ array( 'cl_from IN(' . implode( ',', $pageIds ) . ')' ),
+ __METHOD__
+ );
}
/**
@@ -23,25 +42,24 @@
*/
public static function getPagesNameInCategory( $pp, $cat ) {
$dbr = wfGetDB( DB_SLAVE );
- $res = $dbr->select(
- array( 'page', 'categorylinks' ),
- array( 'page_title' ),
- array(
- 'page_title' => $pp,
- 'cl_to' => $cat,
- 'page_namespace' =>
ProofreadPage::getPageNamespaceId()
- ),
- __METHOD__,
- null,
- array( 'categorylinks' => array( 'LEFT JOIN',
'cl_from=page_id' ) )
- );
- return $res;
+ return $dbr->select(
+ array( 'page', 'categorylinks' ),
+ array( 'page_title' ),
+ array(
+ 'page_title' => $pp,
+ 'cl_to' => $cat,
+ 'page_namespace' =>
ProofreadPage::getPageNamespaceId()
+ ),
+ __METHOD__,
+ null,
+ array( 'categorylinks' => array( 'LEFT JOIN',
'cl_from=page_id' ) )
+ );
}
/**
-* @param $query
-* @param $cat
-* @return int
+* @param $query array
+* @param $cat string
+* @return integer
*/
public static function queryCount( $query, $cat ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -58,7 +76,7 @@
/**
* @param $pages string
-* @return integer | null
+* @return integer|null
*/
public static function getNumberOfExistingPagesFromPageTitle( $pages ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -68,69 +86,66 @@
array( 'page_
[MediaWiki-commits] [Gerrit] Remove non-existing class from autoloader - change (mediawiki...SemanticForms)
jenkins-bot has submitted this change and it was merged. Change subject: Remove non-existing class from autoloader .. Remove non-existing class from autoloader Change-Id: I5fa029b9222f1bb4a4e0fe181b142afda2c8d66c --- M SemanticForms.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Foxtrott: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/SemanticForms.php b/SemanticForms.php index 2630923..007b80b 100644 --- a/SemanticForms.php +++ b/SemanticForms.php @@ -147,7 +147,6 @@ $wgAutoloadClasses['SFFormField'] = $sfgIP . '/includes/SF_FormField.php'; $wgAutoloadClasses['SFFormPrinter'] = $sfgIP . '/includes/SF_FormPrinter.php'; $wgAutoloadClasses['SFFormUtils'] = $sfgIP . '/includes/SF_FormUtils.php'; -$wgAutoloadClasses['SFFormEditTab'] = $sfgIP . '/includes/SF_FormEditTab.php'; $wgAutoloadClasses['SFFormEditPage'] = $sfgIP . '/includes/SF_FormEditPage.php'; $wgAutoloadClasses['SFUtils'] = $sfgIP . '/includes/SF_Utils.php'; $wgAutoloadClasses['SFFormLinker'] = $sfgIP . '/includes/SF_FormLinker.php'; -- To view, visit https://gerrit.wikimedia.org/r/69013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5fa029b9222f1bb4a4e0fe181b142afda2c8d66c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SemanticForms Gerrit-Branch: master Gerrit-Owner: Nikerabbit Gerrit-Reviewer: Foxtrott Gerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TimeInput expert: Always update preview when calling draw() - change (mediawiki...DataValues)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/70394 Change subject: TimeInput expert: Always update preview when calling draw() .. TimeInput expert: Always update preview when calling draw() Change-Id: I586263414b1cd3642255e731ea7a00479a08c99c --- M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues refs/changes/94/70394/1 diff --git a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js index 24e6908..7e27252 100644 --- a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js +++ b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js @@ -428,8 +428,9 @@ this.$calendar.data( 'listrotator' ).value( this._newValue.calendarText() ); } this._newValue = false; - this._updatePreview(); } + + this._updatePreview(); }, /** -- To view, visit https://gerrit.wikimedia.org/r/70394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I586263414b1cd3642255e731ea7a00479a08c99c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DataValues Gerrit-Branch: master Gerrit-Owner: Henning Snater ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Wikibase)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/70395 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Run on slave? Change-Id: If295317bac0d05fcdbc1672044e48bd79fe5009d --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/95/70395/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/70395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If295317bac0d05fcdbc1672044e48bd79fe5009d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TimeInput expert: Always update preview when calling draw() - change (mediawiki...DataValues)
jenkins-bot has submitted this change and it was merged. Change subject: TimeInput expert: Always update preview when calling draw() .. TimeInput expert: Always update preview when calling draw() Change-Id: I586263414b1cd3642255e731ea7a00479a08c99c --- M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js index 24e6908..7e27252 100644 --- a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js +++ b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js @@ -428,8 +428,9 @@ this.$calendar.data( 'listrotator' ).value( this._newValue.calendarText() ); } this._newValue = false; - this._updatePreview(); } + + this._updatePreview(); }, /** -- To view, visit https://gerrit.wikimedia.org/r/70394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I586263414b1cd3642255e731ea7a00479a08c99c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DataValues Gerrit-Branch: master Gerrit-Owner: Henning Snater Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make Selenium tests aware of timeout when parsing time inputs - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/70396 Change subject: Make Selenium tests aware of timeout when parsing time inputs .. Make Selenium tests aware of timeout when parsing time inputs Change-Id: I9eefde35bb8875394f338131b90dbc890c6fe98e --- M repo/tests/selenium/statements/statements_time_spec.rb M selenium/lib/modules/time_module.rb 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/96/70396/1 diff --git a/repo/tests/selenium/statements/statements_time_spec.rb b/repo/tests/selenium/statements/statements_time_spec.rb index 3536a9d..1809672 100644 --- a/repo/tests/selenium/statements/statements_time_spec.rb +++ b/repo/tests/selenium/statements/statements_time_spec.rb @@ -217,6 +217,8 @@ page.wait_for_entity_selector_list page.wait_for_property_value_box page.statementValueInputField = time_values[0]["input"] +page.wait_for_time_request +ajax_wait page.saveStatement?.should be_true page.saveStatement ajax_wait diff --git a/selenium/lib/modules/time_module.rb b/selenium/lib/modules/time_module.rb index f7c3eda..8d0c80b 100644 --- a/selenium/lib/modules/time_module.rb +++ b/selenium/lib/modules/time_module.rb @@ -64,4 +64,10 @@ self.timePrecision_element.when_visible end end + + def wait_for_time_request +wait_until do + previewSpinner? == false +end + end end -- To view, visit https://gerrit.wikimedia.org/r/70396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9eefde35bb8875394f338131b90dbc890c6fe98e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make Selenium tests aware of timeout when parsing time inputs - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: Make Selenium tests aware of timeout when parsing time inputs .. Make Selenium tests aware of timeout when parsing time inputs Change-Id: I9eefde35bb8875394f338131b90dbc890c6fe98e --- M repo/tests/selenium/statements/statements_time_spec.rb M selenium/lib/modules/time_module.rb 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/selenium/statements/statements_time_spec.rb b/repo/tests/selenium/statements/statements_time_spec.rb index 3536a9d..1809672 100644 --- a/repo/tests/selenium/statements/statements_time_spec.rb +++ b/repo/tests/selenium/statements/statements_time_spec.rb @@ -217,6 +217,8 @@ page.wait_for_entity_selector_list page.wait_for_property_value_box page.statementValueInputField = time_values[0]["input"] +page.wait_for_time_request +ajax_wait page.saveStatement?.should be_true page.saveStatement ajax_wait diff --git a/selenium/lib/modules/time_module.rb b/selenium/lib/modules/time_module.rb index f7c3eda..8d0c80b 100644 --- a/selenium/lib/modules/time_module.rb +++ b/selenium/lib/modules/time_module.rb @@ -64,4 +64,10 @@ self.timePrecision_element.when_visible end end + + def wait_for_time_request +wait_until do + previewSpinner? == false +end + end end -- To view, visit https://gerrit.wikimedia.org/r/70396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9eefde35bb8875394f338131b90dbc890c6fe98e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind more jobs to 'master' - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70402
Change subject: bind more jobs to 'master'
..
bind more jobs to 'master'
This are jobs that need be run as the 'jenkins' user to publish their
results under /srv/org/ so bind them on the master. Will want to move
to 'gallium' slave node later on.
Change-Id: I810823f84a289e6802c93d925c9907521e24ef28
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 4 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/02/70402/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index d4a602b..0798bcd 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -126,6 +126,7 @@
- job-template:
name: 'mwext-VisualEditor-doc-publish'
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul-for-mw-ext
triggers:
- zuul
diff --git a/mediawiki.yaml b/mediawiki.yaml
index b3380eb..91852b5 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -65,6 +65,7 @@
- job-template:
name: '{name}-jsduck-publish'
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -81,6 +82,7 @@
- job-template:
name: '{name}-doxygen-publish'
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -184,8 +186,8 @@
- job:
name: 'mediawiki-core-code-coverage'
+node: master # FIXME move to slave 'gallium'
defaults: global
-
builders:
- wipe-workspace
- get-mw-core:
--
To view, visit https://gerrit.wikimedia.org/r/70402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I810823f84a289e6802c93d925c9907521e24ef28
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind some operations jobs - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70400
Change subject: bind some operations jobs
..
bind some operations jobs
On 'gallium':
- operations-debs-python-voluptuous-debbuild (needs package building
tools)
- operations-puppet-validate (needs Zuul git repositories)
On 'master', will fix it up later on:
- operations-puppet-doc
Change-Id: I83add835ebffefe9a5302ff585eea3e6faf18780
---
M operations-debs.yaml
M operations-puppet.yaml
2 files changed, 3 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/00/70400/1
diff --git a/operations-debs.yaml b/operations-debs.yaml
index b9baac5..a5ced56 100644
--- a/operations-debs.yaml
+++ b/operations-debs.yaml
@@ -12,6 +12,7 @@
- job-template:
name: '{name}-debbuild'
+node: gallium # requires packages-builder
defaults: use-zuul
scm:
diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index 5346ebc..c483f42 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -1,5 +1,6 @@
- job-template:
name: 'operations-puppet-validate'
+node: gallium # relies on /srv/ssd/zuul/git/operations/puppet
defaults: use-zuul
triggers:
@@ -51,6 +52,7 @@
# Documentation for our puppet repository
- job-template:
name: 'operations-puppet-doc'
+node: master # FIXME move to node 'gallium'
defaults: use-zuul
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/70400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83add835ebffefe9a5302ff585eea3e6faf18780
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind parsoid jobs on 'master' - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/70399 Change subject: bind parsoid jobs on 'master' .. bind parsoid jobs on 'master' The parsoid jobs might need to be run has the jenkins user. I am not really sure what to do with them, so this bind them to the Jenkins master to avoid potential regressions. Will fix it up later on. Change-Id: Ida2bec2fa18df4c31c3d3d60a303393e5750332f --- M parsoid.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/99/70399/1 diff --git a/parsoid.yaml b/parsoid.yaml index c9069ac..8773e32 100644 --- a/parsoid.yaml +++ b/parsoid.yaml @@ -26,6 +26,7 @@ - job-template: name: parsoid-parsertests-run +node: master # FIXME move to slave 'gallium' defaults: use-zuul triggers: @@ -51,6 +52,7 @@ - job-template: name: parsoid-parsertests +node: master # FIXME move to slave 'gallium' triggers: - zuul builders: @@ -79,6 +81,7 @@ - job-template: name: parsoid-regressions +node: master # FIXME move to slave 'gallium' defaults: use-zuul triggers: @@ -133,6 +136,7 @@ - job-template: name: parsoid-parse-tool-check +node: master # FIXME move to slave 'gallium' wrappers: - timeout: timeout: 5 @@ -165,6 +169,7 @@ - job-template: name: parsoid-roundtrip-test-check +node: master # FIXME move to slave 'gallium' wrappers: - timeout: timeout: 5 @@ -196,6 +201,7 @@ - job-template: name: parsoid-parsertests-run-harder +node: master # FIXME move to slave 'gallium' wrappers: - timeout: timeout: 10 -- To view, visit https://gerrit.wikimedia.org/r/70399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida2bec2fa18df4c31c3d3d60a303393e5750332f Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test-mediawiki-docgen on master (for now) - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/70398 Change subject: test-mediawiki-docgen on master (for now) .. test-mediawiki-docgen on master (for now) Change-Id: I9e3761b62a78ca6014b5948d5db3cc2417b691a1 --- M test-mediawiki.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/98/70398/1 diff --git a/test-mediawiki.yaml b/test-mediawiki.yaml index 446abc9..b0cd4e3 100644 --- a/test-mediawiki.yaml +++ b/test-mediawiki.yaml @@ -14,6 +14,7 @@ - job-template: name: 'test-mediawiki-docgen' +node: hasSlaveScripts defaults: use-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/70398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e3761b62a78ca6014b5948d5db3cc2417b691a1 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind qunit tests to master - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70401
Change subject: bind qunit tests to master
..
bind qunit tests to master
Will have to figure out whether they could work on the 'gallium' slave
node. Probably needs to tweak some permissions.
Jobs updated:
mediawiki-core-qunit
mwext-EventLogging-qunit
mwext-GuidedTour-qunit
mwext-VisualEditor-qunit
test-mediawiki-qunit
Change-Id: Ica7306451d7b9a990290462bc81043f50e18a0a5
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/01/70401/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index d62aa72..d4a602b 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -41,7 +41,7 @@
- job-template:
name: '{name}-{ext-name}-qunit'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul-for-mw-ext
triggers:
- zuul
diff --git a/mediawiki.yaml b/mediawiki.yaml
index dbf8581..b3380eb 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -41,7 +41,7 @@
# Generic job to run QUnit
- job-template:
name: '{name}-qunit'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
--
To view, visit https://gerrit.wikimedia.org/r/70401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica7306451d7b9a990290462bc81043f50e18a0a5
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mark more jobs has requiring slave scripts - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70403
Change subject: mark more jobs has requiring slave scripts
..
mark more jobs has requiring slave scripts
That effectively migrate a lot of MediaWiki jobs out of master to the
gallium slave nodes. Some jobs are bound to 'master' since that
requires write access as 'jenkins' user on /var/lib/jenkins/tmpfs.
For MediaWiki extensions, any -lint, -phpcs and -phpcs-HEAD jobs are
moved to the gallium slave node. That includes mediawiki-core-lint.
testextensions and Wikibase specific jobs are bound to master.
MediaWiki core jobs are bound to master since they need a sqlite write
access:
Stuck on master:
- mediawiki-core-install-sqlite
- mediawiki-core-phpunit-api
- mediawiki-core-phpunit-databaseless
- mediawiki-core-phpunit-misc
- mediawiki-core-phpunit-parser
- mediawiki-core-regression-REL1_19
- mediawiki-core-regression-REL1_20
- mediawiki-core-regression-REL1_21
- mediawiki-core-regression-master
Change-Id: Icfcc5fd9794831fff26762d022af684aa9fc2942
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 10 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/03/70403/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 0798bcd..844ef19 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -7,6 +7,7 @@
- job-template:
# TODO: Use global '{name}-phplint' template instead
name: '{name}-{ext-name}-lint'
+node: hasSlaveScripts
defaults: use-zuul
scm:
- git-mwext-in-root:
@@ -64,6 +65,7 @@
- job-template:
name: '{name}-{ext-name}-phpcs-HEAD'
+node: hasSlaveScripts
defaults: use-zuul
scm:
- git-mwext-in-root:
@@ -78,6 +80,8 @@
# Run all extension tests
- job-template:
name: '{name}-{ext-name}-testextensions-{mwbranch}'
+# FIXME should be gallium slave that needs slave user to have write access
to the /var/lib/jenkins/tmpfs
+node: master
defaults: use-zuul-for-mw-ext
triggers:
- zuul
@@ -96,6 +100,8 @@
# and server configurations.
- job-template:
name: 'mwext-Wikibase-{kind}-tests'
+# FIXME should be gallium slave that needs slave user to have write access
to the /var/lib/jenkins/tmpfs
+node: master
defaults: use-zuul-for-mw-ext
ext-name: 'Wikibase'
triggers:
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 91852b5..a57e67a 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -19,6 +19,7 @@
- job-template:
name: '{name}-lint'
+node: hasSlaveScripts
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -108,7 +109,7 @@
# @param gerrit-name Gerrit project name (ex: mediawiki/core)
- job-template:
name: '{name}-phpunit-{phpunit-group}'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -128,7 +129,7 @@
# @param databasetype Suffix for an ant target 'installdb-{databasetype}'
- job-template:
name: '{name}-install-{databasetype}'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -172,7 +173,7 @@
- job-template:
name: 'mediawiki-core-regression-{branch}'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
--
To view, visit https://gerrit.wikimedia.org/r/70403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfcc5fd9794831fff26762d022af684aa9fc2942
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind some integration jobs - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/70397 Change subject: bind some integration jobs .. bind some integration jobs On master, should be on 'gallium' but the slave uses a different username 'jenkins-slave': - integration-docroot-deploy On 'gallium' since we need a Zuul install: - integration-zuul-layoutdiff - integration-zuul-layoutvalidation Change-Id: Ie12a84732b5da84c5f6abaca9284b97473235a9a --- M integration.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/97/70397/1 diff --git a/integration.yaml b/integration.yaml index e6bb726..ad6a604 100644 --- a/integration.yaml +++ b/integration.yaml @@ -1,5 +1,6 @@ - job-template: name: 'integration-docroot-deploy' +node: master # FIXME move to slave 'gallium' defaults: global triggers: - zuul @@ -15,6 +16,7 @@ # Requires zuul to be installed on the Jenkins host. - job-template: name: 'integration-zuul-layoutvalidation' +node: gallium # it is running Zuul defaults: use-zuul triggers: - zuul @@ -25,6 +27,7 @@ - job-template: name: 'integration-zuul-layoutdiff' +node: gallium # it is running Zuul defaults: use-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/70397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie12a84732b5da84c5f6abaca9284b97473235a9a Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 47011) Wiki link of Index: pages are mishandled if they... - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70404
Change subject: (bug 47011) Wiki link of Index: pages are mishandled if they
contain a ":"
..
(bug 47011) Wiki link of Index: pages are mishandled if they contain a ":"
Change-Id: I2cbd16ab182e74b43401e3f9d692d48d717fa860
---
M includes/index/ProofreadIndexPage.php
M tests/includes/index/ProofreadIndexPageTest.php
2 files changed, 16 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/04/70404/1
diff --git a/includes/index/ProofreadIndexPage.php
b/includes/index/ProofreadIndexPage.php
index 2821a07..70f8e60 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -250,7 +250,7 @@
$text = $this->getText();
$options = new ParserOptions();
$rtext = $indexParser->preprocess( $text, $this->title,
$options );
- return $this->linkPregMatch( $rtext,
"/\[\[\s*([^:\|]*?)\s*(\|(.*?)|)\]\]/i" );
+ return $this->getLinksToNamespace( $rtext, NS_MAIN );
}
/**
@@ -273,26 +273,25 @@
$links = null;
} else {
$params = null;
- $links = $this->linkPregMatch( $text,
"/\[\[$pageNamespace:(.*?)(\|(.*?)|)\]\]/i",
ProofreadPage::getPageNamespaceId() );
+ $links = $this->getLinksToNamespace( $text,
ProofreadPage::getPageNamespaceId() );
}
return array( $links, $params );
}
/**
-* Execute a preg_match_all with the pattern put in parameter and
return it as a list of links
+* Retruns all links in a given namespace
* @param $text string
-* @param $pattern string the pattern to execute
* @param $namespace integer the default namespace id
* @return array of array( Title title of the pointed page, the label
of the link )
*/
- protected function linkPregMatch( $text, $pattern, $namespace = NS_MAIN
) {
- preg_match_all( $pattern, $text, $textLinks, PREG_PATTERN_ORDER
);
+ protected function getLinksToNamespace( $text, $namespace ) {
+ preg_match_all( '/\[\[(.*?)(\|(.*?)|)\]\]/i', $text,
$textLinks, PREG_PATTERN_ORDER );
$links = array();
$num = 0;
for( $i = 0; $i < count( $textLinks[1] ); $i++ ) {
- $title = Title::newFromText( $textLinks[1][$i],
$namespace );
- if ( $title !== null ) {
+ $title = Title::newFromText( $textLinks[1][$i] );
+ if ( $title !== null && $title->inNamespace( $namespace
) ) {
if ( $textLinks[3][$i] === '' ) {
$links[$num] = array( $title,
$title->getSubpageText() );
} else {
diff --git a/tests/includes/index/ProofreadIndexPageTest.php
b/tests/includes/index/ProofreadIndexPageTest.php
index 374766d..bcc5049 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -67,8 +67,6 @@
global $wgProofreadPageNamespaceIds, $wgExtraNamespaces,
$wgNamespacesWithSubpages;
parent::setUp();
- $wgExtraNamespaces[250] = 'Page';
- $wgExtraNamespaces[252] = 'Index';
$wgProofreadPageNamespaceIds = array(
'page' => 250,
'index' => 252
@@ -123,10 +121,10 @@
}
public function testGetLinksToMainNamespace() {
- $page = new ProofreadIndexPage( Title::makeTitle( 252,
'Test.djvu' ), self::$config, "{{\n|Pages=\n|TOC=* [[Test/Chapter
1]]\n* [[Test/Chapter_2|Chapter 2]]\n}}" );
+ $page = new ProofreadIndexPage( Title::makeTitle( 252,
'Test.djvu' ), self::$config, "{{\n|Pages=[[Page:Test.jpg]]\n|TOC=*
[[Test/Chapter 1]]\n* [[Azerty:Test/Chapter_2|Chapter 2]]\n}}" );
$links = array(
array( Title::newFromText( 'Test/Chapter 1' ), 'Chapter
1' ),
- array( Title::newFromText( 'Test/Chapter_2' ), 'Chapter
2' )
+ array( Title::newFromText( 'Azerty:Test/Chapter_2' ),
'Chapter 2' )
);
$this->assertEquals( $links, $page->getLinksToMainNamespace() );
}
@@ -138,11 +136,11 @@
}
public function testGetPagesWithoutPagelist() {
- $page = new ProofreadIndexPage( Title::makeTitle( 252, 'Test'
), self::$config, "{{\n|Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]]
[[Page:Test 3.png|2]]\n|Author=[[Author:Me]]\n}}" );
+ $page = new ProofreadIndexPage( Title::makeTitle( 252, 'Test'
), self::$config, "
[MediaWiki-commits] [Gerrit] Replace the parsoidcache backends with cp1045/cp1058 - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70405
Change subject: Replace the parsoidcache backends with cp1045/cp1058
..
Replace the parsoidcache backends with cp1045/cp1058
Also raise the chash weight while we're at it.
Change-Id: I48433de680e47c68c096f07fa1188c1ed287df1a
---
M manifests/role/cache.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/70405/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 716211e..29871f2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -192,7 +192,7 @@
},
"parsoid" => {
"pmtpa" => [],
- "eqiad" => ["cerium.wikimedia.org",
"titanium.wikimedia.org"],
+ "eqiad" => ['cp1045.eqiad.wmnet',
'cp1058.eqiad.wmnet'],
"esams" => []
}
},
@@ -1051,8 +1051,8 @@
'retry5xx' => 0,
},
backend_options => {
- # FIXME: set weight to $backend_weight for new
servers
'port' => 3128,
+ 'weight' => $backend_weight
'connect_timeout' => "5s",
'first_byte_timeout' => "60s",
'between_bytes_timeout' => "2s",
--
To view, visit https://gerrit.wikimedia.org/r/70405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48433de680e47c68c096f07fa1188c1ed287df1a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace the parsoidcache backends with cp1045/cp1058 - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Replace the parsoidcache backends with cp1045/cp1058
..
Replace the parsoidcache backends with cp1045/cp1058
Also raise the chash weight while we're at it.
Change-Id: I48433de680e47c68c096f07fa1188c1ed287df1a
---
M manifests/role/cache.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 716211e..75a0bc0 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -192,7 +192,7 @@
},
"parsoid" => {
"pmtpa" => [],
- "eqiad" => ["cerium.wikimedia.org",
"titanium.wikimedia.org"],
+ "eqiad" => ['cp1045.eqiad.wmnet',
'cp1058.eqiad.wmnet'],
"esams" => []
}
},
@@ -1051,8 +1051,8 @@
'retry5xx' => 0,
},
backend_options => {
- # FIXME: set weight to $backend_weight for new
servers
'port' => 3128,
+ 'weight' => $backend_weight,
'connect_timeout' => "5s",
'first_byte_timeout' => "60s",
'between_bytes_timeout' => "2s",
--
To view, visit https://gerrit.wikimedia.org/r/70405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48433de680e47c68c096f07fa1188c1ed287df1a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor MediaHandlers - change (mediawiki...TimedMediaHandler)
J has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70406
Change subject: Refactor MediaHandlers
..
Refactor MediaHandlers
- add ID3Handler and use in WebM, FLAC and Mp4 handler
Change-Id: I91d29d503fa012a6d1ef66daed53c264a57c1074
---
M TimedMediaHandler.php
M handlers/FLACHandler/FLACHandler.php
A handlers/ID3Handler/ID3Handler.php
M handlers/Mp4Handler/Mp4Handler.php
M handlers/WebMHandler/WebMHandler.php
5 files changed, 117 insertions(+), 254 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/06/70406/1
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index d813829..b74637e 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -198,6 +198,8 @@
// getID3 provides metadata for mp4 and webm files:
$wgAutoloadClasses['getID3'] = "$timedMediaDir/libs/getid3/getid3.php";
+// ID3 Metadata Handler
+$wgAutoloadClasses['ID3Handler'] =
"$timedMediaDir/handlers/ID3Handler/ID3Handler.php";
// Mp4 / h264 Handler
$wgAutoloadClasses['Mp4Handler'] =
"$timedMediaDir/handlers/Mp4Handler/Mp4Handler.php";
// WebM Handler
diff --git a/handlers/FLACHandler/FLACHandler.php
b/handlers/FLACHandler/FLACHandler.php
index d476e42..f08c9b9 100644
--- a/handlers/FLACHandler/FLACHandler.php
+++ b/handlers/FLACHandler/FLACHandler.php
@@ -2,55 +2,7 @@
/**
* FLAC handler
*/
-class FLACHandler extends TimedMediaHandler {
- // XXX match GETID3_VERSION ( too bad version is not a getter )
- const METADATA_VERSION = 2;
-
- /**
-* @param $file File
-* @param $path string
-* @return string
-*/
- function getMetadata( $file, $path ) {
- // Create new id3 object:
- $getID3 = new getID3();
-
- // Don't grab stuff we don't use:
- $getID3->option_tag_id3v1 = false; // Read and process
ID3v1 tags
- $getID3->option_tag_id3v2 = false; // Read and process
ID3v2 tags
- $getID3->option_tag_lyrics3 = false; // Read and process
Lyrics3 tags
- $getID3->option_tag_apetag= false; // Read and process
APE tags
- $getID3->option_tags_process = false; // Copy tags to
root key 'tags' and encode to $this->encoding
- $getID3->option_tags_html = false; // Copy tags to
root key 'tags_html' properly translated from various encodings to HTML entities
-
- // Analyze file to get metadata structure:
- $id3 = $getID3->analyze( $path );
-
- // remove file paths
- unset( $id3['filename'] );
- unset( $id3['filepath'] );
- unset( $id3['filenamepath']);
-
- // Update the version
- $id3['version'] = self::METADATA_VERSION;
-
- return serialize( $id3 );
- }
-
- /**
-* @param $metadata
-* @return bool|mixed
-*/
- function unpackMetadata( $metadata ) {
- wfSuppressWarnings();
- $unser = unserialize( $metadata );
- wfRestoreWarnings();
- if ( isset( $unser['version'] ) && $unser['version'] ==
self::METADATA_VERSION ) {
- return $unser;
- } else {
- return false;
- }
- }
+class FLACHandler extends ID3Handler {
/**
* @param $file File
@@ -85,36 +37,6 @@
}
return $streamTypes;
- }
-
- /**
-* @param $file File
-* @return mixed
-*/
- function getBitrate( $file ){
- $metadata = $this->unpackMetadata( $file->getMetadata() );
- return $metadata['bitrate'];
- }
-
- /**
-* @param $file File
-* @return int
-*/
- function getLength( $file ) {
- $metadata = $this->unpackMetadata( $file->getMetadata() );
- if ( !$metadata || isset( $metadata['error'] ) ) {
- return 0;
- } else {
- return $metadata['playtime_seconds'];
- }
- }
-
- /**
-* @param $file File
-* @return bool|int
-*/
- function getFramerate( $file ){
- return false;
}
/**
diff --git a/handlers/ID3Handler/ID3Handler.php
b/handlers/ID3Handler/ID3Handler.php
new file mode 100644
index 000..f7d6baf
--- /dev/null
+++ b/handlers/ID3Handler/ID3Handler.php
@@ -0,0 +1,103 @@
+option_tag_id3v1 = false; // Read and process
ID3v1 tags
+ $getID3->option_tag_id3v2 = false; // Read and process
ID3v2 tags
+ $getID3->option_tag_lyrics3 = false; // Read and process
Lyrics3 tags
+ $getID3->option_tag_apetag= false; // R
[MediaWiki-commits] [Gerrit] nrpe: revert to the nagios user/paths, clean up - change (operations/puppet)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70407
Change subject: nrpe: revert to the nagios user/paths, clean up
..
nrpe: revert to the nagios user/paths, clean up
There's no reason that I can see to modify init scripts and config files
all over the place to make nrpe run as the "icinga" user and from
/etc/icinga/nrpe.d rather than the nagios user & paths that the package
installs. There's also no reason to modify nrpe.cfg when there's
nrpe_local.cfg.
Clean all that up, revert to the stock init script & nrpe.cfg and leave
a comment to remove all that calls when puppet has been run everywhere.
This does *not*: rm -rf /etc/icinga, deluser icinga, delgroup icinga, rm
-rf /home/icinga (previously left), as it would also affect neon and
there's no good way to do this in puppet. Left for laters :)
Change-Id: I0e5b55e497c34806426742f002db0631aa006e67
---
M files/icinga/nagios-nrpe-server-init
M files/icinga/nrpe.cfg
M manifests/nrpe.pp
M templates/icinga/nrpe_local.cfg.erb
4 files changed, 35 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/70407/1
diff --git a/files/icinga/nagios-nrpe-server-init
b/files/icinga/nagios-nrpe-server-init
index 1af139a..c0e62c2 100755
--- a/files/icinga/nagios-nrpe-server-init
+++ b/files/icinga/nagios-nrpe-server-init
@@ -17,8 +17,8 @@
DAEMON=/usr/sbin/nrpe
NAME=nagios-nrpe
DESC=nagios-nrpe
-CONFIG=/etc/icinga/nrpe.cfg
-PIDDIR=/var/run/icinga
+CONFIG=/etc/nagios/nrpe.cfg
+PIDDIR=/var/run/nagios
test -x $DAEMON || exit 0
@@ -43,7 +43,7 @@
#since /var/run can be wiped completly we create our run directory here
if [ ! -d "$PIDDIR" ]; then
mkdir "$PIDDIR"
- chown icinga "$PIDDIR"
+ chown nagios "$PIDDIR"
fi
set -e
@@ -59,14 +59,12 @@
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
-start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
--retry 15
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
--retry 15
log_end_msg $?
-#sometimes deleting the pidfile fails. cleanup afterwards.
-test -e $PIDDIR/nrpe.pid && rm $PIDDIR/nrpe.pid
;;
reload|force-reload)
log_daemon_msg "Reloading $DESC configuration files" "$NAME"
-start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
+ start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
log_end_msg $?
;;
status)
@@ -74,7 +72,7 @@
;;
restart)
$0 stop
- sleep 15
+ sleep 1
$0 start
;;
*)
diff --git a/files/icinga/nrpe.cfg b/files/icinga/nrpe.cfg
index 010ab9d..40c9e10 100644
--- a/files/icinga/nrpe.cfg
+++ b/files/icinga/nrpe.cfg
@@ -2,6 +2,7 @@
# Sample NRPE Config File
# Written by: Ethan Galstad (nag...@nagios.org)
#
+# Last Modified: 11-23-2007
#
# NOTES:
# This is a sample configuration file for the NRPE daemon. It needs to be
@@ -22,7 +23,7 @@
# number. The file is only written if the NRPE daemon is started by the root
# user and is running in standalone mode.
-pid_file=/var/run/icinga/nrpe.pid
+pid_file=/var/run/nagios/nrpe.pid
@@ -50,7 +51,7 @@
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-nrpe_user=icinga
+nrpe_user=nagios
@@ -75,8 +76,8 @@
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-allowed_hosts=127.0.0.1,208.80.154.14,208.80.152.161
-
+allowed_hosts=127.0.0.1
+
# COMMAND ARGUMENT PROCESSING
@@ -216,11 +217,10 @@
#
# local configuration:
# if you'd prefer, you can instead place directives here
-include=/etc/icinga/nrpe_local.cfg
+include=/etc/nagios/nrpe_local.cfg
#
# you can place your config snipplets into nrpe.d/
+# only snipplets ending in .cfg will get included
include_dir=/etc/nagios/nrpe.d/
-include_dir=/etc/icinga/nrpe.d/
-
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index e2ccc3f..de9373a 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -11,7 +11,7 @@
define nrpe::check($command) {
Class[nrpe::packages] -> Nrpe::Check[$title]
- file { "/etc/icinga/nrpe.d/${title}.cfg":
+ file { "/etc/nagios/nrpe.d/${title}.cfg":
owner => root,
group => root,
mode => 0444,
@@ -77,6 +77,24 @@
ensure => present;
}
+ file { "/etc/nagios/nrpe_local.cfg":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0444,
+ content => template("icinga/nrpe_local.cfg.erb"),
+ require => Package[nagios-nrpe-server],
+ }
+
+ file { "/usr/lib/nagios/plugins/check_dpkg":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0555,
+
[MediaWiki-commits] [Gerrit] Prepare the mobile cache manifests for the new servers - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70409
Change subject: Prepare the mobile cache manifests for the new servers
..
Prepare the mobile cache manifests for the new servers
Change-Id: Ifafbf51f5f3fb2accc81231bcb7a20fcf6d7c828
---
M manifests/role/cache.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/70409/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 75a0bc0..b0ad0e9 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -854,8 +854,8 @@
nrpe
$storage_size_main = $::hostname ? {
- /^cp301[1-4]$/ => 300,
- default => 100,
+ /^cp104[1-4]$/ => 100,
+ default => 300,
}
if $cluster_tier == 1 {
--
To view, visit https://gerrit.wikimedia.org/r/70409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifafbf51f5f3fb2accc81231bcb7a20fcf6d7c828
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install cp104[67] and cp1059/cp1060 as mobile caches - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70410
Change subject: Install cp104[67] and cp1059/cp1060 as mobile caches
..
Install cp104[67] and cp1059/cp1060 as mobile caches
Change-Id: I851f678c4bde6d7407f783018ab0b4f6df616bc1
---
M manifests/site.pp
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/70410/1
diff --git a/manifests/site.pp b/manifests/site.pp
index ed452d1..abd4de2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -376,6 +376,16 @@
include role::cache::parsoid
}
+node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet',
'cp1060.eqiad.wmnet' {
+ if $::hostname =~ /^cp104[67]$/ {
+ $ganglia_aggregator = true
+ }
+
+ interface_add_ip6_mapped { "main": }
+
+ include role::cache::mobile
+}
+
node /^cp300[12]\.esams\.wikimedia\.org$/ {
interface_aggregate { "bond0": orig_interface => "eth0", members => [
"eth0", "eth1" ] }
--
To view, visit https://gerrit.wikimedia.org/r/70410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I851f678c4bde6d7407f783018ab0b4f6df616bc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.ime from upstream - change (mediawiki...UniversalLanguageSelector)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70408
Change subject: Update jquery.ime from upstream
..
Update jquery.ime from upstream
Version: v0.1.0+20130625
* Add sa-iast input method
* Fix bug https://github.com/wikimedia/jquery.ime/issues/188
Bug: 49515
Change-Id: I8ebd5bc4857285eb29d0ec6741cc6953ac187722
---
M lib/jquery.ime/jquery.ime.js
A lib/jquery.ime/rules/sa/sa-iast.js
2 files changed, 76 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/08/70408/1
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 148f09c..f252ba5 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20130624
+/*! jquery.ime - v0.1.0+20130625
* https://github.com/wikimedia/jquery.ime
* Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
@@ -666,7 +666,9 @@
* @param {jQuery.Event} e
*/
keydown: function ( e ) {
- var ime = $( e.target ).data( 'ime' );
+ var ime = $( e.target ).data( 'ime' ),
+ firstInputmethod,
+ languageCode;
this.focus(); // shows the trigger in case it is hidden
@@ -677,7 +679,14 @@
if ( this.inputmethod !== null ) {
this.selectIM(
this.inputmethod.id );
} else {
- this.selectLanguage(
this.decideLanguage() );
+ languageCode =
this.decideLanguage();
+ this.selectLanguage(
languageCode );
+ if ( !ime.isActive() &&
$.ime.languages[languageCode] ) {
+ // Even after pressing
toggle shortcut again, it is still disabled
+ // Provide the default
input method in this case.
+ firstInputmethod =
$.ime.languages[languageCode].inputmethods[0];
+ this.selectIM(
firstInputmethod );
+ }
}
}
@@ -1610,6 +1619,10 @@
name: 'yawerty',
source: 'rules/ru/ru-yawerty.js'
},
+ 'sa-iast': {
+ name: 'Romanized',
+ source: 'rules/sa/sa-iast.js'
+ },
'sa-inscript': {
name: 'इनस्क्रिप्ट',
source: 'rules/sa/sa-inscript.js'
@@ -1903,7 +1916,7 @@
},
'sa': {
autonym: 'संस्कृत',
- inputmethods: [ 'sa-transliteration', 'sa-inscript2',
'sa-inscript' ]
+ inputmethods: [ 'sa-transliteration', 'sa-inscript2',
'sa-inscript', 'sa-iast' ]
},
'sat': {
autonym: 'संताली',
diff --git a/lib/jquery.ime/rules/sa/sa-iast.js
b/lib/jquery.ime/rules/sa/sa-iast.js
new file mode 100644
index 000..9a22b41
--- /dev/null
+++ b/lib/jquery.ime/rules/sa/sa-iast.js
@@ -0,0 +1,59 @@
+( function ( $ ) {
+ 'use strict';
+
+ var saIast = {
+ id: 'sa-iast',
+ name: 'Romanized',
+ description: 'Romanized input method for Sanskrit with IAST/ISO
15919 convention. Original author William Giddings ',
+ date: '2013-03-18',
+ URL: 'http://github.com/wikimedia/jquery.ime',
+ author: 'Runa Bhattacharjee',
+ license: 'GPLv3',
+ version: '1.0',
+ contextLength: 0,
+ maxKeyLength: 2,
+ patterns: [
+ ['aa', 'ā'],
+ ['AA', 'Ā'],
+ ['\\^a', 'â'],
+ ['\\^A', 'Â'],
+ ['ii', 'ī'],
+ ['II', 'Ī'],
+ ['uu', 'ū'],
+
[MediaWiki-commits] [Gerrit] bind some integration jobs - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: bind some integration jobs .. bind some integration jobs On master, should be on 'gallium' but the slave uses a different username 'jenkins-slave': - integration-docroot-deploy On 'gallium' since we need a Zuul install: - integration-zuul-layoutdiff - integration-zuul-layoutvalidation Change-Id: Ie12a84732b5da84c5f6abaca9284b97473235a9a --- M integration.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/integration.yaml b/integration.yaml index e6bb726..ad6a604 100644 --- a/integration.yaml +++ b/integration.yaml @@ -1,5 +1,6 @@ - job-template: name: 'integration-docroot-deploy' +node: master # FIXME move to slave 'gallium' defaults: global triggers: - zuul @@ -15,6 +16,7 @@ # Requires zuul to be installed on the Jenkins host. - job-template: name: 'integration-zuul-layoutvalidation' +node: gallium # it is running Zuul defaults: use-zuul triggers: - zuul @@ -25,6 +27,7 @@ - job-template: name: 'integration-zuul-layoutdiff' +node: gallium # it is running Zuul defaults: use-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/70397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie12a84732b5da84c5f6abaca9284b97473235a9a Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test-mediawiki-docgen on master (for now) - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: test-mediawiki-docgen on master (for now) .. test-mediawiki-docgen on master (for now) Change-Id: I9e3761b62a78ca6014b5948d5db3cc2417b691a1 --- M test-mediawiki.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/test-mediawiki.yaml b/test-mediawiki.yaml index 446abc9..b0cd4e3 100644 --- a/test-mediawiki.yaml +++ b/test-mediawiki.yaml @@ -14,6 +14,7 @@ - job-template: name: 'test-mediawiki-docgen' +node: hasSlaveScripts defaults: use-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/70398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e3761b62a78ca6014b5948d5db3cc2417b691a1 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mark more jobs has requiring slave scripts - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: mark more jobs has requiring slave scripts
..
mark more jobs has requiring slave scripts
That effectively migrate a lot of MediaWiki jobs out of master to the
gallium slave nodes. Some jobs are bound to 'master' since that
requires write access as 'jenkins' user on /var/lib/jenkins/tmpfs.
For MediaWiki extensions, any -lint, -phpcs and -phpcs-HEAD jobs are
moved to the gallium slave node. That includes mediawiki-core-lint.
testextensions and Wikibase specific jobs are bound to master.
MediaWiki core jobs are bound to master since they need a sqlite write
access:
Stuck on master:
- mediawiki-core-install-sqlite
- mediawiki-core-phpunit-api
- mediawiki-core-phpunit-databaseless
- mediawiki-core-phpunit-misc
- mediawiki-core-phpunit-parser
- mediawiki-core-regression-REL1_19
- mediawiki-core-regression-REL1_20
- mediawiki-core-regression-REL1_21
- mediawiki-core-regression-master
Change-Id: Icfcc5fd9794831fff26762d022af684aa9fc2942
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 10 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 6fb52b4..deb18fe 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -7,6 +7,7 @@
- job-template:
# TODO: Use global '{name}-phplint' template instead
name: '{name}-{ext-name}-lint'
+node: hasSlaveScripts
defaults: use-zuul
scm:
- git-mwext-in-root:
@@ -64,6 +65,7 @@
- job-template:
name: '{name}-{ext-name}-phpcs-HEAD'
+node: hasSlaveScripts
defaults: use-zuul
scm:
- git-mwext-in-root:
@@ -78,6 +80,8 @@
# Run all extension tests
- job-template:
name: '{name}-{ext-name}-testextensions-{mwbranch}'
+# FIXME should be gallium slave that needs slave user to have write access
to the /var/lib/jenkins/tmpfs
+node: master
defaults: use-zuul-for-mw-ext
triggers:
- zuul
@@ -96,6 +100,8 @@
# and server configurations.
- job-template:
name: 'mwext-Wikibase-{kind}-tests'
+# FIXME should be gallium slave that needs slave user to have write access
to the /var/lib/jenkins/tmpfs
+node: master
defaults: use-zuul-for-mw-ext
ext-name: 'Wikibase'
triggers:
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 91852b5..a57e67a 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -19,6 +19,7 @@
- job-template:
name: '{name}-lint'
+node: hasSlaveScripts
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -108,7 +109,7 @@
# @param gerrit-name Gerrit project name (ex: mediawiki/core)
- job-template:
name: '{name}-phpunit-{phpunit-group}'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -128,7 +129,7 @@
# @param databasetype Suffix for an ant target 'installdb-{databasetype}'
- job-template:
name: '{name}-install-{databasetype}'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -172,7 +173,7 @@
- job-template:
name: 'mediawiki-core-regression-{branch}'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
--
To view, visit https://gerrit.wikimedia.org/r/70403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfcc5fd9794831fff26762d022af684aa9fc2942
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind qunit tests to master - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: bind qunit tests to master
..
bind qunit tests to master
Will have to figure out whether they could work on the 'gallium' slave
node. Probably needs to tweak some permissions.
Jobs updated:
mediawiki-core-qunit
mwext-EventLogging-qunit
mwext-GuidedTour-qunit
mwext-VisualEditor-qunit
test-mediawiki-qunit
Change-Id: Ica7306451d7b9a990290462bc81043f50e18a0a5
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index a319c90..a4a67e8 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -41,7 +41,7 @@
- job-template:
name: '{name}-{ext-name}-qunit'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul-for-mw-ext
triggers:
- zuul
diff --git a/mediawiki.yaml b/mediawiki.yaml
index dbf8581..b3380eb 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -41,7 +41,7 @@
# Generic job to run QUnit
- job-template:
name: '{name}-qunit'
-
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
--
To view, visit https://gerrit.wikimedia.org/r/70401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica7306451d7b9a990290462bc81043f50e18a0a5
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind parsoid jobs on 'master' - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: bind parsoid jobs on 'master' .. bind parsoid jobs on 'master' The parsoid jobs might need to be run has the jenkins user. I am not really sure what to do with them, so this bind them to the Jenkins master to avoid potential regressions. Will fix it up later on. Change-Id: Ida2bec2fa18df4c31c3d3d60a303393e5750332f --- M parsoid.yaml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/parsoid.yaml b/parsoid.yaml index c9069ac..8773e32 100644 --- a/parsoid.yaml +++ b/parsoid.yaml @@ -26,6 +26,7 @@ - job-template: name: parsoid-parsertests-run +node: master # FIXME move to slave 'gallium' defaults: use-zuul triggers: @@ -51,6 +52,7 @@ - job-template: name: parsoid-parsertests +node: master # FIXME move to slave 'gallium' triggers: - zuul builders: @@ -79,6 +81,7 @@ - job-template: name: parsoid-regressions +node: master # FIXME move to slave 'gallium' defaults: use-zuul triggers: @@ -133,6 +136,7 @@ - job-template: name: parsoid-parse-tool-check +node: master # FIXME move to slave 'gallium' wrappers: - timeout: timeout: 5 @@ -165,6 +169,7 @@ - job-template: name: parsoid-roundtrip-test-check +node: master # FIXME move to slave 'gallium' wrappers: - timeout: timeout: 5 @@ -196,6 +201,7 @@ - job-template: name: parsoid-parsertests-run-harder +node: master # FIXME move to slave 'gallium' wrappers: - timeout: timeout: 10 -- To view, visit https://gerrit.wikimedia.org/r/70399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida2bec2fa18df4c31c3d3d60a303393e5750332f Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind some operations jobs - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: bind some operations jobs
..
bind some operations jobs
On 'gallium':
- operations-debs-python-voluptuous-debbuild (needs package building
tools)
- operations-puppet-validate (needs Zuul git repositories)
On 'master', will fix it up later on:
- operations-puppet-doc
Change-Id: I83add835ebffefe9a5302ff585eea3e6faf18780
---
M operations-debs.yaml
M operations-puppet.yaml
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/operations-debs.yaml b/operations-debs.yaml
index b9baac5..a5ced56 100644
--- a/operations-debs.yaml
+++ b/operations-debs.yaml
@@ -12,6 +12,7 @@
- job-template:
name: '{name}-debbuild'
+node: gallium # requires packages-builder
defaults: use-zuul
scm:
diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index 5346ebc..c483f42 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -1,5 +1,6 @@
- job-template:
name: 'operations-puppet-validate'
+node: gallium # relies on /srv/ssd/zuul/git/operations/puppet
defaults: use-zuul
triggers:
@@ -51,6 +52,7 @@
# Documentation for our puppet repository
- job-template:
name: 'operations-puppet-doc'
+node: master # FIXME move to node 'gallium'
defaults: use-zuul
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/70400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83add835ebffefe9a5302ff585eea3e6faf18780
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bind more jobs to 'master' - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: bind more jobs to 'master'
..
bind more jobs to 'master'
This are jobs that need be run as the 'jenkins' user to publish their
results under /srv/org/ so bind them on the master. Will want to move
to 'gallium' slave node later on.
Change-Id: I810823f84a289e6802c93d925c9907521e24ef28
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index a4a67e8..6fb52b4 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -126,6 +126,7 @@
- job-template:
name: 'mwext-VisualEditor-doc-publish'
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul-for-mw-ext
triggers:
- zuul
diff --git a/mediawiki.yaml b/mediawiki.yaml
index b3380eb..91852b5 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -65,6 +65,7 @@
- job-template:
name: '{name}-jsduck-publish'
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -81,6 +82,7 @@
- job-template:
name: '{name}-doxygen-publish'
+node: master # FIXME move to slave 'gallium'
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
@@ -184,8 +186,8 @@
- job:
name: 'mediawiki-core-code-coverage'
+node: master # FIXME move to slave 'gallium'
defaults: global
-
builders:
- wipe-workspace
- get-mw-core:
--
To view, visit https://gerrit.wikimedia.org/r/70402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I810823f84a289e6802c93d925c9907521e24ef28
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add default selector value - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70411
Change subject: Add default selector value
..
Add default selector value
Change-Id: I73a4c56a5ee53ccc69af9228331feb158db40447
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/70411/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index b0ad0e9..a589ac5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -890,6 +890,7 @@
},
runtime_parameters => $::site ? {
'esams' => ["prefer_ipv6=on"],
+ default => [],
},
directors => {
"backend" =>
$role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary],
--
To view, visit https://gerrit.wikimedia.org/r/70411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73a4c56a5ee53ccc69af9228331feb158db40447
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare the mobile cache manifests for the new servers - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Prepare the mobile cache manifests for the new servers
..
Prepare the mobile cache manifests for the new servers
Change-Id: Ifafbf51f5f3fb2accc81231bcb7a20fcf6d7c828
---
M manifests/role/cache.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 75a0bc0..b0ad0e9 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -854,8 +854,8 @@
nrpe
$storage_size_main = $::hostname ? {
- /^cp301[1-4]$/ => 300,
- default => 100,
+ /^cp104[1-4]$/ => 100,
+ default => 300,
}
if $cluster_tier == 1 {
--
To view, visit https://gerrit.wikimedia.org/r/70409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifafbf51f5f3fb2accc81231bcb7a20fcf6d7c828
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install cp104[67] and cp1059/cp1060 as mobile caches - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Install cp104[67] and cp1059/cp1060 as mobile caches
..
Install cp104[67] and cp1059/cp1060 as mobile caches
Change-Id: I851f678c4bde6d7407f783018ab0b4f6df616bc1
---
M manifests/site.pp
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index ed452d1..abd4de2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -376,6 +376,16 @@
include role::cache::parsoid
}
+node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet',
'cp1060.eqiad.wmnet' {
+ if $::hostname =~ /^cp104[67]$/ {
+ $ganglia_aggregator = true
+ }
+
+ interface_add_ip6_mapped { "main": }
+
+ include role::cache::mobile
+}
+
node /^cp300[12]\.esams\.wikimedia\.org$/ {
interface_aggregate { "bond0": orig_interface => "eth0", members => [
"eth0", "eth1" ] }
--
To view, visit https://gerrit.wikimedia.org/r/70410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I851f678c4bde6d7407f783018ab0b4f6df616bc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add default selector value - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add default selector value
..
Add default selector value
Change-Id: I73a4c56a5ee53ccc69af9228331feb158db40447
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index b0ad0e9..a589ac5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -890,6 +890,7 @@
},
runtime_parameters => $::site ? {
'esams' => ["prefer_ipv6=on"],
+ default => [],
},
directors => {
"backend" =>
$role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary],
--
To view, visit https://gerrit.wikimedia.org/r/70411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73a4c56a5ee53ccc69af9228331feb158db40447
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new mobile caches, remove old/nonexistant - change (operations/mediawiki-config)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/70412 Change subject: Add new mobile caches, remove old/nonexistant .. Add new mobile caches, remove old/nonexistant Change-Id: I3dfab7906ff157b7b53442c6f638efe8579b6709 --- M wmf-config/squid.php 1 file changed, 10 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/12/70412/1 diff --git a/wmf-config/squid.php b/wmf-config/squid.php index 84f1422..81f4845 100644 --- a/wmf-config/squid.php +++ b/wmf-config/squid.php @@ -196,34 +196,22 @@ '10.64.0.170', # cp1042 '208.80.154.53',# cp1043 '208.80.154.54',# cp1044 + '10.64.32.98', # cp1046 + '10.64.32.99', # cp1047 + '10.64.0.96', # cp1059 + '10.64.0.97', # cp1060 + + # esams + '91.198.174.81',# cp3011 + '91.198.174.82',# cp3012 + '91.198.174.83',# cp3013 + '91.198.174.84',# cp3014 # OTHERS - Currently unused..? '10.64.0.159', # cp1037 '10.64.0.160', # cp1038 '10.64.0.161', # cp1039 '10.64.0.162', # cp1040 - - '208.80.154.20',# cp1061 - '208.80.154.21',# cp1062 - '208.80.154.22',# cp1063 - '208.80.154.23',# cp1064 - '208.80.154.24',# cp1065 - '208.80.154.25',# cp1066 - '208.80.154.26',# cp1067 - '208.80.154.27',# cp1068 - '208.80.154.28',# cp1069 - '208.80.154.29',# cp1070 - '208.80.154.30',# cp1071 - '208.80.154.31',# cp1072 - '208.80.154.32',# cp1073 - '208.80.154.33',# cp1074 - '208.80.154.34',# cp1075 - '208.80.154.35',# cp1076 - '208.80.154.36',# cp1077 - '208.80.154.37',# cp1078 - '208.80.154.38',# cp1079 - '208.80.154.39',# cp1080 - '208.80.154.40',# cp1081 ); # IP addresses that aren't proxies, regardless of what the other sources might say -- To view, visit https://gerrit.wikimedia.org/r/70412 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dfab7906ff157b7b53442c6f638efe8579b6709 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mark Bergsma ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new mobile caches, remove old/nonexistant - change (operations/mediawiki-config)
Mark Bergsma has submitted this change and it was merged. Change subject: Add new mobile caches, remove old/nonexistant .. Add new mobile caches, remove old/nonexistant Change-Id: I3dfab7906ff157b7b53442c6f638efe8579b6709 --- M wmf-config/squid.php 1 file changed, 10 insertions(+), 22 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/squid.php b/wmf-config/squid.php index 84f1422..81f4845 100644 --- a/wmf-config/squid.php +++ b/wmf-config/squid.php @@ -196,34 +196,22 @@ '10.64.0.170', # cp1042 '208.80.154.53',# cp1043 '208.80.154.54',# cp1044 + '10.64.32.98', # cp1046 + '10.64.32.99', # cp1047 + '10.64.0.96', # cp1059 + '10.64.0.97', # cp1060 + + # esams + '91.198.174.81',# cp3011 + '91.198.174.82',# cp3012 + '91.198.174.83',# cp3013 + '91.198.174.84',# cp3014 # OTHERS - Currently unused..? '10.64.0.159', # cp1037 '10.64.0.160', # cp1038 '10.64.0.161', # cp1039 '10.64.0.162', # cp1040 - - '208.80.154.20',# cp1061 - '208.80.154.21',# cp1062 - '208.80.154.22',# cp1063 - '208.80.154.23',# cp1064 - '208.80.154.24',# cp1065 - '208.80.154.25',# cp1066 - '208.80.154.26',# cp1067 - '208.80.154.27',# cp1068 - '208.80.154.28',# cp1069 - '208.80.154.29',# cp1070 - '208.80.154.30',# cp1071 - '208.80.154.31',# cp1072 - '208.80.154.32',# cp1073 - '208.80.154.33',# cp1074 - '208.80.154.34',# cp1075 - '208.80.154.35',# cp1076 - '208.80.154.36',# cp1077 - '208.80.154.37',# cp1078 - '208.80.154.38',# cp1079 - '208.80.154.39',# cp1080 - '208.80.154.40',# cp1081 ); # IP addresses that aren't proxies, regardless of what the other sources might say -- To view, visit https://gerrit.wikimedia.org/r/70412 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3dfab7906ff157b7b53442c6f638efe8579b6709 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mark Bergsma Gerrit-Reviewer: Mark Bergsma Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase transcode timeout for 720p uploads > 1h - change (operations/puppet)
J has uploaded a new change for review. https://gerrit.wikimedia.org/r/70413 Change subject: Increase transcode timeout for 720p uploads > 1h .. Increase transcode timeout for 720p uploads > 1h Change-Id: Iafb1b5dcfaff99595d8d54cf4886627f0cefe7d0 --- M manifests/role/applicationserver.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/70413/1 diff --git a/manifests/role/applicationserver.pp b/manifests/role/applicationserver.pp index 27a572a..b9ca7a8 100644 --- a/manifests/role/applicationserver.pp +++ b/manifests/role/applicationserver.pp @@ -191,7 +191,7 @@ iprioprocs => 0, procs_per_iobound_type => 0, type => "webVideoTranscode", - timeout => 14400, + timeout => 28800, extra_args => "-v 0" } -- To view, visit https://gerrit.wikimedia.org/r/70413 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iafb1b5dcfaff99595d8d54cf4886627f0cefe7d0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: J ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix decomissioning - change (operations/puppet)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70414
Change subject: Fix decomissioning
..
Fix decomissioning
Commit de4926d3 silently changed all decomissioning.pp's double quotes
to single quotes, which broke the decomissioning shell script that
parses that. Adjust the shell script to only handle single quotes now.
Change-Id: I7acd666ef5abf76b3e6ee21b359bca283a565ac8
---
M templates/puppet/decom_servers.sh.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/70414/1
diff --git a/templates/puppet/decom_servers.sh.erb
b/templates/puppet/decom_servers.sh.erb
index 0cede89..8a82587 100644
--- a/templates/puppet/decom_servers.sh.erb
+++ b/templates/puppet/decom_servers.sh.erb
@@ -6,7 +6,7 @@
export PATH
-for srv in $(cut -d'"' -f 2 -s <%=
scope.lookupvar('puppetmaster::config::gitdir')
%>/operations/puppet/manifests/decommissioning.pp)
+for srv in $(cut -d"'" -f 2 -s <%=
scope.lookupvar('puppetmaster::config::gitdir')
%>/operations/puppet/manifests/decommissioning.pp)
do puppetstoredconfigclean.rb $srv.wikimedia.org
$srv.esams.wikimedia.org $srv.pmtpa.wmnet $srv.eqiad.wmnet > /dev/null
done
--
To view, visit https://gerrit.wikimedia.org/r/70414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7acd666ef5abf76b3e6ee21b359bca283a565ac8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix decomissioning - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: Fix decomissioning
..
Fix decomissioning
Commit de4926d3 silently changed all decomissioning.pp's double quotes
to single quotes, which broke the decomissioning shell script that
parses that. Adjust the shell script to only handle single quotes now.
Change-Id: I7acd666ef5abf76b3e6ee21b359bca283a565ac8
---
M templates/puppet/decom_servers.sh.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/puppet/decom_servers.sh.erb
b/templates/puppet/decom_servers.sh.erb
index 0cede89..8a82587 100644
--- a/templates/puppet/decom_servers.sh.erb
+++ b/templates/puppet/decom_servers.sh.erb
@@ -6,7 +6,7 @@
export PATH
-for srv in $(cut -d'"' -f 2 -s <%=
scope.lookupvar('puppetmaster::config::gitdir')
%>/operations/puppet/manifests/decommissioning.pp)
+for srv in $(cut -d"'" -f 2 -s <%=
scope.lookupvar('puppetmaster::config::gitdir')
%>/operations/puppet/manifests/decommissioning.pp)
do puppetstoredconfigclean.rb $srv.wikimedia.org
$srv.esams.wikimedia.org $srv.pmtpa.wmnet $srv.eqiad.wmnet > /dev/null
done
--
To view, visit https://gerrit.wikimedia.org/r/70414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7acd666ef5abf76b3e6ee21b359bca283a565ac8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
Gerrit-Reviewer: Faidon
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass the storage parameter to mobile frontends - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70415
Change subject: Pass the storage parameter to mobile frontends
..
Pass the storage parameter to mobile frontends
Change-Id: I34867b9db80aa22478d5abe624026dada656cf98
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/70415/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index a589ac5..81e40e3 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -936,6 +936,7 @@
extra_vcl => ["zero"],
port => 80,
admin_port => 6082,
+ storage => "-s malloc,${memory_storage_size}G",
directors => {
"backend" =>
$::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site],
},
--
To view, visit https://gerrit.wikimedia.org/r/70415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34867b9db80aa22478d5abe624026dada656cf98
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass the storage parameter to mobile frontends - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Pass the storage parameter to mobile frontends
..
Pass the storage parameter to mobile frontends
Change-Id: I34867b9db80aa22478d5abe624026dada656cf98
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index a589ac5..81e40e3 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -936,6 +936,7 @@
extra_vcl => ["zero"],
port => 80,
admin_port => 6082,
+ storage => "-s malloc,${memory_storage_size}G",
directors => {
"backend" =>
$::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site],
},
--
To view, visit https://gerrit.wikimedia.org/r/70415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34867b9db80aa22478d5abe624026dada656cf98
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Making calendar names translatable - change (mediawiki...DataValues)
jenkins-bot has submitted this change and it was merged.
Change subject: Making calendar names translatable
..
Making calendar names translatable
(bug 49080) Calendar names used in the TimeValue can be translated now.
Change-Id: Id3dd2ac6f57017ecd686f0ba0f8c261fee13f96f
---
M DataValues/resources/time.js/src/time.Parser.js
M DataValues/resources/time.js/src/time.Time.js
M DataValues/resources/time.js/src/time.js
M ValueView/ValueView.i18n.php
M ValueView/ValueView.resources.php
M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeValue.js
7 files changed, 62 insertions(+), 46 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataValues/resources/time.js/src/time.Parser.js
b/DataValues/resources/time.js/src/time.Parser.js
index 8179a52..24b1b0e 100644
--- a/DataValues/resources/time.js/src/time.Parser.js
+++ b/DataValues/resources/time.js/src/time.Parser.js
@@ -338,10 +338,10 @@
}
function readAsCalendar( word, settings ) {
- for( var i = 0; i < settings.calendarnames.length; i++ ) {
- for( var j = 0; j < settings.calendarnames[i].length;
j++ ) {
- if( settings.calendarnames[i][j].toLowerCase()
=== word.toLowerCase() ) {
- return settings.calendarnames[i][0];
+ for( var calendarKey in settings.calendarnames ) {
+ for( var i = 0; i <
settings.calendarnames[calendarKey].length; i++ ) {
+ if(
settings.calendarnames[calendarKey][i].toLowerCase() === word.toLowerCase() ) {
+ return calendarKey;
}
}
}
diff --git a/DataValues/resources/time.js/src/time.Time.js
b/DataValues/resources/time.js/src/time.Time.js
index 7bf858d..21ecb39 100644
--- a/DataValues/resources/time.js/src/time.Time.js
+++ b/DataValues/resources/time.js/src/time.Time.js
@@ -140,7 +140,7 @@
}
};
- this.calendarText = function() {
+ this.calendar = function() {
return calendarname;
};
diff --git a/DataValues/resources/time.js/src/time.js
b/DataValues/resources/time.js/src/time.js
index ade68ed..5b3cac2 100644
--- a/DataValues/resources/time.js/src/time.js
+++ b/DataValues/resources/time.js/src/time.js
@@ -23,13 +23,10 @@
settings.ace = ['CE', 'AD', 'A.D.', 'Anno Domini', 'Common Era'];
settings.pasttext = '% ago';
settings.futuretext = 'in %';
- settings.calendarnames = [];
- settings.calendarnames[0] = [
- 'Gregorian', 'G', 'GD', 'GC', 'NS', 'N.S.', 'New Style',
'Gregorian calendar', 'Gregorian date'
- ];
- settings.calendarnames[1] = [
- 'Julian', 'J', 'JD', 'JC', 'OS', 'O.S.', 'Old Style', 'Julian
calendar', 'Julian date'
- ];
+ settings.calendarnames = {
+ 'Gregorian': [ 'Gregorian', 'G', 'GD', 'GC', 'NS', 'N.S.', 'New
Style', 'Gregorian calendar', 'Gregorian date' ],
+ 'Julian': [ 'Julian', 'J', 'JD', 'JC', 'OS', 'O.S.', 'Old
Style', 'Julian calendar', 'Julian date' ]
+ };
settings.daybeforemonth = true;
settings.monthnames = [
diff --git a/ValueView/ValueView.i18n.php b/ValueView/ValueView.i18n.php
index 98b9f32..906b60c 100644
--- a/ValueView/ValueView.i18n.php
+++ b/ValueView/ValueView.i18n.php
@@ -48,11 +48,17 @@
// CoordinateInput expert:
'valueview-expert-globecoordinateinput-precision' => 'Precision:',
+ // TimeValue expert:
+ 'valueview-expert-timevalue-calendar-gregorian' => 'Gregorian',
+ 'valueview-expert-timevalue-calendar-julian' => 'Julian',
+
// TimeInput expert:
'valueview-expert-timeinput-precision' => 'Precision:',
'valueview-expert-timeinput-calendar' => 'Calendar:',
- 'valueview-expert-timeinput-calendarhint' => '($1 calendar)',
- 'valueview-expert-timeinput-calendarhint-switch' => '→ change to
$1',
+ 'valueview-expert-timeinput-calendarhint-gregorian' => '(Gregorian
calendar)',
+ 'valueview-expert-timeinput-calendarhint-julian' => '(Julian calendar)',
+ 'valueview-expert-timeinput-calendarhint-switch-gregorian' => '→
change to Gregorian',
+ 'valueview-expert-timeinput-calendarhint-switch-julian' => '→
change to Julian',
'valueview-preview-label' => 'will be displayed as:',
'valueview-preview-novalue' => 'no valid value recognized',
@@ -80,21 +86,17 @@
'valueview-expert-emptyvalue-empty' => 'Message expressing that there
is currently no value set in a jQuery valueview.
{{Identical|Empty}}',
'valueview-expert-glo
[MediaWiki-commits] [Gerrit] Update jquery.ime from upstream - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.ime from upstream
..
Update jquery.ime from upstream
Version: v0.1.0+20130625
* Add sa-iast input method
* Fix bug https://github.com/wikimedia/jquery.ime/issues/188
Bug: 49515
Change-Id: I8ebd5bc4857285eb29d0ec6741cc6953ac187722
---
M lib/jquery.ime/jquery.ime.js
A lib/jquery.ime/rules/sa/sa-iast.js
2 files changed, 76 insertions(+), 4 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 148f09c..f252ba5 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20130624
+/*! jquery.ime - v0.1.0+20130625
* https://github.com/wikimedia/jquery.ime
* Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
@@ -666,7 +666,9 @@
* @param {jQuery.Event} e
*/
keydown: function ( e ) {
- var ime = $( e.target ).data( 'ime' );
+ var ime = $( e.target ).data( 'ime' ),
+ firstInputmethod,
+ languageCode;
this.focus(); // shows the trigger in case it is hidden
@@ -677,7 +679,14 @@
if ( this.inputmethod !== null ) {
this.selectIM(
this.inputmethod.id );
} else {
- this.selectLanguage(
this.decideLanguage() );
+ languageCode =
this.decideLanguage();
+ this.selectLanguage(
languageCode );
+ if ( !ime.isActive() &&
$.ime.languages[languageCode] ) {
+ // Even after pressing
toggle shortcut again, it is still disabled
+ // Provide the default
input method in this case.
+ firstInputmethod =
$.ime.languages[languageCode].inputmethods[0];
+ this.selectIM(
firstInputmethod );
+ }
}
}
@@ -1610,6 +1619,10 @@
name: 'yawerty',
source: 'rules/ru/ru-yawerty.js'
},
+ 'sa-iast': {
+ name: 'Romanized',
+ source: 'rules/sa/sa-iast.js'
+ },
'sa-inscript': {
name: 'इनस्क्रिप्ट',
source: 'rules/sa/sa-inscript.js'
@@ -1903,7 +1916,7 @@
},
'sa': {
autonym: 'संस्कृत',
- inputmethods: [ 'sa-transliteration', 'sa-inscript2',
'sa-inscript' ]
+ inputmethods: [ 'sa-transliteration', 'sa-inscript2',
'sa-inscript', 'sa-iast' ]
},
'sat': {
autonym: 'संताली',
diff --git a/lib/jquery.ime/rules/sa/sa-iast.js
b/lib/jquery.ime/rules/sa/sa-iast.js
new file mode 100644
index 000..9a22b41
--- /dev/null
+++ b/lib/jquery.ime/rules/sa/sa-iast.js
@@ -0,0 +1,59 @@
+( function ( $ ) {
+ 'use strict';
+
+ var saIast = {
+ id: 'sa-iast',
+ name: 'Romanized',
+ description: 'Romanized input method for Sanskrit with IAST/ISO
15919 convention. Original author William Giddings ',
+ date: '2013-03-18',
+ URL: 'http://github.com/wikimedia/jquery.ime',
+ author: 'Runa Bhattacharjee',
+ license: 'GPLv3',
+ version: '1.0',
+ contextLength: 0,
+ maxKeyLength: 2,
+ patterns: [
+ ['aa', 'ā'],
+ ['AA', 'Ā'],
+ ['\\^a', 'â'],
+ ['\\^A', 'Â'],
+ ['ii', 'ī'],
+ ['II', 'Ī'],
+ ['uu', 'ū'],
+ ['UU', 'Ū'],
+ [
[MediaWiki-commits] [Gerrit] Enabling to specify time values in time output formats - change (mediawiki...DataValues)
jenkins-bot has submitted this change and it was merged.
Change subject: Enabling to specify time values in time output formats
..
Enabling to specify time values in time output formats
(bug 48675) Time values can now be specified in the same formats that are used
to
output values whose precision is greater than "year".
Change-Id: I370a3709cb28e2537f597dc69e74eb500163efd3
---
M DataValues/resources/time.js/src/time.Parser.js
M DataValues/resources/time.js/src/time.js
M DataValues/resources/time.js/tests/time.validTimeDefinitions.js
3 files changed, 87 insertions(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataValues/resources/time.js/src/time.Parser.js
b/DataValues/resources/time.js/src/time.Parser.js
index 24b1b0e..ea6abc3 100644
--- a/DataValues/resources/time.js/src/time.Parser.js
+++ b/DataValues/resources/time.js/src/time.Parser.js
@@ -49,6 +49,14 @@
Parser.prototype.parse = function( text ) {
// TODO: instead of injecting settings, the parser should
properly set up its own tokenizer
// instance once such an object is available.
+
+ // Checking if the input text matches an output precision
before analyzing the input text
+ // character by character:
+ var reconverted = this._reconvertOutputString( text );
+ if( reconverted !== false ) {
+ return reconverted;
+ }
+
var tokens = tokenize( text, this._settings ),
retval = {},
grammars = getGrammars( this._settings.daybeforemonth ),
@@ -115,6 +123,48 @@
};
/**
+* Analyzes a string if it is a time value that has been specified in
one of the output
+* precision formats specified in the settings. If so, this method
re-converts such an output
+* string to an object that can be used to instantiate a time.Time
object.
+*
+* @param {string} string
+* @return {Object|false}
+*/
+ Parser.prototype._reconvertOutputString = function( string ) {
+ for( var precisionIndex in this._settings.outputprecision ) {
+ var regExp = new RegExp(
+ '^\\s*([^\\d\\s]*|)\\s*'
+ +
this._settings.outputprecision[precisionIndex].replace( /%/, '(\\d+)' )
+ + '\\s*([^\\d\\s]*|)\\s*$'
+ );
+
+ if( regExp.test( string ) ) {
+ var matches = string.match( regExp ),
+ significant = matches[2],
+ year = significant *
this._settings.outputprecisionFactors[precisionIndex],
+ bceIndicators = [
+ this._settings.bce[0],
+
this._settings.pasttext.replace( /( |%)/g, '' )
+ ];
+
+ for( var i in bceIndicators ) {
+ if( matches[1] === bceIndicators[i] ||
matches[3] === bceIndicators[i] ) {
+ year *= -1;
+ }
+ }
+
+ return {
+ year: year,
+ precision: parseInt( precisionIndex, 10
),
+ calendarname:
time.Time.CALENDAR.GREGORIAN
+ };
+ }
+ }
+
+ return false;
+ };
+
+ /**
* Returns an array of grammars which should be used.
*
* @param {boolean} daybeforemonth Whether the day is usually written
before the month.
diff --git a/DataValues/resources/time.js/src/time.js
b/DataValues/resources/time.js/src/time.js
index 5b3cac2..0048dce 100644
--- a/DataValues/resources/time.js/src/time.js
+++ b/DataValues/resources/time.js/src/time.js
@@ -74,6 +74,23 @@
'%0s'
];
+ /**
+* Factors correlating to settings.outputprecision. These are use when
detecting and
+* re-converting input specified in one of the formats specified in
outputprecisions.
+* @type {number[]}
+*/
+ settings.outputprecisionFactors = [
+ 10,
+ 1,
+ 1000,
+ 100,
+ 10,
+ 1,
+ 1000,
+ 100,
+ 10
+ ];
+
var maxPrecision = function() {
return 14;
};
diff --git a/DataValues/resources/time.j
[MediaWiki-commits] [Gerrit] Temporarily split the mobile cluster in old and new - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70416
Change subject: Temporarily split the mobile cluster in old and new
..
Temporarily split the mobile cluster in old and new
The new machines use a much higher chash weight, and would
otherwise get the vast majority of requests on an empty cache.
This lets us split the traffic between old/new with PyBal.
Change-Id: Iad2c046d91ff7ef5831717e9e298c8cad56093e2
---
M manifests/role/cache.pp
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/70416/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 81e40e3..893e0c4 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -187,7 +187,9 @@
},
"mobile" => {
"pmtpa" => [],
- "eqiad" => ["cp1041.eqiad.wmnet",
"cp1042.eqiad.wmnet", "cp1043.wikimedia.org", "cp1044.wikimedia.org"],
+ # FIXME: remove after migration
+ "eqiad-old" => ["cp1041.eqiad.wmnet",
"cp1042.eqiad.wmnet", "cp1043.wikimedia.org", "cp1044.wikimedia.org"],
+ 'eqiad' => ['cp1046.eqiad.wmnet',
'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet', 'cp1060.eqiad.wmnet'],
"esams" =>
['cp3011.esams.wikimedia.org', 'cp3012.esams.wikimedia.org',
'cp3013.esams.wikimedia.org', 'cp3014.esams.wikimedia.org'],
},
"parsoid" => {
@@ -874,6 +876,11 @@
} else {
class { "varnish::htcppurger": varnish_instances => [
"127.0.0.1:80", "127.0.0.1:3128" ] }
}
+ # FIXME: remove after migration
+ $suffix = $::hostname ? {
+ /^cp104[1-4]$/ => "-old",
+ default => "",
+ }
varnish::instance { "mobile-backend":
name => "",
@@ -938,7 +945,7 @@
admin_port => 6082,
storage => "-s malloc,${memory_storage_size}G",
directors => {
- "backend" =>
$::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site],
+ "backend" =>
$::role::cache::configuration::active_nodes[$::realm]['mobile']["${::site}${suffix}"],
},
director_options => {
'retries' => $backend_weight *
size($::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site]),
--
To view, visit https://gerrit.wikimedia.org/r/70416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad2c046d91ff7ef5831717e9e298c8cad56093e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Temporarily split the mobile cluster in old and new - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Temporarily split the mobile cluster in old and new
..
Temporarily split the mobile cluster in old and new
The new machines use a much higher chash weight, and would
otherwise get the vast majority of requests on an empty cache.
This lets us split the traffic between old/new with PyBal.
Change-Id: Iad2c046d91ff7ef5831717e9e298c8cad56093e2
---
M manifests/role/cache.pp
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 81e40e3..893e0c4 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -187,7 +187,9 @@
},
"mobile" => {
"pmtpa" => [],
- "eqiad" => ["cp1041.eqiad.wmnet",
"cp1042.eqiad.wmnet", "cp1043.wikimedia.org", "cp1044.wikimedia.org"],
+ # FIXME: remove after migration
+ "eqiad-old" => ["cp1041.eqiad.wmnet",
"cp1042.eqiad.wmnet", "cp1043.wikimedia.org", "cp1044.wikimedia.org"],
+ 'eqiad' => ['cp1046.eqiad.wmnet',
'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet', 'cp1060.eqiad.wmnet'],
"esams" =>
['cp3011.esams.wikimedia.org', 'cp3012.esams.wikimedia.org',
'cp3013.esams.wikimedia.org', 'cp3014.esams.wikimedia.org'],
},
"parsoid" => {
@@ -874,6 +876,11 @@
} else {
class { "varnish::htcppurger": varnish_instances => [
"127.0.0.1:80", "127.0.0.1:3128" ] }
}
+ # FIXME: remove after migration
+ $suffix = $::hostname ? {
+ /^cp104[1-4]$/ => "-old",
+ default => "",
+ }
varnish::instance { "mobile-backend":
name => "",
@@ -938,7 +945,7 @@
admin_port => 6082,
storage => "-s malloc,${memory_storage_size}G",
directors => {
- "backend" =>
$::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site],
+ "backend" =>
$::role::cache::configuration::active_nodes[$::realm]['mobile']["${::site}${suffix}"],
},
director_options => {
'retries' => $backend_weight *
size($::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site]),
--
To view, visit https://gerrit.wikimedia.org/r/70416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad2c046d91ff7ef5831717e9e298c8cad56093e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for renaming Redis commands to the redis class - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Add support for renaming Redis commands to the redis class
..
Add support for renaming Redis commands to the redis class
Change-Id: Ifc726cb49765609507882aa9b4065d8dea6fe4ef
---
M modules/redis/manifests/init.pp
M modules/redis/templates/redis.conf.erb
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/redis/manifests/init.pp b/modules/redis/manifests/init.pp
index 78fb508..dfe8e98 100644
--- a/modules/redis/manifests/init.pp
+++ b/modules/redis/manifests/init.pp
@@ -7,6 +7,7 @@
$maxmemory_samples = 5,
$persist = "rdb", # [ rdb, aof, both ]
$redis_options = {},
+ $rename_commands = {},
$redis_replication = undef,
$package = "redis-server",
$package_version = "present",
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index 8cbabcb..337f99e 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -258,6 +258,10 @@
#
# rename-command CONFIG ""
+<% rename_commands.sort.each do |command, renamed_to| -%>
+rename-command <%= command %> "<%= renamed_to %>"
+<% end -%>
+
### LIMITS
# Set the max number of connected clients at the same time. By default
@@ -550,7 +554,7 @@
##
# Anything passed into redis_options ( i.e. { "save" => "20 1" } ) will
# appear here and override the above
-<% redis_options.each_pair do |option,value| -%>
+<% redis_options.sort.each do |option, value| -%>
<%= option %> <%= value %>
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/70064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc726cb49765609507882aa9b4065d8dea6fe4ef
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Asher
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Ryan Lane
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add initial role for redis server for tool labs - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Add initial role for redis server for tool labs
..
Add initial role for redis server for tool labs
Change-Id: I016fc22752980224d083bc8aec5fc9d6f8f9dca5
---
M manifests/role/labs.pp
M manifests/role/labsbeta.pp
A modules/toollabs/manifests/redis.pp
3 files changed, 45 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 97e6864..0d6cf65 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -61,6 +61,10 @@
class { 'toollabs::syslog': }
}
+ class redis inherits role::labs::tools::config {
+system_role { "role::labs::tools::redis": description => "Server that
hosts shared Redis instance" }
+class { 'toollabs::redis': }
+ }
} # class role::labs::tools
diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
index c5343dc..10d54d7 100644
--- a/manifests/role/labsbeta.pp
+++ b/manifests/role/labsbeta.pp
@@ -61,6 +61,10 @@
class { 'toollabs::syslog': }
}
+ class redis inherits role::labs::toolsbeta::config {
+system_role { "role::labs::toolsbeta::redis": description => "Server that
hosts shared Redis instance" }
+class { 'toollabs::redis': }
+ }
} # class role::labs::tools
diff --git a/modules/toollabs/manifests/redis.pp
b/modules/toollabs/manifests/redis.pp
new file mode 100644
index 000..e7e44c0
--- /dev/null
+++ b/modules/toollabs/manifests/redis.pp
@@ -0,0 +1,37 @@
+# Class: toollabs::execnode
+#
+# This role sets up a redis node for use by tool-labs
+# Restricts usage of certain commands, to prevent
+# people from trampling on others' keys
+# Uses default amount of RAM (1G) specified by redis class
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class toollabs::redis inherits toollabs {
+include toollabs::infrastructure
+
+class { '::redis':
+persist => "aof",
+dir => "/var/lib/redis",
+# Disable the following commands, to try to limit people from
+# Trampling on each others' keys
+rename_commands => {
+"CONFIG" => "",
+"FLUSHALL" => "",
+"FLUSHDB"=> "",
+"KEYS" => "",
+"SHUTDOWN" => "",
+"SLAVEOF"=> "",
+"CLIENT" => "",
+"RANDOMKEY" => "",
+"DEBUG" => ""
+},
+monitor => false # Monitoring isn't setup for labs / tool labs, IIRC
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/70212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I016fc22752980224d083bc8aec5fc9d6f8f9dca5
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Ryan Lane
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nrpe: revert to the nagios user/paths, clean up - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: nrpe: revert to the nagios user/paths, clean up
..
nrpe: revert to the nagios user/paths, clean up
There's no reason that I can see to modify init scripts and config files
all over the place to make nrpe run as the "icinga" user and from
/etc/icinga/nrpe.d rather than the nagios user & paths that the package
installs. There's also no reason to modify nrpe.cfg when there's
nrpe_local.cfg.
Clean all that up, revert to the stock init script & nrpe.cfg and leave
a comment to remove all that calls when puppet has been run everywhere.
This does *not*: rm -rf /etc/icinga, deluser icinga, delgroup icinga, rm
-rf /home/icinga (previously left), as it would also affect neon and
there's no good way to do this in puppet. Left for laters :)
Change-Id: I0e5b55e497c34806426742f002db0631aa006e67
---
M files/icinga/nagios-nrpe-server-init
M files/icinga/nrpe.cfg
M manifests/nrpe.pp
M templates/icinga/nrpe_local.cfg.erb
4 files changed, 35 insertions(+), 37 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/icinga/nagios-nrpe-server-init
b/files/icinga/nagios-nrpe-server-init
index 1af139a..c0e62c2 100755
--- a/files/icinga/nagios-nrpe-server-init
+++ b/files/icinga/nagios-nrpe-server-init
@@ -17,8 +17,8 @@
DAEMON=/usr/sbin/nrpe
NAME=nagios-nrpe
DESC=nagios-nrpe
-CONFIG=/etc/icinga/nrpe.cfg
-PIDDIR=/var/run/icinga
+CONFIG=/etc/nagios/nrpe.cfg
+PIDDIR=/var/run/nagios
test -x $DAEMON || exit 0
@@ -43,7 +43,7 @@
#since /var/run can be wiped completly we create our run directory here
if [ ! -d "$PIDDIR" ]; then
mkdir "$PIDDIR"
- chown icinga "$PIDDIR"
+ chown nagios "$PIDDIR"
fi
set -e
@@ -59,14 +59,12 @@
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
-start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
--retry 15
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
--retry 15
log_end_msg $?
-#sometimes deleting the pidfile fails. cleanup afterwards.
-test -e $PIDDIR/nrpe.pid && rm $PIDDIR/nrpe.pid
;;
reload|force-reload)
log_daemon_msg "Reloading $DESC configuration files" "$NAME"
-start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
+ start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
log_end_msg $?
;;
status)
@@ -74,7 +72,7 @@
;;
restart)
$0 stop
- sleep 15
+ sleep 1
$0 start
;;
*)
diff --git a/files/icinga/nrpe.cfg b/files/icinga/nrpe.cfg
index 010ab9d..40c9e10 100644
--- a/files/icinga/nrpe.cfg
+++ b/files/icinga/nrpe.cfg
@@ -2,6 +2,7 @@
# Sample NRPE Config File
# Written by: Ethan Galstad (nag...@nagios.org)
#
+# Last Modified: 11-23-2007
#
# NOTES:
# This is a sample configuration file for the NRPE daemon. It needs to be
@@ -22,7 +23,7 @@
# number. The file is only written if the NRPE daemon is started by the root
# user and is running in standalone mode.
-pid_file=/var/run/icinga/nrpe.pid
+pid_file=/var/run/nagios/nrpe.pid
@@ -50,7 +51,7 @@
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-nrpe_user=icinga
+nrpe_user=nagios
@@ -75,8 +76,8 @@
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-allowed_hosts=127.0.0.1,208.80.154.14,208.80.152.161
-
+allowed_hosts=127.0.0.1
+
# COMMAND ARGUMENT PROCESSING
@@ -216,11 +217,10 @@
#
# local configuration:
# if you'd prefer, you can instead place directives here
-include=/etc/icinga/nrpe_local.cfg
+include=/etc/nagios/nrpe_local.cfg
#
# you can place your config snipplets into nrpe.d/
+# only snipplets ending in .cfg will get included
include_dir=/etc/nagios/nrpe.d/
-include_dir=/etc/icinga/nrpe.d/
-
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index e2ccc3f..de9373a 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -11,7 +11,7 @@
define nrpe::check($command) {
Class[nrpe::packages] -> Nrpe::Check[$title]
- file { "/etc/icinga/nrpe.d/${title}.cfg":
+ file { "/etc/nagios/nrpe.d/${title}.cfg":
owner => root,
group => root,
mode => 0444,
@@ -77,6 +77,24 @@
ensure => present;
}
+ file { "/etc/nagios/nrpe_local.cfg":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0444,
+ content => template("icinga/nrpe_local.cfg.erb"),
+ require => Package[nagios-nrpe-server],
+ }
+
+ file { "/usr/lib/nagios/plugins/check_dpkg":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0555,
+ source => "puppet:///files/icinga/chec
[MediaWiki-commits] [Gerrit] Remove unused, empty memcached-sasl class - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Remove unused, empty memcached-sasl class
..
Remove unused, empty memcached-sasl class
No current plans of using memcached-sasl, so can be killed
Change-Id: I4673a6465255a77de98c8312cf114bab8a72e122
---
D modules/toollabs/manifests/memcachesasl.pp
1 file changed, 0 insertions(+), 18 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/memcachesasl.pp
b/modules/toollabs/manifests/memcachesasl.pp
deleted file mode 100644
index c203f36..000
--- a/modules/toollabs/manifests/memcachesasl.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: toollabs::memcachesasl
-#
-# This role sets up a memcache with sasl
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::memcachesasl inherits toollabs {
- include toollabs::infrastructure
-
- #TODO: memcache config
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/70103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4673a6465255a77de98c8312cf114bab8a72e122
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Petrb
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nrpe: don't require/subscribe on the same resource - change (operations/puppet)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70418
Change subject: nrpe: don't require/subscribe on the same resource
..
nrpe: don't require/subscribe on the same resource
Also, no point in requiring check_dpkg altogether. Well, no point in
requiring anything really, since there's a Class dependency, but maybe
this will go away later so let's leave it at that.
Change-Id: I01e02eba8853724790472ddcd7592cc27607873b
---
M manifests/nrpe.pp
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/70418/1
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index de9373a..86d6c0e 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -126,12 +126,12 @@
class nrpe::service {
Class[nrpe::packages] -> Class[nrpe::service]
- service { nagios-nrpe-server:
- require => [ Package[nagios-nrpe-server],
File["/etc/nagios/nrpe_local.cfg"], File["/usr/lib/nagios/plugins/check_dpkg"]
],
- subscribe => File["/etc/nagios/nrpe_local.cfg"],
+ service { 'nagios-nrpe-server':
+ ensure => running,
pattern => "/usr/sbin/nrpe",
hasrestart => true,
restart => "killall nrpe; sleep 2;
/etc/init.d/nagios-nrpe-server start",
- ensure => running;
+ require => Package['nagios-nrpe-server'],
+ subscribe => File['/etc/nagios/nrpe_local.cfg'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/70418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01e02eba8853724790472ddcd7592cc27607873b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nrpe: don't require/subscribe on the same resource - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: nrpe: don't require/subscribe on the same resource
..
nrpe: don't require/subscribe on the same resource
Also, no point in requiring check_dpkg altogether. Well, no point in
requiring anything really, since there's a Class dependency, but maybe
this will go away later so let's leave it at that.
Change-Id: I01e02eba8853724790472ddcd7592cc27607873b
---
M manifests/nrpe.pp
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index de9373a..86d6c0e 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -126,12 +126,12 @@
class nrpe::service {
Class[nrpe::packages] -> Class[nrpe::service]
- service { nagios-nrpe-server:
- require => [ Package[nagios-nrpe-server],
File["/etc/nagios/nrpe_local.cfg"], File["/usr/lib/nagios/plugins/check_dpkg"]
],
- subscribe => File["/etc/nagios/nrpe_local.cfg"],
+ service { 'nagios-nrpe-server':
+ ensure => running,
pattern => "/usr/sbin/nrpe",
hasrestart => true,
restart => "killall nrpe; sleep 2;
/etc/init.d/nagios-nrpe-server start",
- ensure => running;
+ require => Package['nagios-nrpe-server'],
+ subscribe => File['/etc/nagios/nrpe_local.cfg'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/70418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01e02eba8853724790472ddcd7592cc27607873b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
Gerrit-Reviewer: Faidon
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Always use capitalized DBKey for $file - change (mediawiki...TimedMediaHandler)
J has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70419
Change subject: Always use capitalized DBKey for $file
..
Always use capitalized DBKey for $file
Independend of $wgCapitalLinkOverrides, $wgCapitalLinks
always use capitalized $file->getTitle()->getDBKey()
since it is shared between sites that dont have the
same $wgCapitalLinks settings.
Change-Id: I094cd0f9570986ffdc3f661ca9beb1b489f50183
---
M WebVideoTranscode/WebVideoTranscode.php
M WebVideoTranscode/WebVideoTranscodeJob.php
2 files changed, 25 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/19/70419/1
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index 54675f9..1e17d91 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -357,7 +357,7 @@
wfDebug("source cache miss\n");
}
- wfDebug("Get Video sources from remote api for " .
$file->getTitle()->getDBKey() . "\n");
+ wfDebug("Get Video sources from remote api for " .
self::getDBKey( $file->getTitle() ) . "\n");
$query = array(
'action' => 'query',
'prop' => 'videoinfo',
@@ -532,6 +532,21 @@
}
/**
+* Get capitalized DBKey for $title
+*
+* independend of $wgCapitalLinkOverrides, $wgCapitalLinks
+* always return capitalized DBKey since it is shared between
+* sites that dont have the same $wgCapitalLinks settings.
+*
+* @param {Object} Title object
+* @return string
+*/
+ public static function getDBKey( $title ) {
+ global $wgContLang;
+ return $wgContLang->ucfirst( $title->getDBKey() );
+ }
+
+ /**
* Populates the transcode table with the current DB state of transcodes
* if transcodes are not found in the database their state is set to
"false"
*
@@ -539,7 +554,7 @@
*/
public static function getTranscodeState( $file, $db = false ){
global $wgTranscodeBackgroundTimeLimit;
- $fileName = $file->getTitle()->getDbKey();
+ $fileName = self::getDBKey( $file->getTitle() );
if( ! isset( self::$transcodeState[$fileName] ) ){
wfProfileIn( __METHOD__ );
if ( $db === false ) {
@@ -608,7 +623,7 @@
// Remove any existing files ( regardless of their
state )
$res = $file->repo->getMasterDB()->select( 'transcode',
array( 'transcode_key' ),
- array( 'transcode_image_name' =>
$file->getTitle()->getDBKey() )
+ array( 'transcode_image_name' =>
self::getDBKey( $file->getTitle() ) )
);
$removeKeys = array();
foreach( $res as $transcodeRow ){
@@ -631,7 +646,8 @@
// Build the sql query:
$dbw = wfGetDB( DB_MASTER );
- $deleteWhere = array( 'transcode_image_name' =>
$file->getTitle()->getDBkey() );
+ $titleObj = $file->getTitle();
+ $deleteWhere = array( 'transcode_image_name' => self::getDBKey(
$titleObj ) );
// Check if we are removing a specific transcode key
if( $transcodeKey !== false ){
$deleteWhere['transcode_key'] = $transcodeKey;
@@ -640,7 +656,6 @@
$dbw->delete( 'transcode', $deleteWhere, __METHOD__ );
// Purge the cache for pages that include this video:
- $titleObj = $file->getTitle();
self::invalidatePagesWithFile( $titleObj );
// Remove from local WebVideoTranscode cache:
diff --git a/WebVideoTranscode/WebVideoTranscodeJob.php
b/WebVideoTranscode/WebVideoTranscodeJob.php
index 094c8d9..8ddeef1 100644
--- a/WebVideoTranscode/WebVideoTranscodeJob.php
+++ b/WebVideoTranscode/WebVideoTranscodeJob.php
@@ -101,7 +101,7 @@
'transcode_error' => $error
),
array(
- 'transcode_image_name' =>
$this->title->getDBkey(),
+ 'transcode_image_name' =>
WebVideoTranscode::getDBkey( $this->title ),
'transcode_key' => $transcodeKey
),
__METHOD__,
@@ -155,7 +155,7 @@
// Check if we have "already started" the transcode ( possible
error )
$dbStartTime = $dbw->selectField( 'transcode',
'transcode_time_startwork',
[MediaWiki-commits] [Gerrit] Update ganglia aggregators for parsoid/mobile caches - change (operations/puppet)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/70420 Change subject: Update ganglia aggregators for parsoid/mobile caches .. Update ganglia aggregators for parsoid/mobile caches Change-Id: If4b364c1ebf2348d6ad0bb31dc5a200f9c38599c --- M manifests/ganglia.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/70420/1 diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp index 0270d57..786e1de 100644 --- a/manifests/ganglia.pp +++ b/manifests/ganglia.pp @@ -303,7 +303,7 @@ "MySQL eqiad" => "db1017.eqiad.wmnet db1021.eqiad.wmnet", "LVS loadbalancers eqiad" => "lvs1001.wikimedia.org lvs1002.wikimedia.org", "Miscellaneous eqiad" => "carbon.wikimedia.org ms1004.eqiad.wmnet", - "Mobile caches eqiad" => "cp1043.wikimedia.org cp1044.wikimedia.org", + "Mobile caches eqiad" => "cp1046.wikimedia.org cp1047.wikimedia.org", "Bits caches eqiad" => "arsenic.wikimedia.org niobium.wikimedia.org", "Upload caches eqiad" => "cp1021.eqiad.wmnet cp1022.eqiad.wmnet", "SSL cluster eqiad" => "ssl1001.wikimedia.org ssl1002.wikimedia.org", @@ -322,7 +322,7 @@ "Upload caches esams" => "hooft.esams.wikimedia.org:11671 cp3003.esams.wikimedia.org cp3004.esams.wikimedia.org", "Ceph cluster esams" => "ms-be3001.esams.wikimedia.org ms-be3002.esams.wikimedia.org", "Parsoid eqiad" => "wtp1001.eqiad.wmnet", - "Parsoid Varnish eqiad" => "cerium.wikimedia.org", + "Parsoid Varnish eqiad" => "cp1045.eqiad.wmnet cp1058.eqiad.wmnet", "Redis eqiad" => "rdb1001.eqiad.wmnet rdb1002.eqiad.wmnet", "Labs NFS cluster pmtpa" => "labstore3.pmtpa.wmnet labstore4.pmtpa.wmnet", } -- To view, visit https://gerrit.wikimedia.org/r/70420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4b364c1ebf2348d6ad0bb31dc5a200f9c38599c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ganglia aggregators for parsoid/mobile caches - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged. Change subject: Update ganglia aggregators for parsoid/mobile caches .. Update ganglia aggregators for parsoid/mobile caches Change-Id: If4b364c1ebf2348d6ad0bb31dc5a200f9c38599c --- M manifests/ganglia.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp index 0270d57..786e1de 100644 --- a/manifests/ganglia.pp +++ b/manifests/ganglia.pp @@ -303,7 +303,7 @@ "MySQL eqiad" => "db1017.eqiad.wmnet db1021.eqiad.wmnet", "LVS loadbalancers eqiad" => "lvs1001.wikimedia.org lvs1002.wikimedia.org", "Miscellaneous eqiad" => "carbon.wikimedia.org ms1004.eqiad.wmnet", - "Mobile caches eqiad" => "cp1043.wikimedia.org cp1044.wikimedia.org", + "Mobile caches eqiad" => "cp1046.wikimedia.org cp1047.wikimedia.org", "Bits caches eqiad" => "arsenic.wikimedia.org niobium.wikimedia.org", "Upload caches eqiad" => "cp1021.eqiad.wmnet cp1022.eqiad.wmnet", "SSL cluster eqiad" => "ssl1001.wikimedia.org ssl1002.wikimedia.org", @@ -322,7 +322,7 @@ "Upload caches esams" => "hooft.esams.wikimedia.org:11671 cp3003.esams.wikimedia.org cp3004.esams.wikimedia.org", "Ceph cluster esams" => "ms-be3001.esams.wikimedia.org ms-be3002.esams.wikimedia.org", "Parsoid eqiad" => "wtp1001.eqiad.wmnet", - "Parsoid Varnish eqiad" => "cerium.wikimedia.org", + "Parsoid Varnish eqiad" => "cp1045.eqiad.wmnet cp1058.eqiad.wmnet", "Redis eqiad" => "rdb1001.eqiad.wmnet rdb1002.eqiad.wmnet", "Labs NFS cluster pmtpa" => "labstore3.pmtpa.wmnet labstore4.pmtpa.wmnet", } -- To view, visit https://gerrit.wikimedia.org/r/70420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If4b364c1ebf2348d6ad0bb31dc5a200f9c38599c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma Gerrit-Reviewer: Mark Bergsma Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix LuaSandbox mw.ustring.byteoffset with negative 'i' - change (mediawiki...Scribunto)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70421
Change subject: Fix LuaSandbox mw.ustring.byteoffset with negative 'i'
..
Fix LuaSandbox mw.ustring.byteoffset with negative 'i'
Negative values for 'i' in mw.ustring.byteoffset are supposed to count
from the end of the string. But in LuaSandbox, it was actually counting
from two bytes before the end of the string due to a typo.
Fix that, and add some tests for it.
Bug: 50176
Change-Id: Iceee1022a55abd7a08df1ea7843e1277eb02798b
---
M engines/LuaCommon/UstringLibrary.php
M tests/engines/LuaCommon/UstringLibraryTests.lua
2 files changed, 17 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/21/70421/1
diff --git a/engines/LuaCommon/UstringLibrary.php
b/engines/LuaCommon/UstringLibrary.php
index b253e0b..fddffa8 100644
--- a/engines/LuaCommon/UstringLibrary.php
+++ b/engines/LuaCommon/UstringLibrary.php
@@ -104,7 +104,7 @@
$bytelen = strlen( $s );
if ( $i < 0 ) {
- $i = $bytelen + $i - 1;
+ $i = $bytelen + $i + 1;
}
if ( $i < 1 || $i > $bytelen ) {
return array( null );
diff --git a/tests/engines/LuaCommon/UstringLibraryTests.lua
b/tests/engines/LuaCommon/UstringLibraryTests.lua
index bc16642..c0e5760 100644
--- a/tests/engines/LuaCommon/UstringLibraryTests.lua
+++ b/tests/engines/LuaCommon/UstringLibraryTests.lua
@@ -70,6 +70,22 @@
args = { "fóo", 0, 5 },
expect = { nil }
},
+ { name = 'byteoffset: (0,-1)', func = mw.ustring.byteoffset,
+ args = { "fóo", 0, -1 },
+ expect = { 4 }
+ },
+ { name = 'byteoffset: (0,-1)', func = mw.ustring.byteoffset,
+ args = { "foó", 0, -1 },
+ expect = { 3 }
+ },
+ { name = 'byteoffset: (1,-1)', func = mw.ustring.byteoffset,
+ args = { "fóo", 1, -1 },
+ expect = { 4 }
+ },
+ { name = 'byteoffset: (1,-1)', func = mw.ustring.byteoffset,
+ args = { "foó", 1, -1 },
+ expect = { nil }
+ },
{ name = 'codepoint: whole string', func = mw.ustring.codepoint,
args = { str1, 1, -1 },
--
To view, visit https://gerrit.wikimedia.org/r/70421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iceee1022a55abd7a08df1ea7843e1277eb02798b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor documentation fix - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Minor documentation fix .. Minor documentation fix Change-Id: Idc2e2c04477ec3152bf46a68a35f62388e9b86c4 --- M modules/toollabs/manifests/redis.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tim Landscheidt: Looks good to me, but someone else must approve coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/redis.pp b/modules/toollabs/manifests/redis.pp index e7e44c0..205dc57 100644 --- a/modules/toollabs/manifests/redis.pp +++ b/modules/toollabs/manifests/redis.pp @@ -1,4 +1,4 @@ -# Class: toollabs::execnode +# Class: toollabs::redis # # This role sets up a redis node for use by tool-labs # Restricts usage of certain commands, to prevent -- To view, visit https://gerrit.wikimedia.org/r/70422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc2e2c04477ec3152bf46a68a35f62388e9b86c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: coren Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor documentation fix - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/70422 Change subject: Minor documentation fix .. Minor documentation fix Change-Id: Idc2e2c04477ec3152bf46a68a35f62388e9b86c4 --- M modules/toollabs/manifests/redis.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/70422/1 diff --git a/modules/toollabs/manifests/redis.pp b/modules/toollabs/manifests/redis.pp index e7e44c0..205dc57 100644 --- a/modules/toollabs/manifests/redis.pp +++ b/modules/toollabs/manifests/redis.pp @@ -1,4 +1,4 @@ -# Class: toollabs::execnode +# Class: toollabs::redis # # This role sets up a redis node for use by tool-labs # Restricts usage of certain commands, to prevent -- To view, visit https://gerrit.wikimedia.org/r/70422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc2e2c04477ec3152bf46a68a35f62388e9b86c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 50078) Allow a string other than '*' as condition for D... - change (mediawiki/core)
IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70423
Change subject: (bug 50078) Allow a string other than '*' as condition for
DatabaseBase::delete()
..
(bug 50078) Allow a string other than '*' as condition for
DatabaseBase::delete()
Currently, either '*' is given as condition meaning "everything" or an array
must
be passed since DatabaseBase::makeList() requires an array. Now the parameter is
consistent with one of other similar methods, since a string will be handled
correctly.
Bug: 50078
Change-Id: Id5a8220d21245669f1091a3b5ed1def65b22d375
---
M includes/db/Database.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/70423/1
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 4b2eae7..e06d80d 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2712,7 +2712,10 @@
$sql = "DELETE FROM $table";
if ( $conds != '*' ) {
- $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
+ if ( is_array( $conds ) ) {
+ $conds = $this->makeList( $conds, LIST_AND );
+ }
+ $sql .= ' WHERE ' . $conds;
}
return $this->query( $sql, $fname );
--
To view, visit https://gerrit.wikimedia.org/r/70423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a8220d21245669f1091a3b5ed1def65b22d375
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ProofreadPage to track 1.22wmf8 branch - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update ProofreadPage to track 1.22wmf8 branch .. Update ProofreadPage to track 1.22wmf8 branch Change-Id: I9368483779ae190e6b2f53ef3c058849f884c931 --- M extensions/ProofreadPage 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage index 7d5ed49..5c301d4 16 --- a/extensions/ProofreadPage +++ b/extensions/ProofreadPage -Subproject commit 7d5ed4973b6e22dcf0ec17f4c83692b5626de26e +Subproject commit 5c301d4e1d252e34812524ce25df0fb8dcfeb39c -- To view, visit https://gerrit.wikimedia.org/r/70390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9368483779ae190e6b2f53ef3c058849f884c931 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf8 Gerrit-Owner: Tpt Gerrit-Reviewer: Reedy Gerrit-Reviewer: Tpt Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
