[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: All wikis to 1.31.0-wmf.17
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405055 )
Change subject: All wikis to 1.31.0-wmf.17
..
All wikis to 1.31.0-wmf.17
Change-Id: I918759f7b627524768284285242b3c2db134378e
---
M wikiversions.json
1 file changed, 293 insertions(+), 293 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/55/405055/1
diff --git a/wikiversions.json b/wikiversions.json
index 098ead9..6becf6f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
{
-"aawiki": "php-1.31.0-wmf.16",
+"aawiki": "php-1.31.0-wmf.17",
"aawikibooks": "php-1.31.0-wmf.17",
"aawiktionary": "php-1.31.0-wmf.17",
-"abwiki": "php-1.31.0-wmf.16",
+"abwiki": "php-1.31.0-wmf.17",
"abwiktionary": "php-1.31.0-wmf.17",
-"acewiki": "php-1.31.0-wmf.16",
+"acewiki": "php-1.31.0-wmf.17",
"advisorywiki": "php-1.31.0-wmf.17",
-"adywiki": "php-1.31.0-wmf.16",
-"afwiki": "php-1.31.0-wmf.16",
+"adywiki": "php-1.31.0-wmf.17",
+"afwiki": "php-1.31.0-wmf.17",
"afwikibooks": "php-1.31.0-wmf.17",
"afwikiquote": "php-1.31.0-wmf.17",
"afwiktionary": "php-1.31.0-wmf.17",
-"akwiki": "php-1.31.0-wmf.16",
+"akwiki": "php-1.31.0-wmf.17",
"akwikibooks": "php-1.31.0-wmf.17",
"akwiktionary": "php-1.31.0-wmf.17",
-"alswiki": "php-1.31.0-wmf.16",
-"amwiki": "php-1.31.0-wmf.16",
+"alswiki": "php-1.31.0-wmf.17",
+"amwiki": "php-1.31.0-wmf.17",
"amwikimedia": "php-1.31.0-wmf.17",
"amwikiquote": "php-1.31.0-wmf.17",
"amwiktionary": "php-1.31.0-wmf.17",
-"angwiki": "php-1.31.0-wmf.16",
+"angwiki": "php-1.31.0-wmf.17",
"angwikibooks": "php-1.31.0-wmf.17",
"angwikiquote": "php-1.31.0-wmf.17",
"angwikisource": "php-1.31.0-wmf.17",
"angwiktionary": "php-1.31.0-wmf.17",
-"anwiki": "php-1.31.0-wmf.16",
+"anwiki": "php-1.31.0-wmf.17",
"anwiktionary": "php-1.31.0-wmf.17",
-"arbcom_cswiki": "php-1.31.0-wmf.16",
-"arbcom_dewiki": "php-1.31.0-wmf.16",
-"arbcom_enwiki": "php-1.31.0-wmf.16",
-"arbcom_fiwiki": "php-1.31.0-wmf.16",
-"arbcom_nlwiki": "php-1.31.0-wmf.16",
-"arcwiki": "php-1.31.0-wmf.16",
-"arwiki": "php-1.31.0-wmf.16",
+"arbcom_cswiki": "php-1.31.0-wmf.17",
+"arbcom_dewiki": "php-1.31.0-wmf.17",
+"arbcom_enwiki": "php-1.31.0-wmf.17",
+"arbcom_fiwiki": "php-1.31.0-wmf.17",
+"arbcom_nlwiki": "php-1.31.0-wmf.17",
+"arcwiki": "php-1.31.0-wmf.17",
+"arwiki": "php-1.31.0-wmf.17",
"arwikibooks": "php-1.31.0-wmf.17",
"arwikimedia": "php-1.31.0-wmf.17",
"arwikinews": "php-1.31.0-wmf.17",
@@ -40,81 +40,81 @@
"arwikisource": "php-1.31.0-wmf.17",
"arwikiversity": "php-1.31.0-wmf.17",
"arwiktionary": "php-1.31.0-wmf.17",
-"arzwiki": "php-1.31.0-wmf.16",
-"astwiki": "php-1.31.0-wmf.16",
+"arzwiki": "php-1.31.0-wmf.17",
+"astwiki": "php-1.31.0-wmf.17",
"astwikibooks": "php-1.31.0-wmf.17",
"astwikiquote": "php-1.31.0-wmf.17",
"astwiktionary": "php-1.31.0-wmf.17",
-"aswiki": "php-1.31.0-wmf.16",
+"aswiki": "php-1.31.0-wmf.17",
"aswikibooks": "php-1.31.0-wmf.17",
"aswikisource": "php-1.31.0-wmf.17",
"aswiktionary": "php-1.31.0-wmf.17",
-"atjwiki": "php-1.31.0-wmf.16",
+"atjwiki": "php-1.31.0-wmf.17",
"auditcomwiki": "php-1.31.0-wmf.17",
-"avwiki": "php-1.31.0-wmf.16",
+"avwiki": "php-1.31.0-wmf.17",
"avwiktionary": "php-1.31.0-wmf.17",
-"aywiki": "php-1.31.0-wmf.16",
+"aywiki": "php-1.31.0-wmf.17",
"aywikibooks": "php-1.31.0-wmf.17",
"aywiktionary": "php-1.31.0-wmf.17",
-"azbwiki": "php-1.31.0-wmf.16",
-"azwiki": "php-1.31.0-wmf.16",
+"azbwiki": "php-1.31.0-wmf.17",
+"azwiki": "php-1.31.0-wmf.17",
"azwikibooks": "php-1.31.0-wmf.17",
"azwikiquote": "php-1.31.0-wmf.17",
"azwikisource": "php-1.31.0-wmf.17",
"azwiktionary": "php-1.31.0-wmf.17",
-"barwiki": "php-1.31.0-wmf.16",
-"bat_smgwiki": "php-1.31.0-wmf.16",
-"bawiki": "php-1.31.0-wmf.16",
+"barwiki": "php-1.31.0-wmf.17",
+"bat_smgwiki": "php-1.31.0-wmf.17",
+"bawiki": "php-1.31.0-wmf.17",
"bawikibooks": "php-1.31.0-wmf.17",
-"bclwiki": "php-1.31.0-wmf.16",
+"bclwiki": "php-1.31.0-wmf.17",
"bdwikimedia": "php-1.31.0-wmf.17",
-"be_x_oldwiki": "php-1.31.0-wmf.16",
+"be_x_oldwiki": "php-1.31.0-wmf.17",
"betawikiversity": "php-1.31.0-wmf.17",
-"bewiki": "php-1.31.0-wmf.16",
+"bewiki": "php-1.31.0-wmf.17",
"bewikibooks": "php-1.31.0-wmf.17",
"bewikimedia": "php-1.31.0-wmf.17",
"bewikiquote": "php-1.31.0-wmf.17",
"bewikisource": "php-1.31.0-wmf.17",
"bewiktionary": "php-1.31.0-wmf.17",
-"bgwiki": "php-1.31.0-wmf.16",
+"bgwiki": "php-1.31.0-wmf.17",
"bgwikibooks": "php-1.31.0-wmf.17",
"bgwikinews": "php-1.
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Updates to enable transliteration for crhwiki"
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405043 )
Change subject: Revert "Updates to enable transliteration for crhwiki"
..
Revert "Updates to enable transliteration for crhwiki"
This reverts commit ab8197eebfa0ffa689128a16b0355de3192e310c.
Change-Id: I4dbe8c3036f0e36c79ebf01e3cbb7d1673b9040a
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/43/405043/1
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 2f9d5bd..39dccc7 100755
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -90,6 +90,7 @@
# Non-ISO language codes
'be_x_oldwiki' => 'be-tarask',
+ 'crhwiki' => 'crh-latn',
'nowiki' => 'nb',
'nowiktionary' => 'nb',
'nowikiquote' => 'nb',
@@ -12297,7 +12298,6 @@
# wgVariantArticlePath @{
'wgVariantArticlePath' => [
- 'crhwiki' => '/$2/$1',
'srwiki' => '/$2/$1',
'srwiktionary' => '/$2/$1',
'srwikibooks' => '/$2/$1',
--
To view, visit https://gerrit.wikimedia.org/r/405043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dbe8c3036f0e36c79ebf01e3cbb7d1673b9040a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group1 to 1.31.0-wmf.17
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404801 ) Change subject: Group1 to 1.31.0-wmf.17 .. Group1 to 1.31.0-wmf.17 Change-Id: I20e16de12c8d581d52241f335bf4f20d65a15530 --- M wikiversions.json 1 file changed, 488 insertions(+), 488 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/01/404801/1 diff --git a/wikiversions.json b/wikiversions.json index 6e49e02..098ead9 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -8,24 +8,24 @@ "advisorywiki": "php-1.31.0-wmf.17", "adywiki": "php-1.31.0-wmf.16", "afwiki": "php-1.31.0-wmf.16", -"afwikibooks": "php-1.31.0-wmf.16", -"afwikiquote": "php-1.31.0-wmf.16", -"afwiktionary": "php-1.31.0-wmf.16", +"afwikibooks": "php-1.31.0-wmf.17", +"afwikiquote": "php-1.31.0-wmf.17", +"afwiktionary": "php-1.31.0-wmf.17", "akwiki": "php-1.31.0-wmf.16", "akwikibooks": "php-1.31.0-wmf.17", "akwiktionary": "php-1.31.0-wmf.17", "alswiki": "php-1.31.0-wmf.16", "amwiki": "php-1.31.0-wmf.16", -"amwikimedia": "php-1.31.0-wmf.16", +"amwikimedia": "php-1.31.0-wmf.17", "amwikiquote": "php-1.31.0-wmf.17", -"amwiktionary": "php-1.31.0-wmf.16", +"amwiktionary": "php-1.31.0-wmf.17", "angwiki": "php-1.31.0-wmf.16", "angwikibooks": "php-1.31.0-wmf.17", "angwikiquote": "php-1.31.0-wmf.17", "angwikisource": "php-1.31.0-wmf.17", -"angwiktionary": "php-1.31.0-wmf.16", +"angwiktionary": "php-1.31.0-wmf.17", "anwiki": "php-1.31.0-wmf.16", -"anwiktionary": "php-1.31.0-wmf.16", +"anwiktionary": "php-1.31.0-wmf.17", "arbcom_cswiki": "php-1.31.0-wmf.16", "arbcom_dewiki": "php-1.31.0-wmf.16", "arbcom_enwiki": "php-1.31.0-wmf.16", @@ -33,55 +33,55 @@ "arbcom_nlwiki": "php-1.31.0-wmf.16", "arcwiki": "php-1.31.0-wmf.16", "arwiki": "php-1.31.0-wmf.16", -"arwikibooks": "php-1.31.0-wmf.16", -"arwikimedia": "php-1.31.0-wmf.16", -"arwikinews": "php-1.31.0-wmf.16", -"arwikiquote": "php-1.31.0-wmf.16", -"arwikisource": "php-1.31.0-wmf.16", -"arwikiversity": "php-1.31.0-wmf.16", -"arwiktionary": "php-1.31.0-wmf.16", +"arwikibooks": "php-1.31.0-wmf.17", +"arwikimedia": "php-1.31.0-wmf.17", +"arwikinews": "php-1.31.0-wmf.17", +"arwikiquote": "php-1.31.0-wmf.17", +"arwikisource": "php-1.31.0-wmf.17", +"arwikiversity": "php-1.31.0-wmf.17", +"arwiktionary": "php-1.31.0-wmf.17", "arzwiki": "php-1.31.0-wmf.16", "astwiki": "php-1.31.0-wmf.16", "astwikibooks": "php-1.31.0-wmf.17", "astwikiquote": "php-1.31.0-wmf.17", -"astwiktionary": "php-1.31.0-wmf.16", +"astwiktionary": "php-1.31.0-wmf.17", "aswiki": "php-1.31.0-wmf.16", "aswikibooks": "php-1.31.0-wmf.17", -"aswikisource": "php-1.31.0-wmf.16", +"aswikisource": "php-1.31.0-wmf.17", "aswiktionary": "php-1.31.0-wmf.17", "atjwiki": "php-1.31.0-wmf.16", -"auditcomwiki": "php-1.31.0-wmf.16", +"auditcomwiki": "php-1.31.0-wmf.17", "avwiki": "php-1.31.0-wmf.16", "avwiktionary": "php-1.31.0-wmf.17", "aywiki": "php-1.31.0-wmf.16", "aywikibooks": "php-1.31.0-wmf.17", -"aywiktionary": "php-1.31.0-wmf.16", +"aywiktionary": "php-1.31.0-wmf.17", "azbwiki": "php-1.31.0-wmf.16", "azwiki": "php-1.31.0-wmf.16", -"azwikibooks": "php-1.31.0-wmf.16", -"azwikiquote": "php-1.31.0-wmf.16", -"azwikisource": "php-1.31.0-wmf.16", -"azwiktionary": "php-1.31.0-wmf.16", +"azwikibooks": "php-1.31.0-wmf.17", +"azwikiquote": "php-1.31.0-wmf.17", +"azwikisource": "php-1.31.0-wmf.17", +"azwiktionary": "php-1.31.0-wmf.17", "barwiki": "php-1.31.0-wmf.16", "bat_smgwiki": "php-1.31.0-wmf.16", "bawiki": "php-1.31.0-wmf.16", -"bawikibooks": "php-1.31.0-wmf.16", +"bawikibooks": "php-1.31.0-wmf.17", "bclwiki": "php-1.31.0-wmf.16", -"bdwikimedia": "php-1.31.0-wmf.16", +"bdwikimedia": "php-1.31.0-wmf.17", "be_x_oldwiki": "php-1.31.0-wmf.16", -"betawikiversity": "php-1.31.0-wmf.16", +"betawikiversity": "php-1.31.0-wmf.17", "bewiki": "php-1.31.0-wmf.16", -"bewikibooks": "php-1.31.0-wmf.16", -"bewikimedia": "php-1.31.0-wmf.16", -"bewikiquote": "php-1.31.0-wmf.16", -"bewikisource": "php-1.31.0-wmf.16", -"bewiktionary": "php-1.31.0-wmf.16", +"bewikibooks": "php-1.31.0-wmf.17", +"bewikimedia": "php-1.31.0-wmf.17", +"bewikiquote": "php-1.31.0-wmf.17", +"bewikisource": "php-1.31.0-wmf.17", +"bewiktionary": "php-1.31.0-wmf.17", "bgwiki": "php-1.31.0-wmf.16", -"bgwikibooks": "php-1.31.0-wmf.16", -"bgwikinews": "php-1.31.0-wmf.16", -"bgwikiquote": "php-1.31.0-wmf.16", -"bgwikisource": "php-1.31.0-wmf.16", -"bgwiktionary": "php-1.31.0-wmf.16", +"bgwikibooks": "php-1.31.0-wmf.17", +"bgwikinews": "php
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.17]: Bump vendor submodule Submodule vendor f7eb7ac085..43e2d6d5e...
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404792 ) Change subject: Bump vendor submodule Submodule vendor f7eb7ac085..43e2d6d5e1: > Add missing files from wikibase/data-model-services 3.9.0 .. Bump vendor submodule Submodule vendor f7eb7ac085..43e2d6d5e1: > Add missing files from wikibase/data-model-services 3.9.0 Change-Id: Iedd7e9c320cf57528a1ea01367323974b64723d0 --- M vendor 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/404792/1 diff --git a/vendor b/vendor index f7eb7ac..43e2d6d 16 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit f7eb7ac085f599143c83bb4df1fd0f3b2e7683e2 +Subproject commit 43e2d6d5e1bb82a40c0a4437c94d153358b8208f -- To view, visit https://gerrit.wikimedia.org/r/404792 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedd7e9c320cf57528a1ea01367323974b64723d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.31.0-wmf.17 Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group0 to 1.31.0-wmf.17
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404593 )
Change subject: Group0 to 1.31.0-wmf.17
..
Group0 to 1.31.0-wmf.17
Change-Id: I9e75cafea3df20396be912ed13a09a49a7c40a6f
---
M php
M wikiversions.json
2 files changed, 131 insertions(+), 131 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/93/404593/1
diff --git a/php b/php
index 20ce497..9f86124 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.31.0-wmf.16
\ No newline at end of file
+php-1.31.0-wmf.17
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index c6372a1..6e49e02 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,28 +1,28 @@
{
"aawiki": "php-1.31.0-wmf.16",
-"aawikibooks": "php-1.31.0-wmf.16",
-"aawiktionary": "php-1.31.0-wmf.16",
+"aawikibooks": "php-1.31.0-wmf.17",
+"aawiktionary": "php-1.31.0-wmf.17",
"abwiki": "php-1.31.0-wmf.16",
-"abwiktionary": "php-1.31.0-wmf.16",
+"abwiktionary": "php-1.31.0-wmf.17",
"acewiki": "php-1.31.0-wmf.16",
-"advisorywiki": "php-1.31.0-wmf.16",
+"advisorywiki": "php-1.31.0-wmf.17",
"adywiki": "php-1.31.0-wmf.16",
"afwiki": "php-1.31.0-wmf.16",
"afwikibooks": "php-1.31.0-wmf.16",
"afwikiquote": "php-1.31.0-wmf.16",
"afwiktionary": "php-1.31.0-wmf.16",
"akwiki": "php-1.31.0-wmf.16",
-"akwikibooks": "php-1.31.0-wmf.16",
-"akwiktionary": "php-1.31.0-wmf.16",
+"akwikibooks": "php-1.31.0-wmf.17",
+"akwiktionary": "php-1.31.0-wmf.17",
"alswiki": "php-1.31.0-wmf.16",
"amwiki": "php-1.31.0-wmf.16",
"amwikimedia": "php-1.31.0-wmf.16",
-"amwikiquote": "php-1.31.0-wmf.16",
+"amwikiquote": "php-1.31.0-wmf.17",
"amwiktionary": "php-1.31.0-wmf.16",
"angwiki": "php-1.31.0-wmf.16",
-"angwikibooks": "php-1.31.0-wmf.16",
-"angwikiquote": "php-1.31.0-wmf.16",
-"angwikisource": "php-1.31.0-wmf.16",
+"angwikibooks": "php-1.31.0-wmf.17",
+"angwikiquote": "php-1.31.0-wmf.17",
+"angwikisource": "php-1.31.0-wmf.17",
"angwiktionary": "php-1.31.0-wmf.16",
"anwiki": "php-1.31.0-wmf.16",
"anwiktionary": "php-1.31.0-wmf.16",
@@ -42,19 +42,19 @@
"arwiktionary": "php-1.31.0-wmf.16",
"arzwiki": "php-1.31.0-wmf.16",
"astwiki": "php-1.31.0-wmf.16",
-"astwikibooks": "php-1.31.0-wmf.16",
-"astwikiquote": "php-1.31.0-wmf.16",
+"astwikibooks": "php-1.31.0-wmf.17",
+"astwikiquote": "php-1.31.0-wmf.17",
"astwiktionary": "php-1.31.0-wmf.16",
"aswiki": "php-1.31.0-wmf.16",
-"aswikibooks": "php-1.31.0-wmf.16",
+"aswikibooks": "php-1.31.0-wmf.17",
"aswikisource": "php-1.31.0-wmf.16",
-"aswiktionary": "php-1.31.0-wmf.16",
+"aswiktionary": "php-1.31.0-wmf.17",
"atjwiki": "php-1.31.0-wmf.16",
"auditcomwiki": "php-1.31.0-wmf.16",
"avwiki": "php-1.31.0-wmf.16",
-"avwiktionary": "php-1.31.0-wmf.16",
+"avwiktionary": "php-1.31.0-wmf.17",
"aywiki": "php-1.31.0-wmf.16",
-"aywikibooks": "php-1.31.0-wmf.16",
+"aywikibooks": "php-1.31.0-wmf.17",
"aywiktionary": "php-1.31.0-wmf.16",
"azbwiki": "php-1.31.0-wmf.16",
"azwiki": "php-1.31.0-wmf.16",
@@ -83,15 +83,15 @@
"bgwikisource": "php-1.31.0-wmf.16",
"bgwiktionary": "php-1.31.0-wmf.16",
"bhwiki": "php-1.31.0-wmf.16",
-"bhwiktionary": "php-1.31.0-wmf.16",
+"bhwiktionary": "php-1.31.0-wmf.17",
"biwiki": "php-1.31.0-wmf.16",
-"biwikibooks": "php-1.31.0-wmf.16",
-"biwiktionary": "php-1.31.0-wmf.16",
+"biwikibooks": "php-1.31.0-wmf.17",
+"biwiktionary": "php-1.31.0-wmf.17",
"bjnwiki": "php-1.31.0-wmf.16",
"bmwiki": "php-1.31.0-wmf.16",
-"bmwikibooks": "php-1.31.0-wmf.16",
-"bmwikiquote": "php-1.31.0-wmf.16",
-"bmwiktionary": "php-1.31.0-wmf.16",
+"bmwikibooks": "php-1.31.0-wmf.17",
+"bmwikiquote": "php-1.31.0-wmf.17",
+"bmwiktionary": "php-1.31.0-wmf.17",
"bnwiki": "php-1.31.0-wmf.16",
"bnwikibooks": "php-1.31.0-wmf.16",
"bnwikisource": "php-1.31.0-wmf.16",
@@ -99,8 +99,8 @@
"boardgovcomwiki": "php-1.31.0-wmf.16",
"boardwiki": "php-1.31.0-wmf.16",
"bowiki": "php-1.31.0-wmf.16",
-"bowikibooks": "php-1.31.0-wmf.16",
-"bowiktionary": "php-1.31.0-wmf.16",
+"bowikibooks": "php-1.31.0-wmf.17",
+"bowiktionary": "php-1.31.0-wmf.17",
"bpywiki": "php-1.31.0-wmf.16",
"brwiki": "php-1.31.0-wmf.16",
"brwikimedia": "php-1.31.0-wmf.16",
@@ -129,26 +129,26 @@
"chairwiki": "php-1.31.0-wmf.16",
"chapcomwiki": "php-1.31.0-wmf.16",
"checkuserwiki": "php-1.31.0-wmf.16",
-"chowiki": "php-1.31.0-wmf.16",
+"chowiki": "php-1.31.0-wmf.17",
"chrwiki": "php-1.31.0-wmf.16",
"chrwiktionary": "php-1.31.0-wmf.16",
"chwiki": "php-1.31.0-wmf.16",
-"chwikibooks": "php-1.31.0-wmf.16",
-"chwiktionary": "php-1.
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[wmf/1.31.0-wmf.17]: Update access to ORES isModelEnabled()
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404583 )
Change subject: Update access to ORES isModelEnabled()
..
Update access to ORES isModelEnabled()
Follow-up Id73153c0f99f8961311a1bba167387bce2175d1a
The isModelEnabled() function was moved from
ORES\Hooks to ORES\Hooks\Helpers.
This breaks account creation locally.
Change-Id: Ie37420351135d3416974f844ca00c20c81065906
(cherry picked from commit 4ed241c74a11244c4eab2a3bb88654f9b57f55c5)
---
M WikimediaMessages.hooks.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/83/404583/1
diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index d9b4cec..3dda811 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1269,10 +1269,11 @@
* @return bool
*/
private static function isOresAvailable() {
- if ( !class_exists( 'ORES\\Hooks' ) ) {
+ if ( !class_exists( 'ORES\\Hooks\\Helpers' ) ) {
return false;
}
- return ORES\Hooks::isModelEnabled( 'damaging' ) ||
ORES\Hooks::isModelEnabled( 'goodfaith' );
+ return ORES\Hooks\Helpers::isModelEnabled( 'damaging' ) ||
+ ORES\Hooks\Helpers::isModelEnabled( 'goodfaith' );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/404583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie37420351135d3416974f844ca00c20c81065906
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: wmf/1.31.0-wmf.17
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Sbisson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.31.0-wmf.16
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404536 )
Change subject: all wikis to 1.31.0-wmf.16
..
all wikis to 1.31.0-wmf.16
Change-Id: If8cf3cb7a44a0364df1b67a373456b714b8d802b
---
M wikiversions.json
1 file changed, 293 insertions(+), 293 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/36/404536/1
diff --git a/wikiversions.json b/wikiversions.json
index c8f60cb..c6372a1 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
{
-"aawiki": "php-1.31.0-wmf.15",
+"aawiki": "php-1.31.0-wmf.16",
"aawikibooks": "php-1.31.0-wmf.16",
"aawiktionary": "php-1.31.0-wmf.16",
-"abwiki": "php-1.31.0-wmf.15",
+"abwiki": "php-1.31.0-wmf.16",
"abwiktionary": "php-1.31.0-wmf.16",
-"acewiki": "php-1.31.0-wmf.15",
+"acewiki": "php-1.31.0-wmf.16",
"advisorywiki": "php-1.31.0-wmf.16",
-"adywiki": "php-1.31.0-wmf.15",
-"afwiki": "php-1.31.0-wmf.15",
+"adywiki": "php-1.31.0-wmf.16",
+"afwiki": "php-1.31.0-wmf.16",
"afwikibooks": "php-1.31.0-wmf.16",
"afwikiquote": "php-1.31.0-wmf.16",
"afwiktionary": "php-1.31.0-wmf.16",
-"akwiki": "php-1.31.0-wmf.15",
+"akwiki": "php-1.31.0-wmf.16",
"akwikibooks": "php-1.31.0-wmf.16",
"akwiktionary": "php-1.31.0-wmf.16",
-"alswiki": "php-1.31.0-wmf.15",
-"amwiki": "php-1.31.0-wmf.15",
+"alswiki": "php-1.31.0-wmf.16",
+"amwiki": "php-1.31.0-wmf.16",
"amwikimedia": "php-1.31.0-wmf.16",
"amwikiquote": "php-1.31.0-wmf.16",
"amwiktionary": "php-1.31.0-wmf.16",
-"angwiki": "php-1.31.0-wmf.15",
+"angwiki": "php-1.31.0-wmf.16",
"angwikibooks": "php-1.31.0-wmf.16",
"angwikiquote": "php-1.31.0-wmf.16",
"angwikisource": "php-1.31.0-wmf.16",
"angwiktionary": "php-1.31.0-wmf.16",
-"anwiki": "php-1.31.0-wmf.15",
+"anwiki": "php-1.31.0-wmf.16",
"anwiktionary": "php-1.31.0-wmf.16",
-"arbcom_cswiki": "php-1.31.0-wmf.15",
-"arbcom_dewiki": "php-1.31.0-wmf.15",
-"arbcom_enwiki": "php-1.31.0-wmf.15",
-"arbcom_fiwiki": "php-1.31.0-wmf.15",
-"arbcom_nlwiki": "php-1.31.0-wmf.15",
-"arcwiki": "php-1.31.0-wmf.15",
-"arwiki": "php-1.31.0-wmf.15",
+"arbcom_cswiki": "php-1.31.0-wmf.16",
+"arbcom_dewiki": "php-1.31.0-wmf.16",
+"arbcom_enwiki": "php-1.31.0-wmf.16",
+"arbcom_fiwiki": "php-1.31.0-wmf.16",
+"arbcom_nlwiki": "php-1.31.0-wmf.16",
+"arcwiki": "php-1.31.0-wmf.16",
+"arwiki": "php-1.31.0-wmf.16",
"arwikibooks": "php-1.31.0-wmf.16",
"arwikimedia": "php-1.31.0-wmf.16",
"arwikinews": "php-1.31.0-wmf.16",
@@ -40,81 +40,81 @@
"arwikisource": "php-1.31.0-wmf.16",
"arwikiversity": "php-1.31.0-wmf.16",
"arwiktionary": "php-1.31.0-wmf.16",
-"arzwiki": "php-1.31.0-wmf.15",
-"astwiki": "php-1.31.0-wmf.15",
+"arzwiki": "php-1.31.0-wmf.16",
+"astwiki": "php-1.31.0-wmf.16",
"astwikibooks": "php-1.31.0-wmf.16",
"astwikiquote": "php-1.31.0-wmf.16",
"astwiktionary": "php-1.31.0-wmf.16",
-"aswiki": "php-1.31.0-wmf.15",
+"aswiki": "php-1.31.0-wmf.16",
"aswikibooks": "php-1.31.0-wmf.16",
"aswikisource": "php-1.31.0-wmf.16",
"aswiktionary": "php-1.31.0-wmf.16",
-"atjwiki": "php-1.31.0-wmf.15",
+"atjwiki": "php-1.31.0-wmf.16",
"auditcomwiki": "php-1.31.0-wmf.16",
-"avwiki": "php-1.31.0-wmf.15",
+"avwiki": "php-1.31.0-wmf.16",
"avwiktionary": "php-1.31.0-wmf.16",
-"aywiki": "php-1.31.0-wmf.15",
+"aywiki": "php-1.31.0-wmf.16",
"aywikibooks": "php-1.31.0-wmf.16",
"aywiktionary": "php-1.31.0-wmf.16",
-"azbwiki": "php-1.31.0-wmf.15",
-"azwiki": "php-1.31.0-wmf.15",
+"azbwiki": "php-1.31.0-wmf.16",
+"azwiki": "php-1.31.0-wmf.16",
"azwikibooks": "php-1.31.0-wmf.16",
"azwikiquote": "php-1.31.0-wmf.16",
"azwikisource": "php-1.31.0-wmf.16",
"azwiktionary": "php-1.31.0-wmf.16",
-"barwiki": "php-1.31.0-wmf.15",
-"bat_smgwiki": "php-1.31.0-wmf.15",
-"bawiki": "php-1.31.0-wmf.15",
+"barwiki": "php-1.31.0-wmf.16",
+"bat_smgwiki": "php-1.31.0-wmf.16",
+"bawiki": "php-1.31.0-wmf.16",
"bawikibooks": "php-1.31.0-wmf.16",
-"bclwiki": "php-1.31.0-wmf.15",
+"bclwiki": "php-1.31.0-wmf.16",
"bdwikimedia": "php-1.31.0-wmf.16",
-"be_x_oldwiki": "php-1.31.0-wmf.15",
+"be_x_oldwiki": "php-1.31.0-wmf.16",
"betawikiversity": "php-1.31.0-wmf.16",
-"bewiki": "php-1.31.0-wmf.15",
+"bewiki": "php-1.31.0-wmf.16",
"bewikibooks": "php-1.31.0-wmf.16",
"bewikimedia": "php-1.31.0-wmf.16",
"bewikiquote": "php-1.31.0-wmf.16",
"bewikisource": "php-1.31.0-wmf.16",
"bewiktionary": "php-1.31.0-wmf.16",
-"bgwiki": "php-1.31.0-wmf.15",
+"bgwiki": "php-1.31.0-wmf.16",
"bgwikibooks": "php-1.31.0-wmf.16",
"bgwikinews": "php-1.
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group1 to 1.31.0-wmf.16
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404531 ) Change subject: Group1 to 1.31.0-wmf.16 .. Group1 to 1.31.0-wmf.16 Change-Id: Id0950fc6119b3e8876030f669c0cf7bff05ad594 --- M wikiversions.json 1 file changed, 488 insertions(+), 488 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/31/404531/1 diff --git a/wikiversions.json b/wikiversions.json index 6fc2bb7..c8f60cb 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -8,24 +8,24 @@ "advisorywiki": "php-1.31.0-wmf.16", "adywiki": "php-1.31.0-wmf.15", "afwiki": "php-1.31.0-wmf.15", -"afwikibooks": "php-1.31.0-wmf.15", -"afwikiquote": "php-1.31.0-wmf.15", -"afwiktionary": "php-1.31.0-wmf.15", +"afwikibooks": "php-1.31.0-wmf.16", +"afwikiquote": "php-1.31.0-wmf.16", +"afwiktionary": "php-1.31.0-wmf.16", "akwiki": "php-1.31.0-wmf.15", "akwikibooks": "php-1.31.0-wmf.16", "akwiktionary": "php-1.31.0-wmf.16", "alswiki": "php-1.31.0-wmf.15", "amwiki": "php-1.31.0-wmf.15", -"amwikimedia": "php-1.31.0-wmf.15", +"amwikimedia": "php-1.31.0-wmf.16", "amwikiquote": "php-1.31.0-wmf.16", -"amwiktionary": "php-1.31.0-wmf.15", +"amwiktionary": "php-1.31.0-wmf.16", "angwiki": "php-1.31.0-wmf.15", "angwikibooks": "php-1.31.0-wmf.16", "angwikiquote": "php-1.31.0-wmf.16", "angwikisource": "php-1.31.0-wmf.16", -"angwiktionary": "php-1.31.0-wmf.15", +"angwiktionary": "php-1.31.0-wmf.16", "anwiki": "php-1.31.0-wmf.15", -"anwiktionary": "php-1.31.0-wmf.15", +"anwiktionary": "php-1.31.0-wmf.16", "arbcom_cswiki": "php-1.31.0-wmf.15", "arbcom_dewiki": "php-1.31.0-wmf.15", "arbcom_enwiki": "php-1.31.0-wmf.15", @@ -33,55 +33,55 @@ "arbcom_nlwiki": "php-1.31.0-wmf.15", "arcwiki": "php-1.31.0-wmf.15", "arwiki": "php-1.31.0-wmf.15", -"arwikibooks": "php-1.31.0-wmf.15", -"arwikimedia": "php-1.31.0-wmf.15", -"arwikinews": "php-1.31.0-wmf.15", -"arwikiquote": "php-1.31.0-wmf.15", -"arwikisource": "php-1.31.0-wmf.15", -"arwikiversity": "php-1.31.0-wmf.15", -"arwiktionary": "php-1.31.0-wmf.15", +"arwikibooks": "php-1.31.0-wmf.16", +"arwikimedia": "php-1.31.0-wmf.16", +"arwikinews": "php-1.31.0-wmf.16", +"arwikiquote": "php-1.31.0-wmf.16", +"arwikisource": "php-1.31.0-wmf.16", +"arwikiversity": "php-1.31.0-wmf.16", +"arwiktionary": "php-1.31.0-wmf.16", "arzwiki": "php-1.31.0-wmf.15", "astwiki": "php-1.31.0-wmf.15", "astwikibooks": "php-1.31.0-wmf.16", "astwikiquote": "php-1.31.0-wmf.16", -"astwiktionary": "php-1.31.0-wmf.15", +"astwiktionary": "php-1.31.0-wmf.16", "aswiki": "php-1.31.0-wmf.15", "aswikibooks": "php-1.31.0-wmf.16", -"aswikisource": "php-1.31.0-wmf.15", +"aswikisource": "php-1.31.0-wmf.16", "aswiktionary": "php-1.31.0-wmf.16", "atjwiki": "php-1.31.0-wmf.15", -"auditcomwiki": "php-1.31.0-wmf.15", +"auditcomwiki": "php-1.31.0-wmf.16", "avwiki": "php-1.31.0-wmf.15", "avwiktionary": "php-1.31.0-wmf.16", "aywiki": "php-1.31.0-wmf.15", "aywikibooks": "php-1.31.0-wmf.16", -"aywiktionary": "php-1.31.0-wmf.15", +"aywiktionary": "php-1.31.0-wmf.16", "azbwiki": "php-1.31.0-wmf.15", "azwiki": "php-1.31.0-wmf.15", -"azwikibooks": "php-1.31.0-wmf.15", -"azwikiquote": "php-1.31.0-wmf.15", -"azwikisource": "php-1.31.0-wmf.15", -"azwiktionary": "php-1.31.0-wmf.15", +"azwikibooks": "php-1.31.0-wmf.16", +"azwikiquote": "php-1.31.0-wmf.16", +"azwikisource": "php-1.31.0-wmf.16", +"azwiktionary": "php-1.31.0-wmf.16", "barwiki": "php-1.31.0-wmf.15", "bat_smgwiki": "php-1.31.0-wmf.15", "bawiki": "php-1.31.0-wmf.15", -"bawikibooks": "php-1.31.0-wmf.15", +"bawikibooks": "php-1.31.0-wmf.16", "bclwiki": "php-1.31.0-wmf.15", -"bdwikimedia": "php-1.31.0-wmf.15", +"bdwikimedia": "php-1.31.0-wmf.16", "be_x_oldwiki": "php-1.31.0-wmf.15", -"betawikiversity": "php-1.31.0-wmf.15", +"betawikiversity": "php-1.31.0-wmf.16", "bewiki": "php-1.31.0-wmf.15", -"bewikibooks": "php-1.31.0-wmf.15", -"bewikimedia": "php-1.31.0-wmf.15", -"bewikiquote": "php-1.31.0-wmf.15", -"bewikisource": "php-1.31.0-wmf.15", -"bewiktionary": "php-1.31.0-wmf.15", +"bewikibooks": "php-1.31.0-wmf.16", +"bewikimedia": "php-1.31.0-wmf.16", +"bewikiquote": "php-1.31.0-wmf.16", +"bewikisource": "php-1.31.0-wmf.16", +"bewiktionary": "php-1.31.0-wmf.16", "bgwiki": "php-1.31.0-wmf.15", -"bgwikibooks": "php-1.31.0-wmf.15", -"bgwikinews": "php-1.31.0-wmf.15", -"bgwikiquote": "php-1.31.0-wmf.15", -"bgwikisource": "php-1.31.0-wmf.15", -"bgwiktionary": "php-1.31.0-wmf.15", +"bgwikibooks": "php-1.31.0-wmf.16", +"bgwikinews": "php
[MediaWiki-commits] [Gerrit] operations...cassandra-twcs[master]: Scap: git_fat -> git_binary_manager
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404228 ) Change subject: Scap: git_fat -> git_binary_manager .. Scap: git_fat -> git_binary_manager Bug: T184882 Change-Id: I791d5116e25e30ebdc7d65a7f5808d86d2f8662f --- M scap/scap.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/cassandra-twcs refs/changes/28/404228/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index 382052a..9ea3df6 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -4,7 +4,7 @@ git_repo_user: deploy-service ssh_user: deploy-service dsh_targets: restbase -git_fat: True +git_binary_manager: git-fat [wmnet] git_server: tin.eqiad.wmnet -- To view, visit https://gerrit.wikimedia.org/r/404228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I791d5116e25e30ebdc7d65a7f5808d86d2f8662f Gerrit-PatchSet: 1 Gerrit-Project: operations/software/cassandra-twcs Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...logstash-logback-encoder[master]: Scap: git_fat -> git_binary_manager
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404227 ) Change subject: Scap: git_fat -> git_binary_manager .. Scap: git_fat -> git_binary_manager Bug: T184882 Change-Id: I905cf321a4bd324416a31fb7254212f57400f6dd --- M scap/scap.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/logstash-logback-encoder refs/changes/27/404227/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index 274c461..0073bce 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -12,7 +12,7 @@ # the size of each group to deploy in parallel group_size: 10 # this repository uses gitfat -git_fat: True +git_binary_manager: git-fat # the file name containing the list of canaries canary_dsh_targets: target-canary # we do not permit the canaries to fail -- To view, visit https://gerrit.wikimedia.org/r/404227 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I905cf321a4bd324416a31fb7254212f57400f6dd Gerrit-PatchSet: 1 Gerrit-Project: operations/software/logstash-logback-encoder Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...cassandra-metrics-collector[master]: Scap: git_fat -> git_binary_manager
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404226 ) Change subject: Scap: git_fat -> git_binary_manager .. Scap: git_fat -> git_binary_manager Bug: T184882 Change-Id: I8926c6dc1303cc6959322edace415dafe78cf90e --- M scap/scap.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/cassandra-metrics-collector refs/changes/26/404226/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index 05663a4..9b1ae61 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -12,7 +12,7 @@ # the size of each group to deploy in parallel group_size: 10 # this repository uses gitfat -git_fat: True +git_binary_manager: git-fat # the file name containing the list of canaries canary_dsh_targets: target-canary # the canary grop size -- To view, visit https://gerrit.wikimedia.org/r/404226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8926c6dc1303cc6959322edace415dafe78cf90e Gerrit-PatchSet: 1 Gerrit-Project: operations/software/cassandra-metrics-collector Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search...deploy[master]: Scap: git_fat -> git_binary_manager
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404225 ) Change subject: Scap: git_fat -> git_binary_manager .. Scap: git_fat -> git_binary_manager Bug: T184882 Change-Id: I5acc7145677eed22ae58bf82ba313175b3cd4b1d --- M scap/scap.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR/deploy refs/changes/25/404225/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index 8913d7a..ce451e7 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -5,4 +5,4 @@ analytics_dsh_targets: discovery-analytics relforge_dsh_targets: relforge git_submodules: True -git_fat: True +git_binary_manager: git-fat -- To view, visit https://gerrit.wikimedia.org/r/404225 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5acc7145677eed22ae58bf82ba313175b3cd4b1d Gerrit-PatchSet: 1 Gerrit-Project: search/MjoLniR/deploy Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...prometheus_jmx_exporter[master]: Scap: git_fat -> git_binary_manager
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404224 ) Change subject: Scap: git_fat -> git_binary_manager .. Scap: git_fat -> git_binary_manager Bug: T184882 Change-Id: Ic147f436eaccb644a9929321b3bed59e29f361de --- M scap/scap.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/prometheus_jmx_exporter refs/changes/24/404224/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index 786270e..ecbe264 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -4,7 +4,7 @@ git_repo_user: deploy-service ssh_user: deploy-service dsh_targets: cassandra -git_fat: True +git_binary_manager: git-fat [deployment-prep.eqiad.wmflabs] dsh_targets: deployment-prep-targets -- To view, visit https://gerrit.wikimedia.org/r/404224 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic147f436eaccb644a9929321b3bed59e29f361de Gerrit-PatchSet: 1 Gerrit-Project: operations/software/prometheus_jmx_exporter Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...deploy[master]: Scap: git_fat -> git_binary_manager
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404223 ) Change subject: Scap: git_fat -> git_binary_manager .. Scap: git_fat -> git_binary_manager Bug: T184882 Change-Id: I687212f97365411127d5d87f1bd57eccff54bd18 --- M scap/scap.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/deploy refs/changes/23/404223/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index 2b408f4..799cc75 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -2,7 +2,7 @@ server_groups: canary, codfw, eqiad git_repo: wdqs/wdqs git_submodules: True -git_fat: True +git_binary_manager: git-fat service_port: service_name: wdqs-blazegraph dsh_targets: wdqs -- To view, visit https://gerrit.wikimedia.org/r/404223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I687212f97365411127d5d87f1bd57eccff54bd18 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/deploy Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...plugins[master]: Scap: git_fat -> git_binary_manager
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404222 ) Change subject: Scap: git_fat -> git_binary_manager .. Scap: git_fat -> git_binary_manager Bug: T184882 Change-Id: I6a4dbbedae1ec39a450b324cafbe742f98962255 --- M scap/scap.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/logstash/plugins refs/changes/22/404222/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index 1e45a3c..0487318 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -5,7 +5,7 @@ server_groups: default dsh_targets: logstash git_submodules: False -git_fat: True +git_binary_manager: git-fat [deployment-prep.eqiad.wmflabs] dsh_targets: betacluster -- To view, visit https://gerrit.wikimedia.org/r/404222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a4dbbedae1ec39a450b324cafbe742f98962255 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/logstash/plugins Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: bump version to 3.7.6-1
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404219 )
Change subject: Scap: bump version to 3.7.6-1
..
Scap: bump version to 3.7.6-1
Bug: T127762
Change-Id: I4e98b01b1371d846243ebe2eed96e16082d34f60
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/404219/1
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 292993d..1be0a97 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
class scap (
$deployment_server = 'deployment',
$wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.5-1',
+$version = '3.7.6-1',
) {
package { 'scap':
ensure => $version,
--
To view, visit https://gerrit.wikimedia.org/r/404219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e98b01b1371d846243ebe2eed96e16082d34f60
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[wmf/1.31.0-wmf.15]: Declare dependency on jquery.makeCollapsible
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403850 ) Change subject: Declare dependency on jquery.makeCollapsible .. Declare dependency on jquery.makeCollapsible ConstraintReportGroup uses the makeCollapsible extension, and it seems that it might not always be pulled in for us already. Change-Id: I85c035ae3ade684fb184a2144c8656f6f0c50d28 (cherry picked from commit 0dba126124f15c1a56397831692326d4fd6cbad9) --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/50/403850/1 diff --git a/extension.json b/extension.json index 7be24ea..e35fbcc 100644 --- a/extension.json +++ b/extension.json @@ -60,6 +60,7 @@ "dependencies": [ "oojs-ui-core", "oojs-ui-widgets", + "jquery.makeCollapsible", "wikibase" ], "messages": [ -- To view, visit https://gerrit.wikimedia.org/r/403850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85c035ae3ade684fb184a2144c8656f6f0c50d28 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: wmf/1.31.0-wmf.15 Gerrit-Owner: Thcipriani Gerrit-Reviewer: Lucas Werkmeister (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[wmf/1.31.0-wmf.16]: Don’t hide default [Expand] link
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403846 )
Change subject: Don’t hide default [Expand] link
..
Don’t hide default [Expand] link
Wikibase’s fancy icon on collapsibles no longer applies to us as of
I6713bdf4c4, so if we hide MediaWiki’s link we see nothing at all.
Perhaps we can restore the prettier Wikibase version at some point, but
for now let’s make sure we at least have *something*.
Change-Id: I73e39c075e5018eb1af09d5336b44c7613128b47
(cherry picked from commit 80a30605434371225ce8642ba82d896091f4d037)
---
M modules/ui/ConstraintReportGroup.less
1 file changed, 0 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/46/403846/1
diff --git a/modules/ui/ConstraintReportGroup.less
b/modules/ui/ConstraintReportGroup.less
index 9820407..1e3fec0 100644
--- a/modules/ui/ConstraintReportGroup.less
+++ b/modules/ui/ConstraintReportGroup.less
@@ -1,8 +1,3 @@
-.wikibase-toolbar-item .mw-collapsible-toggle * {
- /* wikibase CSS adds an icon, so hide the normal [expand] link */
- display: none;
-}
-
.wbqc-reports-all .wbqc-reports:not( :first-child ) {
/* add some space between groups in a list */
margin-top: 1em;
--
To view, visit https://gerrit.wikimedia.org/r/403846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73e39c075e5018eb1af09d5336b44c7613128b47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: wmf/1.31.0-wmf.16
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Lucas Werkmeister (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[wmf/1.31.0-wmf.15]: Don’t hide default [Expand] link
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403845 )
Change subject: Don’t hide default [Expand] link
..
Don’t hide default [Expand] link
Wikibase’s fancy icon on collapsibles no longer applies to us as of
I6713bdf4c4, so if we hide MediaWiki’s link we see nothing at all.
Perhaps we can restore the prettier Wikibase version at some point, but
for now let’s make sure we at least have *something*.
Change-Id: I73e39c075e5018eb1af09d5336b44c7613128b47
(cherry picked from commit 80a30605434371225ce8642ba82d896091f4d037)
---
M modules/ui/ConstraintReportGroup.less
1 file changed, 0 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/45/403845/1
diff --git a/modules/ui/ConstraintReportGroup.less
b/modules/ui/ConstraintReportGroup.less
index 9820407..1e3fec0 100644
--- a/modules/ui/ConstraintReportGroup.less
+++ b/modules/ui/ConstraintReportGroup.less
@@ -1,8 +1,3 @@
-.wikibase-toolbar-item .mw-collapsible-toggle * {
- /* wikibase CSS adds an icon, so hide the normal [expand] link */
- display: none;
-}
-
.wbqc-reports-all .wbqc-reports:not( :first-child ) {
/* add some space between groups in a list */
margin-top: 1em;
--
To view, visit https://gerrit.wikimedia.org/r/403845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73e39c075e5018eb1af09d5336b44c7613128b47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Lucas Werkmeister (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap canary: cache last good deploy time
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403574 )
Change subject: Scap canary: cache last good deploy time
..
Scap canary: cache last good deploy time
Currently, if during the course of a series of deployments the canary
checker fails a deploy due to a high error rate then the baseline of
comparison for subsequent deployments is invalid because we have no way
of rolling back MediaWiki canaries automatically.
In practical terms that means that the canary will stop one bad
deployment from hitting all of production, but if the patch deployed
next doesn't fix the error-rate spike then the canary check will allow
it to go to production anyway because of this shifting baseline.
To fix this, after a bad deployment to the canary, we cache the
timestamp of that deployment. If that timestamp exists on disk then we
use that timestamp during subsequen deployments to calculate the
baseline mean error rate rather than using the mean error rate for the
past hour (less 20 seconds) as we do now.
Cached timestamps will expire after 1 hour.
Bug: T183999
Change-Id: Ifc7db81d2b08381743e5807d6b982a09d87275ac
---
M modules/service/files/logstash_checker.py
1 file changed, 103 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/403574/1
diff --git a/modules/service/files/logstash_checker.py
b/modules/service/files/logstash_checker.py
index f24bd07..b362307 100755
--- a/modules/service/files/logstash_checker.py
+++ b/modules/service/files/logstash_checker.py
@@ -12,6 +12,7 @@
import argparse
+import datetime
import getpass
import json
import logging
@@ -91,8 +92,7 @@
"""Shell class for checking services."""
def __init__(self, host, service_name, logstash_host, user='', password='',
- verbose=False, delay=120, fail_threshold=2.0,
- absolute_threshold=1.0):
+ delay=120, fail_threshold=2.0, absolute_threshold=1.0):
"""Initialize the checker."""
self.host = host
self.service_name = service_name
@@ -101,10 +101,51 @@
self.fail_threshold = fail_threshold
self.absolute_threshold = absolute_threshold
self.auth = None
+self._cache_dir = None
+self._cached_timestamp = None
self.logger = logging.getLogger(__name__)
if user:
self.auth = '{}:{}'.format(user, password)
+
+@property
+def cache_dir(self):
+"""
+Where we can stash persistent information for logstash_checker
+"""
+if self._cache_dir:
+return self._cache_dir
+
+base_path = '/tmp'
+cache_name = 'logstash-checker-cache'
+
+if self.service_name == 'mwdeploy':
+with open('/etc/profile.d/mediawiki.sh') as f:
+profile = f.readlines()
+mw_lines = [l for l in profile if l.startswith('MEDIAWIKI')]
+mw_profile = {}
+for mw_line in mw_lines:
+k, v = mw_line.split('=')
+mw_profile[k] = v.strip('"\n ')
+
+base_path = os.path.join(
+mw_profile['MEDIAWIKI_STAGING_DIR'], '.git')
+
+self._cache_dir = os.path.join(base_path, cache_name)
+
+self.logger.debug('Using cache directory "{}"'.format(self._cache_dir))
+return self._cache_dir
+
+@property
+def cached_timestamp_path(self):
+if self._cached_timestamp:
+return self._cached_timestamp
+
+self._cached_timestamp = os.path.join(
+self.cache_dir,
+'{}.timestamp'.format(self.host))
+
+return self._cached_timestamp
def _logstash_query(self):
if self.service_name == 'mwdeploy':
@@ -221,6 +262,59 @@
}
}
+def _save_cached_ts(self, ts):
+"""
+Saves a cached timestamp to disk
+"""
+if not os.path.isdir(self.cache_dir):
+os.makedirs(self.cache_dir, 02770)
+
+data = {'timestamp': ts}
+data_json = json.dumps(data)
+
+self.logger.debug('Saving cached timestamp {}'.format(data_json))
+with open(self.cached_timestamp_path, 'w') as f:
+f.write(data_json)
+
+def _rm_cached_ts(self):
+"""
+Remove cached ts file
+"""
+if os.path.exists(self.cached_timestamp_path):
+os.unlink(self.cached_timestamp_path)
+
+def _get_cached_ts(self, ts):
+"""
+Returns a cached timestamp if one is available
+"""
+if not os.path.exists(self.cached_timestamp_path):
+return ts
+
+with open(self.cached_timestamp_path) as f:
+cached_data = json.load(f)
+
+cached_ts = cached_data.get('timestamp')
+
+if not cached_ts:
+self._rm_cached_ts()
+return ts
+
+try:
+ts_da
[MediaWiki-commits] [Gerrit] integration/config[master]: beta-scap-eqiad fix scap path
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401818 ) Change subject: beta-scap-eqiad fix scap path .. beta-scap-eqiad fix scap path Change-Id: Ib99311d593e0384d69d3f65ed78ade8219c28e98 --- M jjb/beta.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/18/401818/1 diff --git a/jjb/beta.yaml b/jjb/beta.yaml index 0ed434f..b27d644 100644 --- a/jjb/beta.yaml +++ b/jjb/beta.yaml @@ -151,7 +151,7 @@ builders: - shell: | - /srv/deployment/scap/scap/bin/scap sync "$JOB_NAME (build $BUILD_DISPLAY_NAME)" + /usr/bin/scap sync "$JOB_NAME (build $BUILD_DISPLAY_NAME)" properties: - build-discarder: -- To view, visit https://gerrit.wikimedia.org/r/401818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib99311d593e0384d69d3f65ed78ade8219c28e98 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Comment typo fixes
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401546 ) Change subject: Comment typo fixes .. Comment typo fixes Fixes a few typos Krinkle pointed out in comments on I4af99c90080699a79824e2fc79b1be3fe17ae9a5 Change-Id: Ided2278ed2255d5f9514d9fa95d8aa5367ba1726 --- M dockerfiles/hhvm/hhvm.ini 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/46/401546/1 diff --git a/dockerfiles/hhvm/hhvm.ini b/dockerfiles/hhvm/hhvm.ini index b094a02..8d20fae 100644 --- a/dockerfiles/hhvm/hhvm.ini +++ b/dockerfiles/hhvm/hhvm.ini @@ -27,7 +27,7 @@ hhvm.perf_pid_map = false ; Jenkins sets HHVM_REPO_CENTRAL_PATH containing $WORKSPACE and hhvm uses it as -; a fallback. In the container we have craeted a /hhvm.hhvm owned by nobody. +; a fallback. In the container we have created a /hhvm.hhbc owned by nobody. ; ; We do not use a local repo and solely rely on a central one. ; -- To view, visit https://gerrit.wikimedia.org/r/401546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ided2278ed2255d5f9514d9fa95d8aa5367ba1726 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: l10nupdate: turn back on after holidays
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399840 )
Change subject: l10nupdate: turn back on after holidays
..
l10nupdate: turn back on after holidays
Change-Id: I93c0415c5a7589a5ffecd99dbe77412f17c71c85
---
A modules/profile/manifests/scap/master.pp
M modules/role/manifests/deployment/mediawiki.pp
M modules/scap/manifests/master.pp
3 files changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/399840/1
diff --git a/modules/profile/manifests/scap/master.pp
b/modules/profile/manifests/scap/master.pp
new file mode 100644
index 000..92371c5
--- /dev/null
+++ b/modules/profile/manifests/scap/master.pp
@@ -0,0 +1,10 @@
+# == Class profile::scap::master
+#
+# Sets up a scap master on a host
+class profile::scap::master(
+$main_deployment_server = hiera('scap::deployment_server'),
+) {
+class { '::scap::master':
+run_l10nupdate => ($main_deployment_server == $::fqdn)
+}
+}
diff --git a/modules/role/manifests/deployment/mediawiki.pp
b/modules/role/manifests/deployment/mediawiki.pp
index 8cb17e8..eaf18c8 100644
--- a/modules/role/manifests/deployment/mediawiki.pp
+++ b/modules/role/manifests/deployment/mediawiki.pp
@@ -10,7 +10,7 @@
include ::mediawiki::packages::php5
include ::profile::mediawiki::nutcracker
include ::profile::conftool::client
-include ::scap::master
+include ::profile::scap::master
include ::profile::scap::dsh
include ::scap::ferm
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index 8a22ac4..e940ba8 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -6,6 +6,7 @@
$common_source_path = '/srv/mediawiki-staging',
$patches_path = '/srv/patches',
$rsync_host = "deployment.${::site}.wmnet",
+$run_l10nupdate = false,
$statsd_host= 'statsd.eqiad.wmnet',
$statsd_port= 8125,
$deployment_group = 'wikidev',
@@ -52,11 +53,9 @@
hosts_allow =>
$::network::constants::special_hosts[$::realm]['deployment_hosts'];
}
-# TODO: pass this down from a profile (or convert this to a profile!)
-$main_deployment_server = hiera('scap::deployment_server')
class { 'scap::l10nupdate':
deployment_group => $deployment_group,
-run_l10nupdate => false,
+run_l10nupdate => $run_l10nupdate,
}
file { '/usr/local/bin/scap-master-sync':
--
To view, visit https://gerrit.wikimedia.org/r/399840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93c0415c5a7589a5ffecd99dbe77412f17c71c85
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: l10nupdate: don't run over holidays
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399839 )
Change subject: l10nupdate: don't run over holidays
..
l10nupdate: don't run over holidays
Change-Id: I5f18120179b0302a68134c1ebfd847f0fe28d3fa
---
M modules/scap/manifests/master.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/399839/1
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index dfab01d..8a22ac4 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -56,7 +56,7 @@
$main_deployment_server = hiera('scap::deployment_server')
class { 'scap::l10nupdate':
deployment_group => $deployment_group,
-run_l10nupdate => ($main_deployment_server == $::fqdn)
+run_l10nupdate => false,
}
file { '/usr/local/bin/scap-master-sync':
--
To view, visit https://gerrit.wikimedia.org/r/399839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f18120179b0302a68134c1ebfd847f0fe28d3fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: bump version to 3.7.4-3
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398853 )
Change subject: Scap: bump version to 3.7.4-3
..
Scap: bump version to 3.7.4-3
Bug: T183046
Change-Id: Iea202fdc681bc98824cb7792a80b591aca4339c5
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/398853/1
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index fa3aa8f..32af20bc 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
class scap (
$deployment_server = 'deployment',
$wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-1',
+$version = '3.7.4-3',
) {
package { 'scap':
ensure => $version,
--
To view, visit https://gerrit.wikimedia.org/r/398853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea202fdc681bc98824cb7792a80b591aca4339c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Scap: bump version to 3.7.4-2"
Hello Alexandros Kosiaris, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/398603
to review the following change.
Change subject: Revert "Scap: bump version to 3.7.4-2"
..
Revert "Scap: bump version to 3.7.4-2"
This reverts commit 8b7eae257c945afb65224310aba77d099b62a178.
Change-Id: I8c78acbe85cc102b8b9554e3ba1fadbc703b2ce5
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/398603/1
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 313dc7f..fa3aa8f 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
class scap (
$deployment_server = 'deployment',
$wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-2',
+$version = '3.7.4-1',
) {
package { 'scap':
ensure => $version,
--
To view, visit https://gerrit.wikimedia.org/r/398603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c78acbe85cc102b8b9554e3ba1fadbc703b2ce5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: bump version to 3.7.4-2
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398507 )
Change subject: Scap: bump version to 3.7.4-2
..
Scap: bump version to 3.7.4-2
Bug: T182347
Change-Id: Ifb89158c7f6f53be47daa08845fc3b875a7884d3
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/398507/1
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index fa3aa8f..313dc7f 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
class scap (
$deployment_server = 'deployment',
$wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-1',
+$version = '3.7.4-2',
) {
package { 'scap':
ensure => $version,
--
To view, visit https://gerrit.wikimedia.org/r/398507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb89158c7f6f53be47daa08845fc3b875a7884d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Linter[wmf/1.31.0-wmf.12]: Update en/i18n message for multiple-unclosed-formatting-tags
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398313 ) Change subject: Update en/i18n message for multiple-unclosed-formatting-tags .. Update en/i18n message for multiple-unclosed-formatting-tags * Looks like I missed other instances :( Change-Id: If28d3127ca93af575d8b7c2b8e1539efde0639c2 (cherry picked from commit b98e04e065fb3dd65435475894861857b412699c) --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter refs/changes/13/398313/1 diff --git a/i18n/en.json b/i18n/en.json index e6a9b10..2ef9756 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -52,8 +52,8 @@ "linter-category-html5-misnesting-desc": "These misnested tags will behave differently in HTML5 compared to HTML4.", "linter-category-tidy-font-bug": "Tidy bug affecting font tags wrapping links", "linter-category-tidy-font-bug-desc": "Tidy moves these font tags inside links to change link colour", - "linter-category-multiple-unclosed-formatting-tags": "Multiple unclosed small or big tags", - "linter-category-multiple-unclosed-formatting-tags-desc": "These pages have multiple unclosed small or big tags", + "linter-category-multiple-unclosed-formatting-tags": "Multiple unclosed formatting tags", + "linter-category-multiple-unclosed-formatting-tags-desc": "These pages have multiple unclosed formatting tags", "linter-category-unclosed-quotes-in-heading": "Unclosed quote in heading", "linter-category-unclosed-quotes-in-heading-desc": "These pages have an unclosed quote in a heading, which then leaks out of the table of contents.", "linter-category-multiline-html-table-in-list": "Multiline table in list", -- To view, visit https://gerrit.wikimedia.org/r/398313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If28d3127ca93af575d8b7c2b8e1539efde0639c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Linter Gerrit-Branch: wmf/1.31.0-wmf.12 Gerrit-Owner: Thcipriani Gerrit-Reviewer: Subramanya Sastry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Docker: use new operations-puppet image
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398103 ) Change subject: Docker: use new operations-puppet image .. Docker: use new operations-puppet image Change-Id: I13da58177d42360fcb280a77549094d819c555ca --- M dockerfiles/operations-puppet/example-run.sh M jjb/operations-puppet.yaml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/03/398103/1 diff --git a/dockerfiles/operations-puppet/example-run.sh b/dockerfiles/operations-puppet/example-run.sh index d851666..0461d99 100644 --- a/dockerfiles/operations-puppet/example-run.sh +++ b/dockerfiles/operations-puppet/example-run.sh @@ -8,4 +8,4 @@ --env ZUUL_COMMIT=72d31ffb0fa612482d268b6f5484785842cd0fda \ --env ZUUL_REF=refs/changes/49/374349/2 \ --volume /$(pwd)/log://srv/workspace/log \ -docker-registry.wikimedia.org/releng/operations-puppet:0.2.1 +docker-registry.wikimedia.org/releng/operations-puppet:0.3.0 diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml index c622796..49098b8 100644 --- a/jjb/operations-puppet.yaml +++ b/jjb/operations-puppet.yaml @@ -53,7 +53,7 @@ builders: - docker-log-dir - docker-run-with-log: -image: 'docker-registry.wikimedia.org/releng/operations-puppet:0.2.1' +image: 'docker-registry.wikimedia.org/releng/operations-puppet:0.3.0' logdir: '/srv/workspace/log' wrappers: - timeout: -- To view, visit https://gerrit.wikimedia.org/r/398103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I13da58177d42360fcb280a77549094d819c555ca Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: docker-pkg: use `run` to update docker image
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398086 )
Change subject: docker-pkg: use `run` to update docker image
..
docker-pkg: use `run` to update docker image
Since the configuration file is only readable by contint-admins, use the
run command in the fab file to update docker-pkg images.
Change-Id: Ib2da6b34003033b95c8d9de8dcafdbc03afe932b
---
M fabfile.py
1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/86/398086/1
diff --git a/fabfile.py b/fabfile.py
index 2307854..361a6d1 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -50,19 +50,17 @@
return
with cd('/tmp'):
-env.sudo_user = 'jenkins-slave'
-
docker_pkg = '/srv/deployment/docker-pkg/venv/bin/docker-pkg'
docker_pkg_config = '/etc/docker-pkg/integration.yaml'
dockerfiles = '/etc/zuul/wikimedia/dockerfiles'
cmd = '{} -c {} {}'.format(docker_pkg, docker_pkg_config, dockerfiles)
-sudo(cmd)
+run(cmd)
-sudo('cat /tmp/docker-pkg-build.log')
+run('cat /tmp/docker-pkg-build.log')
if confirm('delete build log?'):
-sudo('rm /tmp/docker-pkg-build.log')
+run('rm /tmp/docker-pkg-build.log')
@task
--
To view, visit https://gerrit.wikimedia.org/r/398086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2da6b34003033b95c8d9de8dcafdbc03afe932b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: HTTPS_PROXY_REQUEST_FULLURI=false for composer
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395913 )
Change subject: HTTPS_PROXY_REQUEST_FULLURI=false for composer
..
HTTPS_PROXY_REQUEST_FULLURI=false for composer
Unclear why this is all of a sudden needed; however, this seems to fix
T182266. Found via: https://github.com/composer/composer/issues/1839
Bug: T182266
Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2
---
M jjb/macro.yaml
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/13/395913/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index cbe79eb..ffb4db0 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -417,10 +417,12 @@
- shell: |
#!/bin/bash -eu
# Load require-dev packages on top of vendor (T92605, T112895)
-set -o pipefail
+set -xo pipefail
# Set --ignore-platform-reqs to prevent composer from evaluating
unrelated dependencies
# already present in composer.json (needed for
operations/mediawiki-config due to
# https://github.com/perftools/xhgui/issues/192).
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
node
/srv/deployment/integration/slave-scripts/tools/composer-dev-args.js
"$(pwd)/composer.json" | xargs --verbose composer require --dev --ansi
--no-progress --ignore-platform-reqs --prefer-dist -v
- builder:
@@ -567,24 +569,31 @@
name: composer-update
builders:
- shell: |
-set -u
+set -ux
cd "{dir}"
[[ -f "composer.json" ]] || exit 0
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
composer update --ansi --no-progress --prefer-dist --profile -v
- builder:
name: composer-install
builders:
- shell: |
-set -u
+set -ux
cd "{dir}"
[[ -f "composer.json" ]] || exit 0
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
composer install --ansi --no-progress --prefer-dist --profile -v
- builder:
name: composer-update-no-dev
builders:
- shell: |
+set -x
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
composer update --ansi --no-progress --prefer-dist --profile --no-dev
- builder:
--
To view, visit https://gerrit.wikimedia.org/r/395913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: SSD: always pull FROM images for build
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395613 )
Change subject: SSD: always pull FROM images for build
..
SSD: always pull FROM images for build
Change-Id: I634d17f7e59127b6c64c67137800a787b744fa38
---
M jjb/service-pipeline.groovy
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/13/395613/1
diff --git a/jjb/service-pipeline.groovy b/jjb/service-pipeline.groovy
index f773d9c..6a8f776 100644
--- a/jjb/service-pipeline.groovy
+++ b/jjb/service-pipeline.groovy
@@ -33,7 +33,7 @@
def build = { variant ->
def labels = imageLabels.collect { "--label '${it}'" }.join(' ')
-sh "blubber $blubberConfig $variant | docker build -t $fullName $labels -f
- ."
+sh "blubber $blubberConfig $variant | docker build --pull --tag $fullName
$labels --file - ."
}
def run = {
--
To view, visit https://gerrit.wikimedia.org/r/395613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I634d17f7e59127b6c64c67137800a787b744fa38
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: SSD: Switch Mathoid to service pipeline
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/395570 ) Change subject: SSD: Switch Mathoid to service pipeline .. SSD: Switch Mathoid to service pipeline Moves Mathoid over to using blubber + pipeline builds to do testing. Also adds a postmerge step to Mathoid to push mathoid container into production. Change-Id: I5f8a0034c397b82243917dfc8679435b234cc69f Depends-On: I43f9df70540c6645a95d0b210cb91597a0dfd582 --- M zuul/layout.yaml 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/70/395570/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3bbf55f..cb31e85 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1238,13 +1238,12 @@ - name: npm-service-pipeline test: - - npm-node-6-jessie -gate-and-submit: &npm-service-pipeline-gate-and-submit - - npm-node-6-jessie -gate-and-submit-swat: *npm-service-pipeline-gate-and-submit -experimental: - - npm-node-6-docker - trigger-service-pipeline-test-only +gate-and-submit: &npm-service-pipeline-gate-and-submit + - trigger-service-pipeline-test-only +gate-and-submit-swat: *npm-service-pipeline-gate-and-submit +postmerge: + - trigger-service-pipeline - name: mwgate-npm test: -- To view, visit https://gerrit.wikimedia.org/r/395570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f8a0034c397b82243917dfc8679435b234cc69f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Blubber: update deps for node-gyp compilation
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395050 )
Change subject: Blubber: update deps for node-gyp compilation
..
Blubber: update deps for node-gyp compilation
Change-Id: I43f9df70540c6645a95d0b210cb91597a0dfd582
---
M dist/pipeline/blubber.yaml
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid
refs/changes/50/395050/1
diff --git a/dist/pipeline/blubber.yaml b/dist/pipeline/blubber.yaml
index 6659ef1..283f0b3 100644
--- a/dist/pipeline/blubber.yaml
+++ b/dist/pipeline/blubber.yaml
@@ -1,4 +1,4 @@
-base: docker-registry.wikimedia.org/nodejs-slim
+base: docker-registry.wikimedia.org/nodejs-slim:0.1.0
apt: { packages: [librsvg2-2] }
runs:
in: /srv/service
@@ -9,8 +9,8 @@
variants:
build:
-base: docker-registry.wikimedia.org/nodejs-devel
-apt: { packages: [librsvg2-dev, git] }
+base: docker-registry.wikimedia.org/nodejs-devel:0.1.0
+apt: { packages: [librsvg2-dev, git, python-pkgconfig, make, g++] }
node: { dependencies: true }
development:
includes: [build]
--
To view, visit https://gerrit.wikimedia.org/r/395050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f9df70540c6645a95d0b210cb91597a0dfd582
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Service Pipeline: Move blubber config location
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394663 )
Change subject: Service Pipeline: Move blubber config location
..
Service Pipeline: Move blubber config location
Change-Id: I931a4f0c38f16e735de8a5e9434eb861a197c268
---
M jjb/service-pipeline.groovy
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/63/394663/1
diff --git a/jjb/service-pipeline.groovy b/jjb/service-pipeline.groovy
index 2aa476c..f773d9c 100644
--- a/jjb/service-pipeline.groovy
+++ b/jjb/service-pipeline.groovy
@@ -1,5 +1,5 @@
node('ServicePipelineProduction') {
- def blubberConfig = 'pipeline/blubber.yaml'
+ def blubberConfig = 'dist/pipeline/blubber.yaml'
def dockerRegistry = 'docker-registry.discovery.wmnet'
def dockerCredential = 'docker-registry-uploader'
--
To view, visit https://gerrit.wikimedia.org/r/394663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I931a4f0c38f16e735de8a5e9434eb861a197c268
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Fix composer-test example-run.sh
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394499 ) Change subject: Fix composer-test example-run.sh .. Fix composer-test example-run.sh The example-run for this image has not been updated since the creation of ci-src-setup. As a result, the example-run will fail since the image no longer checks out source code by itself. Change-Id: I81bc37b6f125d9db4a8790e7eaebe75de20c7563 --- M dockerfiles/composer-test/example-run.sh 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/99/394499/1 diff --git a/dockerfiles/composer-test/example-run.sh b/dockerfiles/composer-test/example-run.sh index a9b3a36..dc759d1 100644 --- a/dockerfiles/composer-test/example-run.sh +++ b/dockerfiles/composer-test/example-run.sh @@ -1,11 +1,19 @@ #!/bin/bash -install --mode 777 --directory log +mkdir -m 2777 -p log src cache + +git init src +git -C src fetch --quiet --depth 1 \ +"https://gerrit.wikimedia.org/r/integration/jenkins"; \ +"refs/changes/31/316231/4" +git -C src checkout FETCH_HEAD + docker run \ --rm --tty \ ---env ZUUL_URL=https://gerrit.wikimedia.org/r \ ---env ZUUL_PROJECT=integration/jenkins \ ---env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \ ---env ZUUL_REF=refs/changes/31/316231/4 \ ---volume /$(pwd)/log://var/lib/jenkins/log \ - wmfreleng/composer-test:latest +--volume /$(pwd)/log:/log \ +--volume /$(pwd)/cache:/cache \ +--volume /$(pwd)/src:/src \ +wmfreleng/composer-test:latest +# docker-registry.wikimedia.org/releng/composer-test:0.1.0 + +rm -rf src log cache -- To view, visit https://gerrit.wikimedia.org/r/394499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81bc37b6f125d9db4a8790e7eaebe75de20c7563 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Pipeline changes
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392892 )
Change subject: Pipeline changes
..
Pipeline changes
Move the test node to ServicePipelineProduction instances since blubber
is no longer present on the docker nodes. Move the location of the
blubber.yaml file since many services have a "deploy" directory already.
Change-Id: I238fec4181fa001516f5d1018d3921e2943f9b2a
---
M jjb/service-pipeline-production.groovy
M jjb/service-pipeline-test.groovy
M jjb/service-pipeline.groovy
M jjb/service-pipeline.yaml
4 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/92/392892/1
diff --git a/jjb/service-pipeline-production.groovy
b/jjb/service-pipeline-production.groovy
index 7538514..8f8074e 100644
--- a/jjb/service-pipeline-production.groovy
+++ b/jjb/service-pipeline-production.groovy
@@ -1,2 +1 @@
-def nodeLabel = 'ServicePipelineProduction'
def buildProductionImage = true
diff --git a/jjb/service-pipeline-test.groovy b/jjb/service-pipeline-test.groovy
index ab13838..878c8a2 100644
--- a/jjb/service-pipeline-test.groovy
+++ b/jjb/service-pipeline-test.groovy
@@ -1,2 +1 @@
-def nodeLabel = 'DebianJessieDocker'
def buildProductionImage = false
diff --git a/jjb/service-pipeline.groovy b/jjb/service-pipeline.groovy
index d9d6b33..2aa476c 100644
--- a/jjb/service-pipeline.groovy
+++ b/jjb/service-pipeline.groovy
@@ -1,5 +1,5 @@
-node(nodeLabel) {
- def blubberConfig = 'deploy/blubber.yaml'
+node('ServicePipelineProduction') {
+ def blubberConfig = 'pipeline/blubber.yaml'
def dockerRegistry = 'docker-registry.discovery.wmnet'
def dockerCredential = 'docker-registry-uploader'
diff --git a/jjb/service-pipeline.yaml b/jjb/service-pipeline.yaml
index 3934128..9cd78b5 100644
--- a/jjb/service-pipeline.yaml
+++ b/jjb/service-pipeline.yaml
@@ -21,7 +21,7 @@
- job:
name: 'trigger-service-pipeline-test-only'
defaults: global
-node: DebianJessieDocker
+node: ServicePipelineProduction
parameters: *service-pipeline-parameters
builders:
- trigger-builds:
--
To view, visit https://gerrit.wikimedia.org/r/392892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I238fec4181fa001516f5d1018d3921e2943f9b2a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Add blubber.yaml
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392871 )
Change subject: Add blubber.yaml
..
Add blubber.yaml
This is the file that will be used to build mathoid containers for
testing and for production.
This is a subset of Icccb0f79785e6112d4086da2d704d26e4144065e without
any configuration for helm. This creates a pipeline directory rather
than putting a .blubber.yaml at the top level to allow for future
pipeline-related configuration.
Bug: T177954
Change-Id: I60b15718ec25dbb80fe2b205e610b632d55bdf35
---
A pipeline/blubber.yaml
1 file changed, 27 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid
refs/changes/71/392871/1
diff --git a/pipeline/blubber.yaml b/pipeline/blubber.yaml
new file mode 100644
index 000..6659ef1
--- /dev/null
+++ b/pipeline/blubber.yaml
@@ -0,0 +1,27 @@
+base: docker-registry.wikimedia.org/nodejs-slim
+apt: { packages: [librsvg2-2] }
+runs:
+ in: /srv/service
+ as: runuser
+ uid: 666
+ gid: 666
+ environment: { APP_BASE_PATH: /srv/service }
+
+variants:
+ build:
+base: docker-registry.wikimedia.org/nodejs-devel
+apt: { packages: [librsvg2-dev, git] }
+node: { dependencies: true }
+ development:
+includes: [build]
+entrypoint: [node, server.js]
+ test:
+includes: [build]
+entrypoint: [npm, test]
+ prep:
+includes: [build]
+node: { env: production }
+ production:
+copies: prep
+node: { env: production }
+entrypoint: [node, server.js]
--
To view, visit https://gerrit.wikimedia.org/r/392871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60b15718ec25dbb80fe2b205e610b632d55bdf35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group2 to 1.31.0-wmf.8
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392704 )
Change subject: group2 to 1.31.0-wmf.8
..
group2 to 1.31.0-wmf.8
Change-Id: I94f9b13b3df47bfd0ed6ad70bab2d99ff540f24f
---
M wikiversions.json
1 file changed, 305 insertions(+), 305 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/04/392704/1
diff --git a/wikiversions.json b/wikiversions.json
index e875bc1..c9476ae 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,41 +1,41 @@
{
-"aawiki": "php-1.31.0-wmf.7",
+"aawiki": "php-1.31.0-wmf.8",
"aawikibooks": "php-1.31.0-wmf.8",
"aawiktionary": "php-1.31.0-wmf.8",
-"abwiki": "php-1.31.0-wmf.7",
+"abwiki": "php-1.31.0-wmf.8",
"abwiktionary": "php-1.31.0-wmf.8",
-"acewiki": "php-1.31.0-wmf.7",
+"acewiki": "php-1.31.0-wmf.8",
"advisorywiki": "php-1.31.0-wmf.8",
-"adywiki": "php-1.31.0-wmf.7",
-"afwiki": "php-1.31.0-wmf.7",
+"adywiki": "php-1.31.0-wmf.8",
+"afwiki": "php-1.31.0-wmf.8",
"afwikibooks": "php-1.31.0-wmf.8",
"afwikiquote": "php-1.31.0-wmf.8",
"afwiktionary": "php-1.31.0-wmf.8",
-"akwiki": "php-1.31.0-wmf.7",
+"akwiki": "php-1.31.0-wmf.8",
"akwikibooks": "php-1.31.0-wmf.8",
"akwiktionary": "php-1.31.0-wmf.8",
-"alswiki": "php-1.31.0-wmf.7",
+"alswiki": "php-1.31.0-wmf.8",
"alswikibooks": "php-1.31.0-wmf.8",
"alswikiquote": "php-1.31.0-wmf.8",
"alswiktionary": "php-1.31.0-wmf.8",
-"amwiki": "php-1.31.0-wmf.7",
+"amwiki": "php-1.31.0-wmf.8",
"amwikimedia": "php-1.31.0-wmf.8",
"amwikiquote": "php-1.31.0-wmf.8",
"amwiktionary": "php-1.31.0-wmf.8",
-"angwiki": "php-1.31.0-wmf.7",
+"angwiki": "php-1.31.0-wmf.8",
"angwikibooks": "php-1.31.0-wmf.8",
"angwikiquote": "php-1.31.0-wmf.8",
"angwikisource": "php-1.31.0-wmf.8",
"angwiktionary": "php-1.31.0-wmf.8",
-"anwiki": "php-1.31.0-wmf.7",
+"anwiki": "php-1.31.0-wmf.8",
"anwiktionary": "php-1.31.0-wmf.8",
-"arbcom_cswiki": "php-1.31.0-wmf.7",
-"arbcom_dewiki": "php-1.31.0-wmf.7",
-"arbcom_enwiki": "php-1.31.0-wmf.7",
-"arbcom_fiwiki": "php-1.31.0-wmf.7",
-"arbcom_nlwiki": "php-1.31.0-wmf.7",
-"arcwiki": "php-1.31.0-wmf.7",
-"arwiki": "php-1.31.0-wmf.7",
+"arbcom_cswiki": "php-1.31.0-wmf.8",
+"arbcom_dewiki": "php-1.31.0-wmf.8",
+"arbcom_enwiki": "php-1.31.0-wmf.8",
+"arbcom_fiwiki": "php-1.31.0-wmf.8",
+"arbcom_nlwiki": "php-1.31.0-wmf.8",
+"arcwiki": "php-1.31.0-wmf.8",
+"arwiki": "php-1.31.0-wmf.8",
"arwikibooks": "php-1.31.0-wmf.8",
"arwikimedia": "php-1.31.0-wmf.8",
"arwikinews": "php-1.31.0-wmf.8",
@@ -43,81 +43,81 @@
"arwikisource": "php-1.31.0-wmf.8",
"arwikiversity": "php-1.31.0-wmf.8",
"arwiktionary": "php-1.31.0-wmf.8",
-"arzwiki": "php-1.31.0-wmf.7",
-"astwiki": "php-1.31.0-wmf.7",
+"arzwiki": "php-1.31.0-wmf.8",
+"astwiki": "php-1.31.0-wmf.8",
"astwikibooks": "php-1.31.0-wmf.8",
"astwikiquote": "php-1.31.0-wmf.8",
"astwiktionary": "php-1.31.0-wmf.8",
-"aswiki": "php-1.31.0-wmf.7",
+"aswiki": "php-1.31.0-wmf.8",
"aswikibooks": "php-1.31.0-wmf.8",
"aswikisource": "php-1.31.0-wmf.8",
"aswiktionary": "php-1.31.0-wmf.8",
-"atjwiki": "php-1.31.0-wmf.7",
+"atjwiki": "php-1.31.0-wmf.8",
"auditcomwiki": "php-1.31.0-wmf.8",
-"avwiki": "php-1.31.0-wmf.7",
+"avwiki": "php-1.31.0-wmf.8",
"avwiktionary": "php-1.31.0-wmf.8",
-"aywiki": "php-1.31.0-wmf.7",
+"aywiki": "php-1.31.0-wmf.8",
"aywikibooks": "php-1.31.0-wmf.8",
"aywiktionary": "php-1.31.0-wmf.8",
-"azbwiki": "php-1.31.0-wmf.7",
-"azwiki": "php-1.31.0-wmf.7",
+"azbwiki": "php-1.31.0-wmf.8",
+"azwiki": "php-1.31.0-wmf.8",
"azwikibooks": "php-1.31.0-wmf.8",
"azwikiquote": "php-1.31.0-wmf.8",
"azwikisource": "php-1.31.0-wmf.8",
"azwiktionary": "php-1.31.0-wmf.8",
-"barwiki": "php-1.31.0-wmf.7",
-"bat_smgwiki": "php-1.31.0-wmf.7",
-"bawiki": "php-1.31.0-wmf.7",
+"barwiki": "php-1.31.0-wmf.8",
+"bat_smgwiki": "php-1.31.0-wmf.8",
+"bawiki": "php-1.31.0-wmf.8",
"bawikibooks": "php-1.31.0-wmf.8",
-"bclwiki": "php-1.31.0-wmf.7",
+"bclwiki": "php-1.31.0-wmf.8",
"bdwikimedia": "php-1.31.0-wmf.8",
-"be_x_oldwiki": "php-1.31.0-wmf.7",
+"be_x_oldwiki": "php-1.31.0-wmf.8",
"betawikiversity": "php-1.31.0-wmf.8",
-"bewiki": "php-1.31.0-wmf.7",
+"bewiki": "php-1.31.0-wmf.8",
"bewikibooks": "php-1.31.0-wmf.8",
"bewikimedia": "php-1.31.0-wmf.8",
"bewikiquote": "php-1.31.0-wmf.8",
"bewikisource": "php-1.31.0-wmf.8",
"bewiktionary": "php-1.31.0-wmf.8",
-"bgwiki": "php-1.31.0-wmf.7",
+"bgwiki": "php-1.31.0-wmf.8",
"bgwikibooks": "php-1.31.0-wmf.8",
"bgwikinews": "
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "group2 to wmf.8""
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392701 )
Change subject: Revert "Revert "group2 to wmf.8""
..
Revert "Revert "group2 to wmf.8""
This reverts commit 16443313c5f6745efb2d3869f116c03d04297d64.
Change-Id: Id5252657b3853467c4888aaef17bfb5135e9bf01
---
M wikiversions.json
1 file changed, 304 insertions(+), 304 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/01/392701/1
diff --git a/wikiversions.json b/wikiversions.json
index e875bc1..891d5bc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,41 +1,41 @@
{
-"aawiki": "php-1.31.0-wmf.7",
+"aawiki": "php-1.31.0-wmf.8",
"aawikibooks": "php-1.31.0-wmf.8",
"aawiktionary": "php-1.31.0-wmf.8",
-"abwiki": "php-1.31.0-wmf.7",
+"abwiki": "php-1.31.0-wmf.8",
"abwiktionary": "php-1.31.0-wmf.8",
-"acewiki": "php-1.31.0-wmf.7",
+"acewiki": "php-1.31.0-wmf.8",
"advisorywiki": "php-1.31.0-wmf.8",
-"adywiki": "php-1.31.0-wmf.7",
-"afwiki": "php-1.31.0-wmf.7",
+"adywiki": "php-1.31.0-wmf.8",
+"afwiki": "php-1.31.0-wmf.8",
"afwikibooks": "php-1.31.0-wmf.8",
"afwikiquote": "php-1.31.0-wmf.8",
"afwiktionary": "php-1.31.0-wmf.8",
-"akwiki": "php-1.31.0-wmf.7",
+"akwiki": "php-1.31.0-wmf.8",
"akwikibooks": "php-1.31.0-wmf.8",
"akwiktionary": "php-1.31.0-wmf.8",
-"alswiki": "php-1.31.0-wmf.7",
+"alswiki": "php-1.31.0-wmf.8",
"alswikibooks": "php-1.31.0-wmf.8",
"alswikiquote": "php-1.31.0-wmf.8",
"alswiktionary": "php-1.31.0-wmf.8",
-"amwiki": "php-1.31.0-wmf.7",
+"amwiki": "php-1.31.0-wmf.8",
"amwikimedia": "php-1.31.0-wmf.8",
"amwikiquote": "php-1.31.0-wmf.8",
"amwiktionary": "php-1.31.0-wmf.8",
-"angwiki": "php-1.31.0-wmf.7",
+"angwiki": "php-1.31.0-wmf.8",
"angwikibooks": "php-1.31.0-wmf.8",
"angwikiquote": "php-1.31.0-wmf.8",
"angwikisource": "php-1.31.0-wmf.8",
"angwiktionary": "php-1.31.0-wmf.8",
-"anwiki": "php-1.31.0-wmf.7",
+"anwiki": "php-1.31.0-wmf.8",
"anwiktionary": "php-1.31.0-wmf.8",
-"arbcom_cswiki": "php-1.31.0-wmf.7",
-"arbcom_dewiki": "php-1.31.0-wmf.7",
-"arbcom_enwiki": "php-1.31.0-wmf.7",
-"arbcom_fiwiki": "php-1.31.0-wmf.7",
-"arbcom_nlwiki": "php-1.31.0-wmf.7",
-"arcwiki": "php-1.31.0-wmf.7",
-"arwiki": "php-1.31.0-wmf.7",
+"arbcom_cswiki": "php-1.31.0-wmf.8",
+"arbcom_dewiki": "php-1.31.0-wmf.8",
+"arbcom_enwiki": "php-1.31.0-wmf.8",
+"arbcom_fiwiki": "php-1.31.0-wmf.8",
+"arbcom_nlwiki": "php-1.31.0-wmf.8",
+"arcwiki": "php-1.31.0-wmf.8",
+"arwiki": "php-1.31.0-wmf.8",
"arwikibooks": "php-1.31.0-wmf.8",
"arwikimedia": "php-1.31.0-wmf.8",
"arwikinews": "php-1.31.0-wmf.8",
@@ -43,81 +43,81 @@
"arwikisource": "php-1.31.0-wmf.8",
"arwikiversity": "php-1.31.0-wmf.8",
"arwiktionary": "php-1.31.0-wmf.8",
-"arzwiki": "php-1.31.0-wmf.7",
-"astwiki": "php-1.31.0-wmf.7",
+"arzwiki": "php-1.31.0-wmf.8",
+"astwiki": "php-1.31.0-wmf.8",
"astwikibooks": "php-1.31.0-wmf.8",
"astwikiquote": "php-1.31.0-wmf.8",
"astwiktionary": "php-1.31.0-wmf.8",
-"aswiki": "php-1.31.0-wmf.7",
+"aswiki": "php-1.31.0-wmf.8",
"aswikibooks": "php-1.31.0-wmf.8",
"aswikisource": "php-1.31.0-wmf.8",
"aswiktionary": "php-1.31.0-wmf.8",
-"atjwiki": "php-1.31.0-wmf.7",
+"atjwiki": "php-1.31.0-wmf.8",
"auditcomwiki": "php-1.31.0-wmf.8",
-"avwiki": "php-1.31.0-wmf.7",
+"avwiki": "php-1.31.0-wmf.8",
"avwiktionary": "php-1.31.0-wmf.8",
-"aywiki": "php-1.31.0-wmf.7",
+"aywiki": "php-1.31.0-wmf.8",
"aywikibooks": "php-1.31.0-wmf.8",
"aywiktionary": "php-1.31.0-wmf.8",
-"azbwiki": "php-1.31.0-wmf.7",
-"azwiki": "php-1.31.0-wmf.7",
+"azbwiki": "php-1.31.0-wmf.8",
+"azwiki": "php-1.31.0-wmf.8",
"azwikibooks": "php-1.31.0-wmf.8",
"azwikiquote": "php-1.31.0-wmf.8",
"azwikisource": "php-1.31.0-wmf.8",
"azwiktionary": "php-1.31.0-wmf.8",
-"barwiki": "php-1.31.0-wmf.7",
-"bat_smgwiki": "php-1.31.0-wmf.7",
-"bawiki": "php-1.31.0-wmf.7",
+"barwiki": "php-1.31.0-wmf.8",
+"bat_smgwiki": "php-1.31.0-wmf.8",
+"bawiki": "php-1.31.0-wmf.8",
"bawikibooks": "php-1.31.0-wmf.8",
-"bclwiki": "php-1.31.0-wmf.7",
+"bclwiki": "php-1.31.0-wmf.8",
"bdwikimedia": "php-1.31.0-wmf.8",
-"be_x_oldwiki": "php-1.31.0-wmf.7",
+"be_x_oldwiki": "php-1.31.0-wmf.8",
"betawikiversity": "php-1.31.0-wmf.8",
-"bewiki": "php-1.31.0-wmf.7",
+"bewiki": "php-1.31.0-wmf.8",
"bewikibooks": "php-1.31.0-wmf.8",
"bewikimedia": "php-1.31.0-wmf.8",
"bewikiquote": "php-1.31.0-wmf.8",
"bewikisource": "php-1.31.0-wmf.8",
"bewiktionary": "php-1.31.0-wmf.8",
-"bgwiki": "php-1.31.0-wmf.7",
+"bgwi
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: git community logo
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392181 ) Change subject: Gerrit: git community logo .. Gerrit: git community logo Change-Id: I3dbd253b8d88ddeee10b216ad9ef3a141f22dad3 --- M modules/gerrit/files/etc/GerritSite.css M modules/gerrit/files/static/wikimedia-codereview-logo.cache.png M modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg 3 files changed, 5 insertions(+), 10,541 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/81/392181/1 -- To view, visit https://gerrit.wikimedia.org/r/392181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dbd253b8d88ddeee10b216ad9ef3a141f22dad3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: docker: operations-puppet -> docker-pkg image
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391734 ) Change subject: docker: operations-puppet -> docker-pkg image .. docker: operations-puppet -> docker-pkg image Transition operations-puppet-tests-docker to use the new docker-pkg built image. Bug: T177276 Change-Id: I1d93e68882fc4a3492c48b3293a7db0aa801c8e9 --- M jjb/operations-puppet.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/34/391734/1 diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml index 58663e9..b5848eb 100644 --- a/jjb/operations-puppet.yaml +++ b/jjb/operations-puppet.yaml @@ -54,7 +54,7 @@ - docker-zuul-env - docker-log-dir - docker-run-with-log: -image: 'wmfreleng/operations-puppet:v2017.10.13.12.32' +image: 'docker-registry.wikimedia.org/releng/operations-puppet:0.1.0' logdir: '/srv/workspace/log' wrappers: - timeout: -- To view, visit https://gerrit.wikimedia.org/r/391734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d93e68882fc4a3492c48b3293a7db0aa801c8e9 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove comment from big email regex
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391652 ) Change subject: Remove comment from big email regex .. Remove comment from big email regex Change-Id: I68e2ab1a9f54c226698859bf22c2976f8a241d31 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/52/391652/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 9c523bf..834d5c8 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -230,7 +230,7 @@ | tacsipacsi@jnet\.hu | tamaraslosarek@gmail\.com | terracodes@outlook\.com -| terracodes@tools.wmflabs\.org # Secondary mail of user TerraCodes +| terracodes@tools.wmflabs\.org | tasneem\.lo\.31@gmail\.com | thalia\.e\.chan@googlemail\.com | thomasmulhall410@yahoo\.com -- To view, visit https://gerrit.wikimedia.org/r/391652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68e2ab1a9f54c226698859bf22c2976f8a241d31 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: New fab task for rebuilding docker-pkg images
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391592 )
Change subject: New fab task for rebuilding docker-pkg images
..
New fab task for rebuilding docker-pkg images
Automates the task of updating integration/config on contint1001 and
rebuilding the docker-pkg dockerfiles there.
Change-Id: I993080dd9e2153cea766aeecc1decfab36d8767b
---
M fabfile.py
1 file changed, 47 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/92/391592/1
diff --git a/fabfile.py b/fabfile.py
index 271a4d6..2307854 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -19,24 +19,58 @@
env.use_ssh_config = True
+def _update_integration_config(
+diff_dir='zuul', log_msg='Reloading Zuul to deploy [hash]'):
+env.sudo_user = 'zuul'
+with cd('/etc/zuul/wikimedia'):
+sudo('git remote update')
+sudo('git --no-pager log -p HEAD..origin/master {}'.format(diff_dir))
+if confirm('Does the diff look good?') and confirm(
+'Did you log your reload in #wikimedia-releng (e.g. ' +
+'"!log {}")'.format(log_msg)):
+sudo('git rebase')
+sudo('git -c gc.auto=128 gc --auto --quiet')
+
+return True
+
+return False
+
+
+@task
+def deploy_docker():
+"""Update docker-pkg built images"""
+env.host_string = 'contint1001.wikimedia.org'
+
+updated = _update_integration_config(
+diff_dir='dockerfiles',
+log_msg='Updating docker-pkg files on contint1001 for [hash]'
+)
+
+if not updated:
+return
+
+with cd('/tmp'):
+env.sudo_user = 'jenkins-slave'
+
+docker_pkg = '/srv/deployment/docker-pkg/venv/bin/docker-pkg'
+docker_pkg_config = '/etc/docker-pkg/integration.yaml'
+dockerfiles = '/etc/zuul/wikimedia/dockerfiles'
+cmd = '{} -c {} {}'.format(docker_pkg, docker_pkg_config, dockerfiles)
+
+sudo(cmd)
+
+sudo('cat /tmp/docker-pkg-build.log')
+
+if confirm('delete build log?'):
+sudo('rm /tmp/docker-pkg-build.log')
+
+
@task
def deploy_zuul():
"""Deploy a Zuul layout change"""
-env.sudo_user = 'zuul'
env.host_string = 'contint1001.wikimedia.org'
-do_reload = False
-with cd('/etc/zuul/wikimedia'):
-sudo('git remote update')
-sudo('git --no-pager log -p HEAD..origin/master zuul')
-if confirm('Does the diff look good?') and confirm(
-'Did you log your reload in #wikimedia-releng (e.g. ' +
-'"!log Reloading Zuul to deploy [hash]")'):
-sudo('git rebase')
-sudo('git -c gc.auto=128 gc --auto --quiet')
-do_reload = True
-
-if do_reload:
+if _update_integration_config():
env.sudo_user = 'root'
sudo('/usr/sbin/service zuul reload', shell=False)
--
To view, visit https://gerrit.wikimedia.org/r/391592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I993080dd9e2153cea766aeecc1decfab36d8767b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Update example-run to match docker-pkg output
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391576 ) Change subject: Update example-run to match docker-pkg output .. Update example-run to match docker-pkg output Change-Id: I61677186e1efdbdbbc43fad3accef732b70ce020 --- M dockerfiles/operations-puppet/example-run.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/76/391576/1 diff --git a/dockerfiles/operations-puppet/example-run.sh b/dockerfiles/operations-puppet/example-run.sh index dfc5cf2..eaf77e5 100644 --- a/dockerfiles/operations-puppet/example-run.sh +++ b/dockerfiles/operations-puppet/example-run.sh @@ -8,4 +8,4 @@ --env ZUUL_COMMIT=72d31ffb0fa612482d268b6f5484785842cd0fda \ --env ZUUL_REF=refs/changes/49/374349/2 \ --volume /$(pwd)/log://srv/workspace/log \ - wmfreleng/operations-puppet:0.1.0 +docker-registry.wikimedia.org/releng/operations-puppet:0.1.0 -- To view, visit https://gerrit.wikimedia.org/r/391576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61677186e1efdbdbbc43fad3accef732b70ce020 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove now unused prebuild.sh
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391574 ) Change subject: Remove now unused prebuild.sh .. Remove now unused prebuild.sh Change-Id: I3fdc7717317396521062724ac6a7ea2cdcfab96a --- D dockerfiles/operations-puppet/prebuild.sh 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/74/391574/1 diff --git a/dockerfiles/operations-puppet/prebuild.sh b/dockerfiles/operations-puppet/prebuild.sh deleted file mode 100755 index bc5ff61..000 --- a/dockerfiles/operations-puppet/prebuild.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -# This is copied in Dockerfile to ensure that a build step grabs a fresh -# copy of the git repo when it is updated rather than using a layer from -# the local Docker cache. - -git ls-remote --exit-code https://gerrit.wikimedia.org/r/p/operations/puppet.git refs/heads/production > .cache-buster-operations-puppet -- To view, visit https://gerrit.wikimedia.org/r/391574 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fdc7717317396521062724ac6a7ea2cdcfab96a Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Match docker-pkg-config.yaml to contint1001
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391575 ) Change subject: Match docker-pkg-config.yaml to contint1001 .. Match docker-pkg-config.yaml to contint1001 The namespace on contint1001 is releng, so when images are built on contint1001 they use that namespace. To insure that we can test images locally, we need to match that namespace. Change-Id: Ic57aebfdf6724f977ee5eee8be533084078d4a0d --- M dockerfiles/docker-pkg-config.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/75/391575/1 diff --git a/dockerfiles/docker-pkg-config.yaml b/dockerfiles/docker-pkg-config.yaml index 8a2dbd6..8e90736 100644 --- a/dockerfiles/docker-pkg-config.yaml +++ b/dockerfiles/docker-pkg-config.yaml @@ -1,3 +1,3 @@ registry: docker-registry.wikimedia.org seed_image: docker-registry.wikimedia.org/wikimedia-jessie:latest -namespace: ci +namespace: releng -- To view, visit https://gerrit.wikimedia.org/r/391575 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic57aebfdf6724f977ee5eee8be533084078d4a0d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...docker-pkg[master]: Fix missing postfix heading for Step 2
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391569 )
Change subject: Fix missing postfix heading for Step 2
..
Fix missing postfix heading for Step 2
Change-Id: Id89322418dc70a0e8cc701ad7af2e9c7e433c265
---
M docker_pkg/cli.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/docker-images/docker-pkg
refs/changes/69/391569/1
diff --git a/docker_pkg/cli.py b/docker_pkg/cli.py
index a54357d..c266bd2 100644
--- a/docker_pkg/cli.py
+++ b/docker_pkg/cli.py
@@ -65,7 +65,7 @@
print(" ERROR: image {image} failed to build, see logs for
details".format(
image=img.name))
# Publishing
-print("== Step 2: publishing")
+print("== Step 2: publishing ==")
if not all([config['username'], config['password']]):
print("NOT publishing images as we have no auth setup")
else:
--
To view, visit https://gerrit.wikimedia.org/r/391569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id89322418dc70a0e8cc701ad7af2e9c7e433c265
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/docker-pkg
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: scap: upgrade to 3.7.3-1
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391219 )
Change subject: scap: upgrade to 3.7.3-1
..
scap: upgrade to 3.7.3-1
Bugfix release for IRC announce problems
Bug: T127762
Change-Id: I5292f3a1112f6c52ed1ed3059f8c5534e0bf3b66
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/391219/1
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 6e3f23d..12d5f93 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
class scap (
$deployment_server = 'deployment',
$wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.2-1',
+$version = '3.7.3-1',
) {
package { 'scap':
ensure => $version,
--
To view, visit https://gerrit.wikimedia.org/r/391219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5292f3a1112f6c52ed1ed3059f8c5534e0bf3b66
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...docker-pkg[master]: Add Jinja2 expression statement
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390174 ) Change subject: Add Jinja2 expression statement .. Add Jinja2 expression statement This change to the Jinja2 Environment adds support for the do tag in templates. Change-Id: I71c1263503d55a1f6880d47072e7575309c2bd86 --- M docker_pkg/dockerfile.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/docker-images/docker-pkg refs/changes/74/390174/1 diff --git a/docker_pkg/dockerfile.py b/docker_pkg/dockerfile.py index bc5a19d..4987ad9 100644 --- a/docker_pkg/dockerfile.py +++ b/docker_pkg/dockerfile.py @@ -9,7 +9,7 @@ @classmethod def setup(cls, config, known_images): -cls.env = Environment() +cls.env = Environment(extensions=['jinja2.ext.do']) cls.config = config cls.known_images = known_images cls.setup_filters() -- To view, visit https://gerrit.wikimedia.org/r/390174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71c1263503d55a1f6880d47072e7575309c2bd86 Gerrit-PatchSet: 1 Gerrit-Project: operations/docker-images/docker-pkg Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Pipeline testing
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/389508 ) Change subject: Pipeline testing .. Pipeline testing This change is not meant to be merged, but it will let me play around with the testing pipeline. Change-Id: Id7f64a3e2e3da5fd190d2e9b91c0034fc20f8868 --- M README.md 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid refs/changes/08/389508/1 diff --git a/README.md b/README.md index 1fbc5cf..75e6b71 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,11 @@ npm install ``` +### Useless changes for testing purposes + +Useless changes for the purposes of triggering testing pipelines, like this +one, should not be merged. + [1]: https://travis-ci.org/physikerwelt/mathoid-server.svg [2]: https://travis-ci.org/physikerwelt/mathoid-server [3]: https://david-dm.org/physikerwelt/mathoid-server.svg -- To view, visit https://gerrit.wikimedia.org/r/389508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7f64a3e2e3da5fd190d2e9b91c0034fc20f8868 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: SSD: Add npm-service-pipeline experimental job
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/388546 ) Change subject: SSD: Add npm-service-pipeline experimental job .. SSD: Add npm-service-pipeline experimental job Run the blubber service-pipeline as a experimental check. Want to ensure that the time is comparable to the current npm-node-6-jessie job before adding it to non-voting test. Bug: T177954 Change-Id: I1d2de2309910138b0bab4bd9258235ec1aa37b3e --- M zuul/layout.yaml 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/46/388546/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 290645d..7925bea 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1219,6 +1219,16 @@ experimental: - npm-node-6-docker + - name: npm-service-pipeline +test: + - npm-node-6-jessie +gate-and-submit: &npm-gate-and-submit + - npm-node-6-jessie +gate-and-submit-swat: *npm-gate-and-submit +experimental: + - npm-node-6-docker + - service-pipeline-test-only + - name: mwgate-npm test: - mwgate-npm-node-6-docker @@ -6472,7 +6482,7 @@ - name: mediawiki/services/mathoid template: - - name: npm + - name: npm-service-pipeline - name: mediawiki/services/mathoid/deploy test: -- To view, visit https://gerrit.wikimedia.org/r/388546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d2de2309910138b0bab4bd9258235ec1aa37b3e Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Scap prep: check reference directory exists
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387743 )
Change subject: Scap prep: check reference directory exists
..
Scap prep: check reference directory exists
To setup scap testing environments, we need to be able to run scap prep
without having any prior wikiversions. We currently assume that the last
wikiversion from wikiversions.json is checked out on disk. This isn't
the case for new servers or for testing environments.
Change-Id: Ib83952ad1c475b06d268d3fa719c01e3fd6624be
---
M scap/plugins/prep.py
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/43/387743/1
diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index c87d8f0..b207f9c 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -100,7 +100,11 @@
self.get_logger().info('Version already checked out')
return 0
-git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', copy_dir)
+reference_dir = None
+if os.path.isdir(copy_dir):
+reference_dir = copy_dir
+
+git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', reference_dir)
with utils.cd(dest_dir):
if subprocess.call(['/usr/bin/git', 'config',
--
To view, visit https://gerrit.wikimedia.org/r/387743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib83952ad1c475b06d268d3fa719c01e3fd6624be
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.31.0-wmf.3]: Revert "Revert "ContainmentSet: Use strict comparison for ar...
Hello Catrope, jenkins-bot, Dbarratt,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/384628
to review the following change.
Change subject: Revert "Revert "ContainmentSet: Use strict comparison for
array_search()""
..
Revert "Revert "ContainmentSet: Use strict comparison for array_search()""
This reverts commit 3e731778bba59e8b3b31f76aabbd359e00f6f4d4.
Change-Id: I7e6c85050da3fde83288499853832009f1b22f0e
---
M includes/ContainmentSet.php
M tests/phpunit/ContainmentSetTest.php
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/28/384628/1
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index d5cfff5..0803da0 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -111,7 +111,8 @@
*/
public function contains( $value ) {
foreach ( $this->lists as $list ) {
- if ( array_search( $value, $list->getValues() ) !==
false ) {
+ // Use strict comparison to prevent the number 0 from
matching all strings (T177825)
+ if ( array_search( $value, $list->getValues(), true )
!== false ) {
return true;
}
}
diff --git a/tests/phpunit/ContainmentSetTest.php
b/tests/phpunit/ContainmentSetTest.php
index 077e235..5971c81 100644
--- a/tests/phpunit/ContainmentSetTest.php
+++ b/tests/phpunit/ContainmentSetTest.php
@@ -15,6 +15,9 @@
$list->addArray( [ 'whammo' ] );
$this->assertTrue( $list->contains( 'whammo' ) );
+
+ $list->addArray( [ 0 ] );
+ $this->assertFalse( $list->contains( 'baz' ) );
}
public function testCachedListInnerListIsOnlyCalledOnce() {
--
To view, visit https://gerrit.wikimedia.org/r/384628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e6c85050da3fde83288499853832009f1b22f0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.31.0-wmf.3
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Dbarratt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.31.0-wmf.3]: Revert "ContainmentSet: Use strict comparison for array_sear...
Hello Catrope, jenkins-bot, Dbarratt,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/384575
to review the following change.
Change subject: Revert "ContainmentSet: Use strict comparison for
array_search()"
..
Revert "ContainmentSet: Use strict comparison for array_search()"
This reverts commit d4167ce99b988a062e36d25c81613827fea82dbf.
Change-Id: I94b8e63094051359bdfab4aefb03fa0c908de5c2
---
M includes/ContainmentSet.php
M tests/phpunit/ContainmentSetTest.php
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/75/384575/1
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index 0803da0..d5cfff5 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -111,8 +111,7 @@
*/
public function contains( $value ) {
foreach ( $this->lists as $list ) {
- // Use strict comparison to prevent the number 0 from
matching all strings (T177825)
- if ( array_search( $value, $list->getValues(), true )
!== false ) {
+ if ( array_search( $value, $list->getValues() ) !==
false ) {
return true;
}
}
diff --git a/tests/phpunit/ContainmentSetTest.php
b/tests/phpunit/ContainmentSetTest.php
index 5971c81..077e235 100644
--- a/tests/phpunit/ContainmentSetTest.php
+++ b/tests/phpunit/ContainmentSetTest.php
@@ -15,9 +15,6 @@
$list->addArray( [ 'whammo' ] );
$this->assertTrue( $list->contains( 'whammo' ) );
-
- $list->addArray( [ 0 ] );
- $this->assertFalse( $list->contains( 'baz' ) );
}
public function testCachedListInnerListIsOnlyCalledOnce() {
--
To view, visit https://gerrit.wikimedia.org/r/384575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94b8e63094051359bdfab4aefb03fa0c908de5c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.31.0-wmf.3
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Dbarratt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: scap: upgrade to 3.7.1-1
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383879 )
Change subject: scap: upgrade to 3.7.1-1
..
scap: upgrade to 3.7.1-1
Bug: T127762
Change-Id: Ie839cdb380a17d3450e225acde6d6406de048447
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/383879/1
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 4d791bf..1683472 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
class scap (
$deployment_server = 'deployment',
$wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.0-1',
+$version = '3.7.1-1',
) {
package { 'scap':
ensure => $version,
--
To view, visit https://gerrit.wikimedia.org/r/383879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie839cdb380a17d3450e225acde6d6406de048447
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Enable Vector print logo on test wiki"
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383484 )
Change subject: Revert "Enable Vector print logo on test wiki"
..
Revert "Enable Vector print logo on test wiki"
This reverts commit e8ab435a3564ebd3f4f964110b43ca1e8669de98.
Change-Id: Ia7b092e559487058b6a9b5909c4404f44dfe89a1
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/84/383484/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8c7ceea..d53b1de 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -650,20 +650,6 @@
wfLoadSkin( 'Timeless' ); // T154371
}
-// The Print logo for Vector should use the same wordmark as Minerva
-// This avoids duplicate config entries (T169732)
-if (
- isset( $wgMinervaCustomLogos['copyright'] ) &&
- isset( $wgMinervaCustomLogos['copyright-height'] ) &&
- isset( $wgMinervaCustomLogos['copyright-width'] )
-) {
- $wgVectorPrintLogo = [
- 'width' => $wgMinervaCustomLogos['copyright-width'],
- 'height' => $wgMinervaCustomLogos['copyright-height'],
- 'url' => $wgMinervaCustomLogos['copyright'],
- ];
-}
-
// Grants and rights
// Note these have to be visible on all wikis, not just the ones the
// extension is enabled on, for proper display in OAuth pages and such.
--
To view, visit https://gerrit.wikimedia.org/r/383484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7b092e559487058b6a9b5909c4404f44dfe89a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Dockerfiles: Add build.py tests
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382745 )
Change subject: Dockerfiles: Add build.py tests
..
Dockerfiles: Add build.py tests
Change-Id: I7d4df1443b9d50df45f7284af43e7cc1dee1dbca
---
M dockerfiles/build.py
A dockerfiles/test-requirements.txt
A dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-one/Dockerfile
A dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-three/Dockerfile
A dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-two/Dockerfile
A dockerfiles/tests/fixtures/dockerfiles/ci-fixture/Dockerfile
A dockerfiles/tests/test_dockerfiles_build.py
M tox.ini
8 files changed, 70 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/45/382745/1
diff --git a/dockerfiles/build.py b/dockerfiles/build.py
index 15393ff..b085263 100755
--- a/dockerfiles/build.py
+++ b/dockerfiles/build.py
@@ -19,7 +19,8 @@
class DockerBuilder(object):
-def __init__(self):
+def __init__(self, base_dir=BASE_DIR):
+self.base_dir = base_dir
self.pushes = []
def run(self):
@@ -52,7 +53,7 @@
self.log.info('Will build: %s' % ', '.join(images))
dockerfiles = [
-os.path.join(BASE_DIR, f, 'Dockerfile')
+os.path.join(self.base_dir, f, 'Dockerfile')
for f in images
]
@@ -66,8 +67,8 @@
def load_config(self):
config = configparser.ConfigParser()
config.read([
-os.path.join(BASE_DIR, 'build.conf.default'),
-os.path.join(BASE_DIR, 'build.conf'),
+os.path.join(self.base_dir, 'build.conf.default'),
+os.path.join(self.base_dir, 'build.conf'),
])
self.config = config
@@ -96,7 +97,7 @@
self.args = parser.parse_args()
def find_docker_files(self):
-return sorted(glob(os.path.join(BASE_DIR, '*/Dockerfile')))
+return sorted(glob(os.path.join(self.base_dir, '*/Dockerfile')))
def update_jjb(self, img, tagged_img):
regex = re.compile('%s:v[0-9\.]+' % img)
@@ -204,7 +205,7 @@
self.log.debug('Building %s' % dockerfile)
image_dir = os.path.dirname(dockerfile)
-image_name = os.path.relpath(image_dir, BASE_DIR)
+image_name = os.path.relpath(image_dir, self.base_dir)
self.log.info('Image name: %s' % image_name)
img = '/'.join([DOCKER_HUB_ACCOUNT, image_name])
diff --git a/dockerfiles/test-requirements.txt
b/dockerfiles/test-requirements.txt
new file mode 100644
index 000..f3c7e8e
--- /dev/null
+++ b/dockerfiles/test-requirements.txt
@@ -0,0 +1 @@
+nose
diff --git
a/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-one/Dockerfile
b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-one/Dockerfile
new file mode 100644
index 000..831546c
--- /dev/null
+++ b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-one/Dockerfile
@@ -0,0 +1 @@
+FROM debian:stretch
diff --git
a/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-three/Dockerfile
b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-three/Dockerfile
new file mode 100644
index 000..7464243
--- /dev/null
+++ b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-three/Dockerfile
@@ -0,0 +1 @@
+FROM wmfreleng/ci-fixture-child-two:v1.2.3 as parent
diff --git
a/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-two/Dockerfile
b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-two/Dockerfile
new file mode 100644
index 000..399c8a9
--- /dev/null
+++ b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture-child-two/Dockerfile
@@ -0,0 +1,2 @@
+FROM wmfreleng/ci-fixture:v1.2.3
+FROM wmfreleng/ci-fixture-child-one:v1.2.3 as parent
diff --git a/dockerfiles/tests/fixtures/dockerfiles/ci-fixture/Dockerfile
b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture/Dockerfile
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/dockerfiles/tests/fixtures/dockerfiles/ci-fixture/Dockerfile
diff --git a/dockerfiles/tests/test_dockerfiles_build.py
b/dockerfiles/tests/test_dockerfiles_build.py
new file mode 100644
index 000..9ce0f92
--- /dev/null
+++ b/dockerfiles/tests/test_dockerfiles_build.py
@@ -0,0 +1,51 @@
+import logging
+import os
+import sys
+import unittest
+
+BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.join(BASE_DIR, '..'))
+
+import build
+
+
+FIXTURES = os.path.join(BASE_DIR, 'fixtures', 'dockerfiles')
+
+
+class TestDockerfilesBuild(unittest.TestCase):
+def make_image_name(self, name):
+return os.path.join(build.DOCKER_HUB_ACCOUNT, name)
+
+def test_parse_from(self):
+b = build.DockerBuilder(base_dir=FIXTURES)
+x = b._parse_FROM('FROM foo:1.2.3 as bar')
+self.assertTrue(x['image'] == 'foo')
+self.assertTrue(x['tag'] == '1.2.3')
+self.assertTrue(x['digest'] is None)
+
+def
[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: docker pusher
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382608 )
Change subject: WIP: docker pusher
..
WIP: docker pusher
Change-Id: Ifabeec98d672768db80f722cf8df8e4d9d8b1fd0
---
A modules/docker_pusher/files/docker_pusher.py
A modules/docker_pusher/manifests/init.pp
M modules/profile/manifests/ci/docker.pp
A modules/profile/manifests/ci/pipeline.pp
M modules/profile/manifests/ci/slave.pp
M modules/role/manifests/ci/master.pp
6 files changed, 53 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/382608/1
diff --git a/modules/docker_pusher/files/docker_pusher.py
b/modules/docker_pusher/files/docker_pusher.py
new file mode 100644
index 000..49bc32a
--- /dev/null
+++ b/modules/docker_pusher/files/docker_pusher.py
@@ -0,0 +1,12 @@
+#!/usr/bin/python3
+
+
+def main():
+"""
+Placeholder for now.
+"""
+pass
+
+
+if __name__ == '__main__':
+main()
diff --git a/modules/docker_pusher/manifests/init.pp
b/modules/docker_pusher/manifests/init.pp
new file mode 100644
index 000..ef638ab
--- /dev/null
+++ b/modules/docker_pusher/manifests/init.pp
@@ -0,0 +1,29 @@
+# == Class docker_pusher
+#
+# Installs small push script used by CI
+class docker_pusher {
+file { '/etc/docker-pusher':
+ensure => 'directory',
+owner => 'root',
+group => 'root',
+mode => '0400',
+}
+
+file { '/etc/docker-pusher/config.yaml':
+ensure=> 'present',
+owner => 'root',
+group => 'root',
+mode => '0400',
+content => secret('docker-pusher/config.yaml'),
+show_diff => false,
+}
+
+file { '/usr/local/bin/docker-pusher':
+ensure => 'present',
+owner => 'root',
+group => 'root',
+mode => '0700',
+source => 'puppet:///modules/docker_pusher/docker_pusher.py',
+}
+}
+
diff --git a/modules/profile/manifests/ci/docker.pp
b/modules/profile/manifests/ci/docker.pp
index fa5c784..55107a4 100644
--- a/modules/profile/manifests/ci/docker.pp
+++ b/modules/profile/manifests/ci/docker.pp
@@ -5,6 +5,9 @@
class profile::ci::docker(
$jenkins_agent_username = hiera('jenkins_agent_username'),
) {
+# We will need to build containers in production
+require_package('blubber')
+
apt::repository { 'thirdparty-ci':
uri=> 'http://apt.wikimedia.org/wikimedia',
dist => "${::lsbdistcodename}-wikimedia",
diff --git a/modules/profile/manifests/ci/pipeline.pp
b/modules/profile/manifests/ci/pipeline.pp
new file mode 100644
index 000..391a993
--- /dev/null
+++ b/modules/profile/manifests/ci/pipeline.pp
@@ -0,0 +1,8 @@
+# == profile::ci::pipeline
+#
+# Profile that makes necessary provisions for building containers for
+# production.
+class profile::ci::pipeline() {
+include ::profile::ci::docker
+include ::docker_pusher
+}
diff --git a/modules/profile/manifests/ci/slave.pp
b/modules/profile/manifests/ci/slave.pp
index 751d01f..adfbb06 100644
--- a/modules/profile/manifests/ci/slave.pp
+++ b/modules/profile/manifests/ci/slave.pp
@@ -10,11 +10,7 @@
class profile::ci::slave {
include contint::packages::base
include contint::slave_scripts
-include ::profile::ci::docker
include ::profile::zuul::cloner
-
-# We will need to build containers in production
-require_package('blubber')
class { 'jenkins::slave':
# Master connect to itself via the fqdn / primary IP ipaddress
diff --git a/modules/role/manifests/ci/master.pp
b/modules/role/manifests/ci/master.pp
index d5a7547..f190e06 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -19,6 +19,7 @@
include ::profile::ci::jenkins
include ::profile::ci::slave
include ::profile::ci::website
+include ::profile::ci::pipeline
include ::profile::zuul::merger
include ::profile::zuul::server
}
--
To view, visit https://gerrit.wikimedia.org/r/382608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifabeec98d672768db80f722cf8df8e4d9d8b1fd0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.31.0-wmf.2]: Revert "Use User Ids instead of User Names for Echo Mute"
Hello jenkins-bot, Dbarratt,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/382522
to review the following change.
Change subject: Revert "Use User Ids instead of User Names for Echo Mute"
..
Revert "Use User Ids instead of User Names for Echo Mute"
This reverts commit 7ce947ebc50c8cad32fe31df6fc73bee73761bba.
Change-Id: I7d69fd30e1c9ce4a22466a35ea8af51b736269b2
---
M Hooks.php
M extension.json
M includes/ContainmentSet.php
D maintenance/updatePerUserBlacklist.php
4 files changed, 5 insertions(+), 131 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/22/382522/1
diff --git a/Hooks.php b/Hooks.php
index 4a7c06a..8e3db35 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -490,15 +490,10 @@
}
if ( $wgEchoPerUserBlacklist ) {
- $lookup = CentralIdLookup::factory();
- $ids = $user->getOption(
'echo-notifications-blacklist', [] );
- $names = $ids ? $lookup->namesFromCentralIds( $ids,
$user ) : [];
-
$preferences['echo-notifications-blacklist'] = [
'type' => 'usersmultiselect',
'label-message' =>
'echo-pref-notifications-blacklist',
'section' => 'echo/blocknotificationslist',
- 'default' => implode( "\n", $names )
];
}
@@ -1257,10 +1252,6 @@
$options['echo-subscriptions-email-edit-user-talk'] =
$options['enotifusertalkpages'];
}
- if ( isset( $options['echo-notifications-blacklist'] ) ) {
- $options['echo-notifications-blacklist'] = array_map(
'intval', explode( "\n", $options['echo-notifications-blacklist'] ) );
- }
-
return true;
}
@@ -1277,28 +1268,6 @@
if ( isset( $options['echo-subscriptions-email-edit-user-talk']
) ) {
$options['enotifusertalkpages'] =
$options['echo-subscriptions-email-edit-user-talk'];
unset(
$options['echo-subscriptions-email-edit-user-talk'] );
- }
-
- // Convert usernames to ids.
- if ( isset( $options['echo-notifications-blacklist'] ) ) {
- if ( $options['echo-notifications-blacklist'] ) {
- $value =
$options['echo-notifications-blacklist'];
- // Notification Blacklist may be an array of
ids or a string of new line
- // delimnated user names.
- if ( is_array( $value ) ) {
- $ids = array_filter( $value,
'is_numeric' );
- } else {
- $lookup = CentralIdLookup::factory();
- $names = explode( "\n", $value );
- $ids = $lookup->centralIdsFromNames(
$names, $user );
- }
-
- $user->setOption(
'echo-notifications-blacklist', $ids );
- $options['echo-notifications-blacklist'] =
implode( "\n", $user->getOption( 'echo-notifications-blacklist' ) );
- } else {
- // If the blacklist is empty, set it to null
rather than an empty string.
- $options['echo-notifications-blacklist'] = null;
- }
}
return true;
diff --git a/extension.json b/extension.json
index dc21551..39606db 100644
--- a/extension.json
+++ b/extension.json
@@ -1019,7 +1019,6 @@
"SpecialNotificationsMarkRead":
"includes/special/SpecialNotificationsMarkRead.php",
"SuppressionMaintenanceTest":
"tests/phpunit/maintenance/SupressionMaintenanceTest.php",
"TestDiscussionParser": "maintenance/testDiscussionParser.php",
- "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php",
- "EchoUpdatePerUserBlacklist":
"maintenance/updatePerUserBlacklist.php"
+ "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php"
}
}
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index d5cfff5..4b6ce1f 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -71,12 +71,12 @@
* @param string $preferenceName
*/
public function addFromUserOption( $preferenceName ) {
- $preference = $this->recipient->getOption( $preferenceName, []
);
+ $preference = $this->recipient->getOption( $preferenceName );
[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.31.0-wmf.1]: Revert "Use User Ids instead of User Names for Echo Mute"
Hello jenkins-bot, Dbarratt,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/382521
to review the following change.
Change subject: Revert "Use User Ids instead of User Names for Echo Mute"
..
Revert "Use User Ids instead of User Names for Echo Mute"
This reverts commit 51d83fb7fedcd1e3327bab972f56e24f802ba0fe.
Change-Id: I1387e9132a1575305b05ba7efaab387737e95002
---
M Hooks.php
M extension.json
M includes/ContainmentSet.php
D maintenance/updatePerUserBlacklist.php
4 files changed, 5 insertions(+), 131 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/21/382521/1
diff --git a/Hooks.php b/Hooks.php
index 4a7c06a..8e3db35 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -490,15 +490,10 @@
}
if ( $wgEchoPerUserBlacklist ) {
- $lookup = CentralIdLookup::factory();
- $ids = $user->getOption(
'echo-notifications-blacklist', [] );
- $names = $ids ? $lookup->namesFromCentralIds( $ids,
$user ) : [];
-
$preferences['echo-notifications-blacklist'] = [
'type' => 'usersmultiselect',
'label-message' =>
'echo-pref-notifications-blacklist',
'section' => 'echo/blocknotificationslist',
- 'default' => implode( "\n", $names )
];
}
@@ -1257,10 +1252,6 @@
$options['echo-subscriptions-email-edit-user-talk'] =
$options['enotifusertalkpages'];
}
- if ( isset( $options['echo-notifications-blacklist'] ) ) {
- $options['echo-notifications-blacklist'] = array_map(
'intval', explode( "\n", $options['echo-notifications-blacklist'] ) );
- }
-
return true;
}
@@ -1277,28 +1268,6 @@
if ( isset( $options['echo-subscriptions-email-edit-user-talk']
) ) {
$options['enotifusertalkpages'] =
$options['echo-subscriptions-email-edit-user-talk'];
unset(
$options['echo-subscriptions-email-edit-user-talk'] );
- }
-
- // Convert usernames to ids.
- if ( isset( $options['echo-notifications-blacklist'] ) ) {
- if ( $options['echo-notifications-blacklist'] ) {
- $value =
$options['echo-notifications-blacklist'];
- // Notification Blacklist may be an array of
ids or a string of new line
- // delimnated user names.
- if ( is_array( $value ) ) {
- $ids = array_filter( $value,
'is_numeric' );
- } else {
- $lookup = CentralIdLookup::factory();
- $names = explode( "\n", $value );
- $ids = $lookup->centralIdsFromNames(
$names, $user );
- }
-
- $user->setOption(
'echo-notifications-blacklist', $ids );
- $options['echo-notifications-blacklist'] =
implode( "\n", $user->getOption( 'echo-notifications-blacklist' ) );
- } else {
- // If the blacklist is empty, set it to null
rather than an empty string.
- $options['echo-notifications-blacklist'] = null;
- }
}
return true;
diff --git a/extension.json b/extension.json
index dc21551..39606db 100644
--- a/extension.json
+++ b/extension.json
@@ -1019,7 +1019,6 @@
"SpecialNotificationsMarkRead":
"includes/special/SpecialNotificationsMarkRead.php",
"SuppressionMaintenanceTest":
"tests/phpunit/maintenance/SupressionMaintenanceTest.php",
"TestDiscussionParser": "maintenance/testDiscussionParser.php",
- "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php",
- "EchoUpdatePerUserBlacklist":
"maintenance/updatePerUserBlacklist.php"
+ "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php"
}
}
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index d5cfff5..4b6ce1f 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -71,12 +71,12 @@
* @param string $preferenceName
*/
public function addFromUserOption( $preferenceName ) {
- $preference = $this->recipient->getOption( $preferenceName, []
);
+ $preference = $this->recipient->getOption( $preferenceName );
[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.31.0-wmf.1]: Use User Ids instead of User Names for Echo Mute
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382511 )
Change subject: Use User Ids instead of User Names for Echo Mute
..
Use User Ids instead of User Names for Echo Mute
The echo mute list uses user names which are not stable. User ids should be
used instead.
Bug: T173475
Change-Id: I947bcf37a8f85aaa105776d368dbd0ab76823aeb
(cherry picked from commit 3ba76f7faa97e47453895b3c002398c1288b6e89)
---
M Hooks.php
M extension.json
M includes/ContainmentSet.php
A maintenance/updatePerUserBlacklist.php
4 files changed, 131 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/11/382511/1
diff --git a/Hooks.php b/Hooks.php
index 8e3db35..4a7c06a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -490,10 +490,15 @@
}
if ( $wgEchoPerUserBlacklist ) {
+ $lookup = CentralIdLookup::factory();
+ $ids = $user->getOption(
'echo-notifications-blacklist', [] );
+ $names = $ids ? $lookup->namesFromCentralIds( $ids,
$user ) : [];
+
$preferences['echo-notifications-blacklist'] = [
'type' => 'usersmultiselect',
'label-message' =>
'echo-pref-notifications-blacklist',
'section' => 'echo/blocknotificationslist',
+ 'default' => implode( "\n", $names )
];
}
@@ -1252,6 +1257,10 @@
$options['echo-subscriptions-email-edit-user-talk'] =
$options['enotifusertalkpages'];
}
+ if ( isset( $options['echo-notifications-blacklist'] ) ) {
+ $options['echo-notifications-blacklist'] = array_map(
'intval', explode( "\n", $options['echo-notifications-blacklist'] ) );
+ }
+
return true;
}
@@ -1270,6 +1279,28 @@
unset(
$options['echo-subscriptions-email-edit-user-talk'] );
}
+ // Convert usernames to ids.
+ if ( isset( $options['echo-notifications-blacklist'] ) ) {
+ if ( $options['echo-notifications-blacklist'] ) {
+ $value =
$options['echo-notifications-blacklist'];
+ // Notification Blacklist may be an array of
ids or a string of new line
+ // delimnated user names.
+ if ( is_array( $value ) ) {
+ $ids = array_filter( $value,
'is_numeric' );
+ } else {
+ $lookup = CentralIdLookup::factory();
+ $names = explode( "\n", $value );
+ $ids = $lookup->centralIdsFromNames(
$names, $user );
+ }
+
+ $user->setOption(
'echo-notifications-blacklist', $ids );
+ $options['echo-notifications-blacklist'] =
implode( "\n", $user->getOption( 'echo-notifications-blacklist' ) );
+ } else {
+ // If the blacklist is empty, set it to null
rather than an empty string.
+ $options['echo-notifications-blacklist'] = null;
+ }
+ }
+
return true;
}
diff --git a/extension.json b/extension.json
index 39606db..dc21551 100644
--- a/extension.json
+++ b/extension.json
@@ -1019,6 +1019,7 @@
"SpecialNotificationsMarkRead":
"includes/special/SpecialNotificationsMarkRead.php",
"SuppressionMaintenanceTest":
"tests/phpunit/maintenance/SupressionMaintenanceTest.php",
"TestDiscussionParser": "maintenance/testDiscussionParser.php",
- "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php"
+ "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php",
+ "EchoUpdatePerUserBlacklist":
"maintenance/updatePerUserBlacklist.php"
}
}
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index 4b6ce1f..d5cfff5 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -71,12 +71,12 @@
* @param string $preferenceName
*/
public function addFromUserOption( $preferenceName ) {
- $preference = $this->recipient->getOption( $preferenceName );
+ $preference = $this->recipient->getOption( $preferenceName, []
);
if ( $preference ) {
- $items = explode( "\n", $preference );
-
- $this->addArray( $items );
+
[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.31.0-wmf.2]: Use User Ids instead of User Names for Echo Mute
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382508 )
Change subject: Use User Ids instead of User Names for Echo Mute
..
Use User Ids instead of User Names for Echo Mute
The echo mute list uses user names which are not stable. User ids should be
used instead.
Bug: T173475
Change-Id: I947bcf37a8f85aaa105776d368dbd0ab76823aeb
(cherry picked from commit 3ba76f7faa97e47453895b3c002398c1288b6e89)
---
M Hooks.php
M extension.json
M includes/ContainmentSet.php
A maintenance/updatePerUserBlacklist.php
4 files changed, 131 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/08/382508/1
diff --git a/Hooks.php b/Hooks.php
index 8e3db35..4a7c06a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -490,10 +490,15 @@
}
if ( $wgEchoPerUserBlacklist ) {
+ $lookup = CentralIdLookup::factory();
+ $ids = $user->getOption(
'echo-notifications-blacklist', [] );
+ $names = $ids ? $lookup->namesFromCentralIds( $ids,
$user ) : [];
+
$preferences['echo-notifications-blacklist'] = [
'type' => 'usersmultiselect',
'label-message' =>
'echo-pref-notifications-blacklist',
'section' => 'echo/blocknotificationslist',
+ 'default' => implode( "\n", $names )
];
}
@@ -1252,6 +1257,10 @@
$options['echo-subscriptions-email-edit-user-talk'] =
$options['enotifusertalkpages'];
}
+ if ( isset( $options['echo-notifications-blacklist'] ) ) {
+ $options['echo-notifications-blacklist'] = array_map(
'intval', explode( "\n", $options['echo-notifications-blacklist'] ) );
+ }
+
return true;
}
@@ -1270,6 +1279,28 @@
unset(
$options['echo-subscriptions-email-edit-user-talk'] );
}
+ // Convert usernames to ids.
+ if ( isset( $options['echo-notifications-blacklist'] ) ) {
+ if ( $options['echo-notifications-blacklist'] ) {
+ $value =
$options['echo-notifications-blacklist'];
+ // Notification Blacklist may be an array of
ids or a string of new line
+ // delimnated user names.
+ if ( is_array( $value ) ) {
+ $ids = array_filter( $value,
'is_numeric' );
+ } else {
+ $lookup = CentralIdLookup::factory();
+ $names = explode( "\n", $value );
+ $ids = $lookup->centralIdsFromNames(
$names, $user );
+ }
+
+ $user->setOption(
'echo-notifications-blacklist', $ids );
+ $options['echo-notifications-blacklist'] =
implode( "\n", $user->getOption( 'echo-notifications-blacklist' ) );
+ } else {
+ // If the blacklist is empty, set it to null
rather than an empty string.
+ $options['echo-notifications-blacklist'] = null;
+ }
+ }
+
return true;
}
diff --git a/extension.json b/extension.json
index 39606db..dc21551 100644
--- a/extension.json
+++ b/extension.json
@@ -1019,6 +1019,7 @@
"SpecialNotificationsMarkRead":
"includes/special/SpecialNotificationsMarkRead.php",
"SuppressionMaintenanceTest":
"tests/phpunit/maintenance/SupressionMaintenanceTest.php",
"TestDiscussionParser": "maintenance/testDiscussionParser.php",
- "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php"
+ "UpdateEchoSchemaForSuppression":
"maintenance/updateEchoSchemaForSuppression.php",
+ "EchoUpdatePerUserBlacklist":
"maintenance/updatePerUserBlacklist.php"
}
}
diff --git a/includes/ContainmentSet.php b/includes/ContainmentSet.php
index 4b6ce1f..d5cfff5 100644
--- a/includes/ContainmentSet.php
+++ b/includes/ContainmentSet.php
@@ -71,12 +71,12 @@
* @param string $preferenceName
*/
public function addFromUserOption( $preferenceName ) {
- $preference = $this->recipient->getOption( $preferenceName );
+ $preference = $this->recipient->getOption( $preferenceName, []
);
if ( $preference ) {
- $items = explode( "\n", $preference );
-
- $this->addArray( $items );
+
[MediaWiki-commits] [Gerrit] integration/config[master]: Don't checkout submodules for phpcs-docker
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381488 )
Change subject: Don't checkout submodules for phpcs-docker
..
Don't checkout submodules for phpcs-docker
Bug: T177104
Change-Id: I020d5def90a378f947e0333585caa581f3a03ebe
---
M dockerfiles/mediawiki-phpcs/run.sh
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/88/381488/1
diff --git a/dockerfiles/mediawiki-phpcs/run.sh
b/dockerfiles/mediawiki-phpcs/run.sh
index 8fb1817..779cabb 100644
--- a/dockerfiles/mediawiki-phpcs/run.sh
+++ b/dockerfiles/mediawiki-phpcs/run.sh
@@ -5,7 +5,6 @@
git init
git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
git checkout --quiet FETCH_HEAD
-git submodule --quiet update --init --recursive
/srv/composer/vendor/bin/composer install --no-progress
./vendor/bin/phpcs -p -s --report-full
"--report-checkstyle=/log/checkstyle.xml"
--
To view, visit https://gerrit.wikimedia.org/r/381488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I020d5def90a378f947e0333585caa581f3a03ebe
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Allow dockerfiles to be built from anywhere
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/381487 ) Change subject: Allow dockerfiles to be built from anywhere .. Allow dockerfiles to be built from anywhere By using os.getcwd() this script doesn't work if not executed from the dockerfiles directory. Change-Id: Ib33ab464d2ce6e56475eb0b38a9a1db9192b2ae6 --- M dockerfiles/build.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/87/381487/1 diff --git a/dockerfiles/build.py b/dockerfiles/build.py index 0a6a1c0..339e85a 100755 --- a/dockerfiles/build.py +++ b/dockerfiles/build.py @@ -25,7 +25,7 @@ if self.args.directory: dockerfiles = [ -os.path.join(os.getcwd(), f, 'Dockerfile') +os.path.join(BASE_DIR, f, 'Dockerfile') for f in self.args.directory ] else: -- To view, visit https://gerrit.wikimedia.org/r/381487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib33ab464d2ce6e56475eb0b38a9a1db9192b2ae6 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Beta: Scap: canary_dashboard_url to beta logstash
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378750 ) Change subject: Beta: Scap: canary_dashboard_url to beta logstash .. Beta: Scap: canary_dashboard_url to beta logstash Bug: T168211 Change-Id: I40609c6a488a9748f9262095e970e70b5d5d497f --- M modules/scap/templates/scap.cfg.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/50/378750/1 diff --git a/modules/scap/templates/scap.cfg.erb b/modules/scap/templates/scap.cfg.erb index b2a532b..e70862f 100644 --- a/modules/scap/templates/scap.cfg.erb +++ b/modules/scap/templates/scap.cfg.erb @@ -100,3 +100,4 @@ wmf_realm: labs # No pybal in labs, but pretend that there is anyway pybal_interface: lo +canary_dashboard_url: https://logstash-beta.wmflabs.org/goto/ff3530979bc5a54b9779ac9cbd4fc819 -- To view, visit https://gerrit.wikimedia.org/r/378750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40609c6a488a9748f9262095e970e70b5d5d497f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Deploy ocg with scap3
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378241 )
Change subject: Deploy ocg with scap3
..
Deploy ocg with scap3
Bug: T129142
Change-Id: I633dd2aad74ee4bbd488e76c201b6540bb5dc2d3
Depends-On: I6ca4630767a1b961215533130b16bf965acc415e
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/dsh.yaml
M hieradata/role/common/deployment_server.yaml
M modules/ocg/manifests/init.pp
4 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/378241/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index dfd570f..5515544 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -2,10 +2,6 @@
eventlogging/eventlogging:
upstream: https://gerrit.wikimedia.org/r/eventlogging
checkout_submodules: true
- ocg/ocg:
-upstream: https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection
-service_name: ocg
-checkout_submodules: true
fluoride/fluoride:
upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride
elasticsearch/plugins:
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index c12c347..4f4d307 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -89,6 +89,11 @@
- logstash1001.eqiad.wmnet
- logstash1002.eqiad.wmnet
- logstash1003.eqiad.wmnet
+ ocg:
+hosts:
+ - ocg1001.eqiad.wmnet
+ - ocg1002.eqiad.wmnet
+ - ocg1003.eqiad.wmnet
relforge:
hosts:
- relforge1001.eqiad.wmnet
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index b8bbe93..a6365f3 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -126,6 +126,8 @@
#lvs_service: mathoid
mobileapps/deploy: {}
#lvs_service: mobileapps
+ ocg/ocg:
+repository: mediawiki/services/ocg-collection
ores/deploy: {}
#lvs_service: ores
parsoid/deploy: {}
diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index 06bac51..d4ea326 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -26,8 +26,8 @@
$postmortem_dir = '/srv/deployment/ocg/postmortem',
$log_dir = '/srv/deployment/ocg/log'
) {
-package { 'ocg/ocg':
-provider => 'trebuchet',
+scap::target { 'ocg/ocg':
+deploy_user => 'deploy-service',
}
group { 'ocg':
--
To view, visit https://gerrit.wikimedia.org/r/378241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I633dd2aad74ee4bbd488e76c201b6540bb5dc2d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[master]: Add scap3 config
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378240 ) Change subject: Add scap3 config .. Add scap3 config Bug: T129142 Change-Id: I6ca4630767a1b961215533130b16bf965acc415e --- A scap/scap.cfg 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection refs/changes/40/378240/1 diff --git a/scap/scap.cfg b/scap/scap.cfg new file mode 100644 index 000..310a98e --- /dev/null +++ b/scap/scap.cfg @@ -0,0 +1,8 @@ +[global] +git_repo: ocg/ocg +ssh_user: deploy-service +server_groups: default +dsh_targets: ocg +git_submodules: True +service_name: ocg +service_port: 8000 -- To view, visit https://gerrit.wikimedia.org/r/378240 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ca4630767a1b961215533130b16bf965acc415e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ocg-collection Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...analytics[master]: Remove py27 from envlist
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377920 ) Change subject: Remove py27 from envlist .. Remove py27 from envlist Causing failing tests since there is no command to run in the py27 environment. Change-Id: I2bd97efcfc4455d692bb05310204f07cda00a785 --- M tox.ini 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/analytics refs/changes/20/377920/1 diff --git a/tox.ini b/tox.ini index 00c9e9d..6af0e43 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ minversion = 1.6 skipsdist = True # List the environment that will be run by default -envlist = flake8, py27 +envlist = flake8 [testenv] # Default configuration. py26 and py27 will end up using this -- To view, visit https://gerrit.wikimedia.org/r/377920 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bd97efcfc4455d692bb05310204f07cda00a785 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/analytics Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Deploy discovery-analytics with scap3
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377916 )
Change subject: Deploy discovery-analytics with scap3
..
Deploy discovery-analytics with scap3
Bug: T129149
Depends-On: Icd80f28ee1a950cea72ec7b00e639526fe9bb846
Change-Id: I2284aa559a6f5bddbd2c7277539eb7869acdd3f3
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/dsh.yaml
M hieradata/role/common/deployment_server.yaml
M modules/role/manifests/elasticsearch/analytics.pp
4 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/377916/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 7ebceb6..dfd570f 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -18,8 +18,6 @@
upstream:
https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics
sentry/sentry:
upstream: https://gerrit.wikimedia.org/r/operations/software/sentry
- wikimedia/discovery/analytics:
-upstream: https://gerrit.wikimedia.org/r/wikimedia/discovery/analytics
analytics/aqs/deploy:
upstream: https://gerrit.wikimedia.org/r/analytics/aqs/deploy
service_name: aqs
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index e220bec..c12c347 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -78,6 +78,9 @@
- restbase-test2002.codfw.wmnet
- restbase-test2003.codfw.wmnet
- xenon.eqiad.wmnet
+ discovery-analytics:
+hosts:
+ - stat1005.eqiad.wmnet
librenms:
hosts:
- netmon1002.wikimedia.org
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index ee5dfa7..b8bbe93 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -145,6 +145,8 @@
# Wikimania scholarships app
scholarships/scholarships:
repository: wikimedia/wikimania-scholarships
+ wikimedia/discovery/analytics:
+repository: discovery/analytics
wdqs/wdqs:
repository: wikidata/query/deploy
#lvs_service: wdqs
diff --git a/modules/role/manifests/elasticsearch/analytics.pp
b/modules/role/manifests/elasticsearch/analytics.pp
index 7f0631a..a46391e 100644
--- a/modules/role/manifests/elasticsearch/analytics.pp
+++ b/modules/role/manifests/elasticsearch/analytics.pp
@@ -1,7 +1,7 @@
# Supports CirrusSearch usage on the analytics cluster
class role::elasticsearch::analytics {
# wikimedia/discovery/analytics will be deployed to this node
-package { 'wikimedia/discovery/analytics':
-provider => 'trebuchet',
+scap::target { 'wikimedia/discovery/analytics':
+deploy_user => 'deploy-service',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/377916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2284aa559a6f5bddbd2c7277539eb7869acdd3f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...analytics[master]: Add scap3 configuration
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377914 ) Change subject: Add scap3 configuration .. Add scap3 configuration Configuration to migrate deployment method from Trebuchet to scap3. Bug: T129149 Change-Id: Icd80f28ee1a950cea72ec7b00e639526fe9bb846 --- A scap/scap.cfg 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/analytics refs/changes/14/377914/1 diff --git a/scap/scap.cfg b/scap/scap.cfg new file mode 100644 index 000..7788f26 --- /dev/null +++ b/scap/scap.cfg @@ -0,0 +1,5 @@ +[global] +git_repo: wikimedia/discovery/analytics +ssh_user: deploy-service +server_groups: default +dsh_targets: discovery-analytics -- To view, visit https://gerrit.wikimedia.org/r/377914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd80f28ee1a950cea72ec7b00e639526fe9bb846 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/analytics Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: CI: install docker-ce from download.docker.com
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377492 ) Change subject: CI: install docker-ce from download.docker.com .. CI: install docker-ce from download.docker.com Bug: T175293 Change-Id: I491eb051b77d4d38ace6a79a881d000757628f37 --- A modules/contint/files/download.docker.com.asc A modules/contint/manifests/docker.pp M modules/profile/manifests/ci/docker.pp M modules/role/manifests/ci/master.pp 4 files changed, 90 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/92/377492/1 diff --git a/modules/contint/files/download.docker.com.asc b/modules/contint/files/download.docker.com.asc new file mode 100644 index 000..ee7872e --- /dev/null +++ b/modules/contint/files/download.docker.com.asc @@ -0,0 +1,62 @@ +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFit2ioBEADhWpZ8/wvZ6hUTiXOwQHXMAlaFHcPH9hAtr4F1y2+OYdbtMuth +lqqwp028AqyY+PRfVMtSYMbjuQuu5byyKR01BbqYhuS3jtqQmljZ/bJvXqnmiVXh +38UuLa+z077PxyxQhu5BbqntTPQMfiyqEiU+BKbq2WmANUKQf+1AmZY/IruOXbnq +L4C1+gJ8vfmXQt99npCaxEjaNRVYfOS8QcixNzHUYnb6emjlANyEVlZzeqo7XKl7 +UrwV5inawTSzWNvtjEjj4nJL8NsLwscpLPQUhTQ+7BbQXAwAmeHCUTQIvvWXqw0N +cmhh4HgeQscQHYgOJjjDVfoY5MucvglbIgCqfzAHW9jxmRL4qbMZj+b1XoePEtht +ku4bIQN1X5P07fNWzlgaRL5Z4POXDDZTlIQ/El58j9kp4bnWRCJW0lya+f8ocodo +vZZ+Doi+fy4D5ZGrL4XEcIQP/Lv5uFyf+kQtl/94VFYVJOleAv8W92KdgDkhTcTD +G7c0tIkVEKNUq48b3aQ64NOZQW7fVjfoKwEZdOqPE72Pa45jrZzvUFxSpdiNk2tZ +XYukHjlxxEgBdC/J3cMMNRE1F4NCA3ApfV1Y7/hTeOnmDuDYwr9/obA8t016Yljj +q5rdkywPf4JF8mXUW5eCN1vAFHxeg9ZWemhBtQmGxXnw9M+z6hWwc6ahmwARAQAB +tCtEb2NrZXIgUmVsZWFzZSAoQ0UgZGViKSA8ZG9ja2VyQGRvY2tlci5jb20+iQI3 +BBMBCgAhBQJYrefAAhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEI2BgDwO +v82IsskP/iQZo68flDQmNvn8X5XTd6RRaUH33kXYXquT6NkHJciS7E2gTJmqvMqd +tI4mNYHCSEYxI5qrcYV5YqX9P6+Ko+vozo4nseUQLPH/ATQ4qL0Zok+1jkag3Lgk +jonyUf9bwtWxFp05HC3GMHPhhcUSexCxQLQvnFWXD2sWLKivHp2fT8QbRGeZ+d3m +6fqcd5Fu7pxsqm0EUDK5NL+nPIgYhN+auTrhgzhK1CShfGccM/wfRlei9Utz6p9P +XRKIlWnXtT4qNGZNTN0tR+NLG/6Bqd8OYBaFAUcue/w1VW6JQ2VGYZHnZu9S8LMc +FYBa5Ig9PxwGQOgq6RDKDbV+PqTQT5EFMeR1mrjckk4DQJjbxeMZbiNMG5kGECA8 +g383P3elhn03WGbEEa4MNc3Z4+7c236QI3xWJfNPdUbXRaAwhy/6rTSFbzwKB0Jm +ebwzQfwjQY6f55MiI/RqDCyuPj3r3jyVRkK86pQKBAJwFHyqj9KaKXMZjfVnowLh +9svIGfNbGHpucATqREvUHuQbNnqkCx8VVhtYkhDb9fEP2xBu5VvHbR+3nfVhMut5 +G34Ct5RS7Jt6LIfFdtcn8CaSas/l1HbiGeRgc70X/9aYx/V/CEJv0lIe8gP6uDoW +FPIZ7d6vH+Vro6xuWEGiuMaiznap2KhZmpkgfupyFmplh0s6knymuQINBFit2ioB +EADneL9S9m4vhU3blaRjVUUyJ7b/qTjcSylvCH5XUE6R2k+ckEZjfAMZPLpO+/tF +M2JIJMD4SifKuS3xck9KtZGCufGmcwiLQRzeHF7vJUKrLD5RTkNi23ydvWZgPjtx +Q+DTT1Zcn7BrQFY6FgnRoUVIxwtdw1bMY/89rsFgS5wwuMESd3Q2RYgb7EOFOpnu +w6da7WakWf4IhnF5nsNYGDVaIHzpiqCl+uTbf1epCjrOlIzkZ3Z3Yk5CM/TiFzPk +z2lLz89cpD8U+NtCsfagWWfjd2U3jDapgH+7nQnCEWpROtzaKHG6lA3pXdix5zG8 +eRc6/0IbUSWvfjKxLLPfNeCS2pCL3IeEI5nothEEYdQH6szpLog79xB9dVnJyKJb +VfxXnseoYqVrRz2VVbUI5Blwm6B40E3eGVfUQWiux54DspyVMMk41Mx7QJ3iynIa +1N4ZAqVMAEruyXTRTxc9XW0tYhDMA/1GYvz0EmFpm8LzTHA6sFVtPm/ZlNCX6P1X +zJwrv7DSQKD6GGlBQUX+OeEJ8tTkkf8QTJSPUdh8P8YxDFS5EOGAvhhpMBYD42kQ +pqXjEC+XcycTvGI7impgv9PDY1RCC1zkBjKPa120rNhv/hkVk/YhuGoajoHyy4h7 +ZQopdcMtpN2dgmhEegny9JCSwxfQmQ0zK0g7m6SHiKMwjwARAQABiQQ+BBgBCAAJ +BQJYrdoqAhsCAikJEI2BgDwOv82IwV0gBBkBCAAGBQJYrdoqAAoJEH6gqcPyc/zY +1WAP/2wJ+R0gE6qsce3rjaIz58PJmc8goKrir5hnElWhPgbq7cYIsW5qiFyLhkdp +YcMmhD9mRiPpQn6Ya2w3e3B8zfIVKipbMBnke/ytZ9M7qHmDCcjoiSmwEXN3wKYI +mD9VHONsl/CG1rU9Isw1jtB5g1YxuBA7M/m36XN6x2u+NtNMDB9P56yc4gfsZVES +KA9v+yY2/l45L8d/WUkUi0YXomn6hyBGI7JrBLq0CX37GEYP6O9rrKipfz73XfO7 +JIGzOKZlljb/D9RX/g7nRbCn+3EtH7xnk+TK/50euEKw8SMUg147sJTcpQmv6UzZ +cM4JgL0HbHVCojV4C/plELwMddALOFeYQzTif6sMRPf+3DSj8frbInjChC3yOLy0 +6br92KFom17EIj2CAcoeq7UPhi2oouYBwPxh5ytdehJkoo+sN7RIWua6P2WSmon5 +U888cSylXC0+ADFdgLX9K2zrDVYUG1vo8CX0vzxFBaHwN6Px26fhIT1/hYUHQR1z +VfNDcyQmXqkOnZvvoMfz/Q0s9BhFJ/zU6AgQbIZE/hm1spsfgvtsD1frZfygXJ9f +irP+MSAI80xHSf91qSRZOj4Pl3ZJNbq4yYxv0b1pkMqeGdjdCYhLU+LZ4wbQmpCk +SVe2prlLureigXtmZfkqevRz7FrIZiu9ky8wnCAPwC7/zmS18rgP/17bOtL4/iIz +QhxAAoAMWVrGyJivSkjhSGx1uCojsWfsTAm11P7jsruIL61ZzMUVE2aM3Pmj5G+W +9AcZ58Em+1WsVnAXdUR//bMmhyr8wL/G1YO1V3JEJTRdxsSxdYa4deGBBY/Adpsw +24jxhOJR+lsJpqIUeb999+R8euDhRHG9eFO7DRu6weatUJ6suupoDTRWtr/4yGqe +dKxV3qQhNLSnaAzqW/1nA3iUB4k7kCaKZxhdhDbClf9P37qaRW467BLCVO/coL3y +Vm50dwdrNtKpMBh3ZpbB1uJvgi9mXtyBOMJ3v8RZeDzFiG8HdCtg9RvIt/AIFoHR +H3S+U79NT6i0KPzLImDfs8T7RlpyuMc4Ufs8ggyg9v3Ae6cN3eQyxcK3w0cbBwsh +/nQNfsA6uu+9H7NhbehBMhYnpNZyrHzCmzyXkauwRAqoCbGCNykTRwsur9gS41TQ +M8ssD1jFheOJf3hODnkKU+HKjvMROl1DK7zdmLdNzA1cvtZH/nCC9KPj1z8QC47S +xx+dTZSx4ONAhwbS/LN3PoKtn8LPjY9NP9uDWI+TWYquS2U+KHDrBDlsgozDbs/O +jCxcpDzNmXpWQHEtHU7649OXHP7UeNST1mCUCH5qdank0V1iejF6/CfTFU4MfcrG +YT90qFF93M3v01BbxP+EIY2/9tiIPbrd +=0YYh +-END PGP PUBLIC KEY BLOCK- diff --git a/modules/contint/manifests/docker.pp b/modules/contint/manifests/docker.pp new file mode 100644 index 000..03a7554 --- /dev/null +++ b/modules/contint/manifests/docker.pp @@ -0,0 +1,25 @@ +# == Class contint::docker +
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: Allow phabricator as a source
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376571 )
Change subject: Scap: Allow phabricator as a source
..
Scap: Allow phabricator as a source
Setting the origin is already set up in the scap_source puppet type, but
not in the scap::source puppet resource. This adds 'origin' as a
configurable parameter of the scap::source puppet resource. This also
updates the git url for phabricator.
Change-Id: I1bbe9b6af0e76e606375619812eebd71ff7eb123
---
M modules/scap/lib/puppet/provider/scap_source/default.rb
M modules/scap/manifests/source.pp
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/376571/1
diff --git a/modules/scap/lib/puppet/provider/scap_source/default.rb
b/modules/scap/lib/puppet/provider/scap_source/default.rb
index f901355..f401ed4 100644
--- a/modules/scap/lib/puppet/provider/scap_source/default.rb
+++ b/modules/scap/lib/puppet/provider/scap_source/default.rb
@@ -41,7 +41,7 @@
when :gerrit
"https://gerrit.wikimedia.org/r/p/#{repo_name}.git";
when :phabricator
- "https://phabricator.wikimedia.org/diffusion/#{repo_name}.git";
+ "https://phabricator.wikimedia.org/source/#{repo_name}.git";
end
end
@@ -50,7 +50,7 @@
when :gerrit
origin.slice! "https://gerrit.wikimedia.org/r/p/";
when :phabricator
- origin.slice! "https://phabricator.wikimedia.org/diffusion/";
+ origin.slice! "https://phabricator.wikimedia.org/source/";
end
origin.gsub(/\.git$/, '')
end
diff --git a/modules/scap/manifests/source.pp b/modules/scap/manifests/source.pp
index 39c0244..8c51986 100644
--- a/modules/scap/manifests/source.pp
+++ b/modules/scap/manifests/source.pp
@@ -45,6 +45,10 @@
# Base path for deployments.
# Default: /srv/deployment
#
+# [*origin*]
+# Origin of cloned repository, either gerrit or phabricator
+# Default: phabricator
+#
# [*lvs_service*]
# Name of the lvs service associated with this deployment, if any
#
@@ -91,6 +95,7 @@
$owner= 'trebuchet',
$group= 'wikidev',
$base_path= '/srv/deployment',
+$origin = 'gerrit',
$canaries = undef,
$lvs_service = undef,
$hosts= undef,
@@ -103,6 +108,7 @@
owner => $owner,
group => $group,
base_path => $base_path,
+origin => $origin,
}
# Scap dsh lists.
--
To view, visit https://gerrit.wikimedia.org/r/376571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bbe9b6af0e76e606375619812eebd71ff7eb123
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...jobrunner[master]: Scap: restart services only in active dc
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376159 ) Change subject: Scap: restart services only in active dc .. Scap: restart services only in active dc Change to scap config that will restart both jobrunner and jobchron in the active datacenter only as part of deployment. Port 9005 will be checked to ensure it accepts local connections. Service restart and port checking will happen after the "promote" stage. Change-Id: Iecdb5f2726a02a9f058d23f0fbb94aa5cc2b7a2b Depends-On: I09ba869f9a914c76c161ba7d125b6afb5e0e6b91 Bug: T129148 --- M scap/scap.cfg 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner refs/changes/59/376159/1 diff --git a/scap/scap.cfg b/scap/scap.cfg index d3f3e56..e1827f5 100644 --- a/scap/scap.cfg +++ b/scap/scap.cfg @@ -7,6 +7,12 @@ dsh_targets: jobrunner git_submodules: False +service_name: jobrunner,jobchron +service_port: 9005 + +# Don't restart service if LoadState=masked (inactive datacenter) +require_valid_service: True + # Divide servers into groups of 5 group_size: 5 -- To view, visit https://gerrit.wikimedia.org/r/376159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecdb5f2726a02a9f058d23f0fbb94aa5cc2b7a2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/jobrunner Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: scap: upgrade to 3.7.0-1
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/375029 )
Change subject: scap: upgrade to 3.7.0-1
..
scap: upgrade to 3.7.0-1
Bug: T127762
Change-Id: I2799742b1ee27c51a95bc0966b63fbb00b73bb26
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/375029/1
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 58f6547..595b399 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
class scap (
$deployment_server = 'deployment',
$wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.6.0-2',
+$version = '3.7.0-1',
) {
package { 'scap':
ensure => $version,
--
To view, visit https://gerrit.wikimedia.org/r/375029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2799742b1ee27c51a95bc0966b63fbb00b73bb26
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Group1 to wmf.16""
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374909 )
Change subject: Revert "Revert "Group1 to wmf.16""
..
Revert "Revert "Group1 to wmf.16""
This reverts commit f750c8930fe8a8ff1a3dc11446136b2021a7b69c.
Change-Id: Ieba65cca6023301885ab80025f59c44bd8a37ee1
---
M php
M wikiversions.json
2 files changed, 603 insertions(+), 603 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/09/374909/1
diff --git a/php b/php
index 5a64e5f..633715f 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.15
\ No newline at end of file
+php-1.30.0-wmf.16
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 370a2ce..8b6959d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.15",
-"aawikibooks": "php-1.30.0-wmf.15",
-"aawiktionary": "php-1.30.0-wmf.15",
+"aawikibooks": "php-1.30.0-wmf.16",
+"aawiktionary": "php-1.30.0-wmf.16",
"abwiki": "php-1.30.0-wmf.15",
-"abwiktionary": "php-1.30.0-wmf.15",
+"abwiktionary": "php-1.30.0-wmf.16",
"acewiki": "php-1.30.0-wmf.15",
-"advisorywiki": "php-1.30.0-wmf.15",
+"advisorywiki": "php-1.30.0-wmf.16",
"adywiki": "php-1.30.0-wmf.15",
"afwiki": "php-1.30.0-wmf.15",
-"afwikibooks": "php-1.30.0-wmf.15",
-"afwikiquote": "php-1.30.0-wmf.15",
-"afwiktionary": "php-1.30.0-wmf.15",
+"afwikibooks": "php-1.30.0-wmf.16",
+"afwikiquote": "php-1.30.0-wmf.16",
+"afwiktionary": "php-1.30.0-wmf.16",
"akwiki": "php-1.30.0-wmf.15",
-"akwikibooks": "php-1.30.0-wmf.15",
-"akwiktionary": "php-1.30.0-wmf.15",
+"akwikibooks": "php-1.30.0-wmf.16",
+"akwiktionary": "php-1.30.0-wmf.16",
"alswiki": "php-1.30.0-wmf.15",
-"alswikibooks": "php-1.30.0-wmf.15",
-"alswikiquote": "php-1.30.0-wmf.15",
-"alswiktionary": "php-1.30.0-wmf.15",
+"alswikibooks": "php-1.30.0-wmf.16",
+"alswikiquote": "php-1.30.0-wmf.16",
+"alswiktionary": "php-1.30.0-wmf.16",
"amwiki": "php-1.30.0-wmf.15",
-"amwikiquote": "php-1.30.0-wmf.15",
-"amwiktionary": "php-1.30.0-wmf.15",
+"amwikiquote": "php-1.30.0-wmf.16",
+"amwiktionary": "php-1.30.0-wmf.16",
"angwiki": "php-1.30.0-wmf.15",
-"angwikibooks": "php-1.30.0-wmf.15",
-"angwikiquote": "php-1.30.0-wmf.15",
-"angwikisource": "php-1.30.0-wmf.15",
-"angwiktionary": "php-1.30.0-wmf.15",
+"angwikibooks": "php-1.30.0-wmf.16",
+"angwikiquote": "php-1.30.0-wmf.16",
+"angwikisource": "php-1.30.0-wmf.16",
+"angwiktionary": "php-1.30.0-wmf.16",
"anwiki": "php-1.30.0-wmf.15",
-"anwiktionary": "php-1.30.0-wmf.15",
+"anwiktionary": "php-1.30.0-wmf.16",
"arbcom_cswiki": "php-1.30.0-wmf.15",
"arbcom_dewiki": "php-1.30.0-wmf.15",
"arbcom_enwiki": "php-1.30.0-wmf.15",
@@ -35,880 +35,880 @@
"arbcom_nlwiki": "php-1.30.0-wmf.15",
"arcwiki": "php-1.30.0-wmf.15",
"arwiki": "php-1.30.0-wmf.15",
-"arwikibooks": "php-1.30.0-wmf.15",
-"arwikimedia": "php-1.30.0-wmf.15",
-"arwikinews": "php-1.30.0-wmf.15",
-"arwikiquote": "php-1.30.0-wmf.15",
-"arwikisource": "php-1.30.0-wmf.15",
-"arwikiversity": "php-1.30.0-wmf.15",
-"arwiktionary": "php-1.30.0-wmf.15",
+"arwikibooks": "php-1.30.0-wmf.16",
+"arwikimedia": "php-1.30.0-wmf.16",
+"arwikinews": "php-1.30.0-wmf.16",
+"arwikiquote": "php-1.30.0-wmf.16",
+"arwikisource": "php-1.30.0-wmf.16",
+"arwikiversity": "php-1.30.0-wmf.16",
+"arwiktionary": "php-1.30.0-wmf.16",
"arzwiki": "php-1.30.0-wmf.15",
"astwiki": "php-1.30.0-wmf.15",
-"astwikibooks": "php-1.30.0-wmf.15",
-"astwikiquote": "php-1.30.0-wmf.15",
-"astwiktionary": "php-1.30.0-wmf.15",
+"astwikibooks": "php-1.30.0-wmf.16",
+"astwikiquote": "php-1.30.0-wmf.16",
+"astwiktionary": "php-1.30.0-wmf.16",
"aswiki": "php-1.30.0-wmf.15",
-"aswikibooks": "php-1.30.0-wmf.15",
-"aswikisource": "php-1.30.0-wmf.15",
-"aswiktionary": "php-1.30.0-wmf.15",
+"aswikibooks": "php-1.30.0-wmf.16",
+"aswikisource": "php-1.30.0-wmf.16",
+"aswiktionary": "php-1.30.0-wmf.16",
"atjwiki": "php-1.30.0-wmf.15",
-"auditcomwiki": "php-1.30.0-wmf.15",
+"auditcomwiki": "php-1.30.0-wmf.16",
"avwiki": "php-1.30.0-wmf.15",
-"avwiktionary": "php-1.30.0-wmf.15",
+"avwiktionary": "php-1.30.0-wmf.16",
"aywiki": "php-1.30.0-wmf.15",
-"aywikibooks": "php-1.30.0-wmf.15",
-"aywiktionary": "php-1.30.0-wmf.15",
+"aywikibooks": "php-1.30.0-wmf.16",
+"aywiktionary": "php-1.30.0-wmf.16",
"azbwiki": "php-1.30.0-wmf.15",
"azwiki": "php-1.30.0-wmf.15",
-"azwikibooks": "php-1.30.0-wmf.15",
-"azwikiquote": "php-1.30.0-wmf.15",
-"azwikisource": "php-1.30.0-wmf.15",
-"azwiktionary": "php-1.30.0-wmf.15",
+"azwikibooks":
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.30.0-wmf.16]: Revert "Revert "Avoids a stack overflow""
Hello jenkins-bot, Tpt,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/374891
to review the following change.
Change subject: Revert "Revert "Avoids a stack overflow""
..
Revert "Revert "Avoids a stack overflow""
This reverts commit 8cdfd60f92f657de88d59d4a0c82a6f27f2109bc.
Change-Id: I1cdf2f1ae958317c8039d07be1232a718e7cf0cd
---
M ProofreadPage.body.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/91/374891/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..dbae3ab 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -25,6 +25,7 @@
use ProofreadPage\Page\PageContent;
use ProofreadPage\Page\PageContentBuilder;
use ProofreadPage\Pagination\PageNotInPaginationException;
+use ProofreadPage\ProofreadPageInit;
/*
@todo :
@@ -41,7 +42,7 @@
* @return int
*/
public static function getPageNamespaceId() {
- return Context::getDefaultContext()->getPageNamespaceId();
+ return ProofreadPageInit::getNamespaceId( 'page' );
}
/**
@@ -52,7 +53,7 @@
* @return int
*/
public static function getIndexNamespaceId() {
- return Context::getDefaultContext()->getIndexNamespaceId();
+ return ProofreadPageInit::getNamespaceId( 'index' );
}
/**
@@ -89,6 +90,7 @@
* @return bool if we have to continue the research for a content
handler
*/
public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
+ // Warning: do not use Context here because it assumes
ContentHandler is already initialized
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
$model = CONTENT_MODEL_PROOFREAD_PAGE;
return false;
--
To view, visit https://gerrit.wikimedia.org/r/374891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cdf2f1ae958317c8039d07be1232a718e7cf0cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.30.0-wmf.16
Gerrit-Owner: Thcipriani
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] operations/mediawiki-config[master]: Revert "Group1 to wmf.16"
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374890 )
Change subject: Revert "Group1 to wmf.16"
..
Revert "Group1 to wmf.16"
This reverts commit 38edfdf470f336c2ba99e40d746fba9a8fe2ba0a.
Change-Id: I51700bc1cfc0beecc61f8d5be1f4283332778f7d
---
M php
M wikiversions.json
2 files changed, 603 insertions(+), 603 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/90/374890/1
diff --git a/php b/php
index 633715f..5a64e5f 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.16
\ No newline at end of file
+php-1.30.0-wmf.15
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 8b6959d..370a2ce 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.15",
-"aawikibooks": "php-1.30.0-wmf.16",
-"aawiktionary": "php-1.30.0-wmf.16",
+"aawikibooks": "php-1.30.0-wmf.15",
+"aawiktionary": "php-1.30.0-wmf.15",
"abwiki": "php-1.30.0-wmf.15",
-"abwiktionary": "php-1.30.0-wmf.16",
+"abwiktionary": "php-1.30.0-wmf.15",
"acewiki": "php-1.30.0-wmf.15",
-"advisorywiki": "php-1.30.0-wmf.16",
+"advisorywiki": "php-1.30.0-wmf.15",
"adywiki": "php-1.30.0-wmf.15",
"afwiki": "php-1.30.0-wmf.15",
-"afwikibooks": "php-1.30.0-wmf.16",
-"afwikiquote": "php-1.30.0-wmf.16",
-"afwiktionary": "php-1.30.0-wmf.16",
+"afwikibooks": "php-1.30.0-wmf.15",
+"afwikiquote": "php-1.30.0-wmf.15",
+"afwiktionary": "php-1.30.0-wmf.15",
"akwiki": "php-1.30.0-wmf.15",
-"akwikibooks": "php-1.30.0-wmf.16",
-"akwiktionary": "php-1.30.0-wmf.16",
+"akwikibooks": "php-1.30.0-wmf.15",
+"akwiktionary": "php-1.30.0-wmf.15",
"alswiki": "php-1.30.0-wmf.15",
-"alswikibooks": "php-1.30.0-wmf.16",
-"alswikiquote": "php-1.30.0-wmf.16",
-"alswiktionary": "php-1.30.0-wmf.16",
+"alswikibooks": "php-1.30.0-wmf.15",
+"alswikiquote": "php-1.30.0-wmf.15",
+"alswiktionary": "php-1.30.0-wmf.15",
"amwiki": "php-1.30.0-wmf.15",
-"amwikiquote": "php-1.30.0-wmf.16",
-"amwiktionary": "php-1.30.0-wmf.16",
+"amwikiquote": "php-1.30.0-wmf.15",
+"amwiktionary": "php-1.30.0-wmf.15",
"angwiki": "php-1.30.0-wmf.15",
-"angwikibooks": "php-1.30.0-wmf.16",
-"angwikiquote": "php-1.30.0-wmf.16",
-"angwikisource": "php-1.30.0-wmf.16",
-"angwiktionary": "php-1.30.0-wmf.16",
+"angwikibooks": "php-1.30.0-wmf.15",
+"angwikiquote": "php-1.30.0-wmf.15",
+"angwikisource": "php-1.30.0-wmf.15",
+"angwiktionary": "php-1.30.0-wmf.15",
"anwiki": "php-1.30.0-wmf.15",
-"anwiktionary": "php-1.30.0-wmf.16",
+"anwiktionary": "php-1.30.0-wmf.15",
"arbcom_cswiki": "php-1.30.0-wmf.15",
"arbcom_dewiki": "php-1.30.0-wmf.15",
"arbcom_enwiki": "php-1.30.0-wmf.15",
@@ -35,880 +35,880 @@
"arbcom_nlwiki": "php-1.30.0-wmf.15",
"arcwiki": "php-1.30.0-wmf.15",
"arwiki": "php-1.30.0-wmf.15",
-"arwikibooks": "php-1.30.0-wmf.16",
-"arwikimedia": "php-1.30.0-wmf.16",
-"arwikinews": "php-1.30.0-wmf.16",
-"arwikiquote": "php-1.30.0-wmf.16",
-"arwikisource": "php-1.30.0-wmf.16",
-"arwikiversity": "php-1.30.0-wmf.16",
-"arwiktionary": "php-1.30.0-wmf.16",
+"arwikibooks": "php-1.30.0-wmf.15",
+"arwikimedia": "php-1.30.0-wmf.15",
+"arwikinews": "php-1.30.0-wmf.15",
+"arwikiquote": "php-1.30.0-wmf.15",
+"arwikisource": "php-1.30.0-wmf.15",
+"arwikiversity": "php-1.30.0-wmf.15",
+"arwiktionary": "php-1.30.0-wmf.15",
"arzwiki": "php-1.30.0-wmf.15",
"astwiki": "php-1.30.0-wmf.15",
-"astwikibooks": "php-1.30.0-wmf.16",
-"astwikiquote": "php-1.30.0-wmf.16",
-"astwiktionary": "php-1.30.0-wmf.16",
+"astwikibooks": "php-1.30.0-wmf.15",
+"astwikiquote": "php-1.30.0-wmf.15",
+"astwiktionary": "php-1.30.0-wmf.15",
"aswiki": "php-1.30.0-wmf.15",
-"aswikibooks": "php-1.30.0-wmf.16",
-"aswikisource": "php-1.30.0-wmf.16",
-"aswiktionary": "php-1.30.0-wmf.16",
+"aswikibooks": "php-1.30.0-wmf.15",
+"aswikisource": "php-1.30.0-wmf.15",
+"aswiktionary": "php-1.30.0-wmf.15",
"atjwiki": "php-1.30.0-wmf.15",
-"auditcomwiki": "php-1.30.0-wmf.16",
+"auditcomwiki": "php-1.30.0-wmf.15",
"avwiki": "php-1.30.0-wmf.15",
-"avwiktionary": "php-1.30.0-wmf.16",
+"avwiktionary": "php-1.30.0-wmf.15",
"aywiki": "php-1.30.0-wmf.15",
-"aywikibooks": "php-1.30.0-wmf.16",
-"aywiktionary": "php-1.30.0-wmf.16",
+"aywikibooks": "php-1.30.0-wmf.15",
+"aywiktionary": "php-1.30.0-wmf.15",
"azbwiki": "php-1.30.0-wmf.15",
"azwiki": "php-1.30.0-wmf.15",
-"azwikibooks": "php-1.30.0-wmf.16",
-"azwikiquote": "php-1.30.0-wmf.16",
-"azwikisource": "php-1.30.0-wmf.16",
-"azwiktionary": "php-1.30.0-wmf.16",
+"azwikibooks": "php-1.30.0-wmf.1
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.30.0-wmf.16]: Revert "Avoids a stack overflow"
Hello jenkins-bot, Tpt,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/374889
to review the following change.
Change subject: Revert "Avoids a stack overflow"
..
Revert "Avoids a stack overflow"
This reverts commit 6298f6598fe0680ad062c31be892db273d484526.
Change-Id: I0fc725f7710e2d806ecbdd4bcd07ec960f504395
---
M ProofreadPage.body.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/89/374889/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index dbae3ab..56b01ed 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -25,7 +25,6 @@
use ProofreadPage\Page\PageContent;
use ProofreadPage\Page\PageContentBuilder;
use ProofreadPage\Pagination\PageNotInPaginationException;
-use ProofreadPage\ProofreadPageInit;
/*
@todo :
@@ -42,7 +41,7 @@
* @return int
*/
public static function getPageNamespaceId() {
- return ProofreadPageInit::getNamespaceId( 'page' );
+ return Context::getDefaultContext()->getPageNamespaceId();
}
/**
@@ -53,7 +52,7 @@
* @return int
*/
public static function getIndexNamespaceId() {
- return ProofreadPageInit::getNamespaceId( 'index' );
+ return Context::getDefaultContext()->getIndexNamespaceId();
}
/**
@@ -90,7 +89,6 @@
* @return bool if we have to continue the research for a content
handler
*/
public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
- // Warning: do not use Context here because it assumes
ContentHandler is already initialized
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
$model = CONTENT_MODEL_PROOFREAD_PAGE;
return false;
--
To view, visit https://gerrit.wikimedia.org/r/374889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fc725f7710e2d806ecbdd4bcd07ec960f504395
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.30.0-wmf.16
Gerrit-Owner: Thcipriani
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] mediawiki...ProofreadPage[wmf/1.30.0-wmf.16]: Avoids a stack overflow
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374882 )
Change subject: Avoids a stack overflow
..
Avoids a stack overflow
The cause of this error is that CustomIndexFieldsParser
setup by the context relies on the ContentHandler system
and the ContentHandler default model hook relies on Context.
Bug: T173520
Change-Id: Ibe065a8df9e7fa49b85a789b59f3d3569a87eb8a
---
M ProofreadPage.body.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/82/374882/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..dbae3ab 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -25,6 +25,7 @@
use ProofreadPage\Page\PageContent;
use ProofreadPage\Page\PageContentBuilder;
use ProofreadPage\Pagination\PageNotInPaginationException;
+use ProofreadPage\ProofreadPageInit;
/*
@todo :
@@ -41,7 +42,7 @@
* @return int
*/
public static function getPageNamespaceId() {
- return Context::getDefaultContext()->getPageNamespaceId();
+ return ProofreadPageInit::getNamespaceId( 'page' );
}
/**
@@ -52,7 +53,7 @@
* @return int
*/
public static function getIndexNamespaceId() {
- return Context::getDefaultContext()->getIndexNamespaceId();
+ return ProofreadPageInit::getNamespaceId( 'index' );
}
/**
@@ -89,6 +90,7 @@
* @return bool if we have to continue the research for a content
handler
*/
public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
+ // Warning: do not use Context here because it assumes
ContentHandler is already initialized
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
$model = CONTENT_MODEL_PROOFREAD_PAGE;
return false;
--
To view, visit https://gerrit.wikimedia.org/r/374882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe065a8df9e7fa49b85a789b59f3d3569a87eb8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.30.0-wmf.16
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Tpt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.30.0-wmf.16]: Revert to db7507246665e69384c1d92af2aedc62263a5116
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374879 )
Change subject: Revert to db7507246665e69384c1d92af2aedc62263a5116
..
Revert to db7507246665e69384c1d92af2aedc62263a5116
Moves function related to display out of PageDisplayHandler
This reverts commit 9e21fdabc8278889ea5f04c62931bdeee1a4db18.
This reverts commit e596fbd97018b2b9c476ec32406e4914d3e583d3
This reverts commit c98a61b1d8517cd6a255f71aaba5ca959bc81002
This reverts commit ab2eaeb9fbd51de38c6e2acf8018430ec7b0a89c
This reverts commit f6ca5179d7eec5ee72c0bd29607e4c0de22b03bc
This reverts commit 24f9d414fe856d21b16f54074d5130e9b9251198
This reverts commit 760d213788061dc8d6dfbc7724dfe4c8ad18ef6a
This reverts commit b48f361d7d606eff5ab48cc2a64c1cae4e794c84.
Bug: T173520
Change-Id: Ia419c028f1578792e1d7dc9c6e14d192d4264f38
(cherry picked from commit db5ee90de0038b528b9448cbd808eb190a66df95)
(cherry picked from commit a7c6487015557c9c2d33633c40f989237f07b46c)
---
M ProofreadPage.body.php
M ProofreadPage.namespaces.php
M composer.json
M extension.json
M i18n/mr.json
M i18n/ug-arab.json
M includes/Context.php
M includes/Pagination/PageList.php
M includes/Pagination/PageNumber.php
M includes/Pagination/Pagination.php
M includes/Parser/PagesTagParser.php
M includes/ProofreadPageInit.php
D includes/index/CustomIndexFieldsParser.php
M includes/index/EditIndexPage.php
M includes/index/IndexContent.php
M includes/index/IndexContentHandler.php
D includes/index/IndexDifferenceEngine.php
M includes/index/ProofreadIndexDbConnector.php
R includes/index/ProofreadIndexEntry.php
M includes/index/ProofreadIndexPage.php
M includes/page/PageContentBuilder.php
M includes/page/PageDifferenceEngine.php
M includes/page/PageDisplayHandler.php
M includes/page/PageLevel.php
M includes/page/ProofreadPageDbConnector.php
M includes/page/ProofreadPagePage.php
M phpcs.xml
M tests/phpunit/ContextTest.php
M tests/phpunit/FileProviderTest.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PagePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
M tests/phpunit/ProofreadPageInitTest.php
M tests/phpunit/ProofreadPageTestCase.php
D tests/phpunit/index/CustomIndexFieldsParserTest.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/index/IndexRedirectContentTest.php
M tests/phpunit/index/ProofreadIndexPageTest.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageContentTest.php
M tests/phpunit/page/PageDisplayHandlerTest.php
M tests/phpunit/page/PageLevelTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
43 files changed, 738 insertions(+), 934 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/79/374879/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..eda957a 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -38,7 +38,7 @@
*
* Returns id of Page namespace.
*
-* @return int
+* @return integer
*/
public static function getPageNamespaceId() {
return Context::getDefaultContext()->getPageNamespaceId();
@@ -49,7 +49,7 @@
*
* Returns id of Index namespace.
*
-* @return int
+* @return integer
*/
public static function getIndexNamespaceId() {
return Context::getDefaultContext()->getIndexNamespaceId();
@@ -86,7 +86,7 @@
*
* @param Title $title the title page
* @param string $model the content model for the page
-* @return bool if we have to continue the research for a content
handler
+* @return boolean if we have to continue the research for a content
handler
*/
public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
@@ -104,7 +104,7 @@
* Set up our custom parser hooks when initializing parser.
*
* @param Parser $parser
-* @return bool hook return value
+* @return boolean hook return value
*/
public static function onParserFirstCallInit( Parser $parser ) {
$parser->setHook(
diff --git a/ProofreadPage.namespaces.php b/ProofreadPage.namespaces.php
index 63216c2..572dcd7 100644
--- a/ProofreadPage.namespaces.php
+++ b/ProofreadPage.namespaces.php
@@ -240,7 +240,7 @@
'page' => 'ಪುಟ',
'page_talk' => 'ಪುಟ_ಚರ್ಚೆ',
'index' => 'ಪರಿವಿಡಿ',
- 'index_talk' => 'ಪರಿವಿಡಿ_ಚರ್ಚೆ'
+ 'index_talk' => 'ಪರಿವಿಡಿ_ಚರ್ಚೆ'
];
/** Korean (한국어) */
@@ -264,7 +264,7 @@
'page' => 'താൾ',
'page_talk' => 'താളിന്റെ_സംവാദം',
'index' => 'സൂചിക',
- 'index_talk' => 'സൂചികയുടെ_സംവാദം'
+ 'index_talk' => 'സൂചികയുടെ_സംവാദം'
];
/** Marathi (मराठी) */
@@ -272,7 +272,7 @@
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Mask jobchron and jobrunner in non-active DC
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374438 )
Change subject: Mask jobchron and jobrunner in non-active DC
..
Mask jobchron and jobrunner in non-active DC
This should ensure that jobrunner and jobchron are not accidentally
started in the non-active datacenter. Scap should be able to use this
information to avoid attempting automatic restarts when the service is
masked.
Bug: T167104
Change-Id: I09ba869f9a914c76c161ba7d125b6afb5e0e6b91
---
M modules/base/manifests/service_unit.pp
M modules/mediawiki/manifests/jobrunner.pp
2 files changed, 21 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/374438/1
diff --git a/modules/base/manifests/service_unit.pp
b/modules/base/manifests/service_unit.pp
index 196613c..4cb8292 100644
--- a/modules/base/manifests/service_unit.pp
+++ b/modules/base/manifests/service_unit.pp
@@ -43,6 +43,9 @@
# [*declare_service*]
# Boolean - tells puppet if a service {} stanza is required or not
#
+# [*mask*]
+# Boolean - tells puppet if a systemd service should be masked
+#
# [*service_params*]
# An hash of parameters that we want to apply to the service resource
#
@@ -71,6 +74,7 @@
$strict = true,
$refresh = true,
$declare_service = true,
+$mask = false,
$service_params = {},
) {
@@ -122,12 +126,21 @@
}
}
-file { $path:
-ensure => $ensure,
-content => $content,
-mode=> $i_mode,
-owner => 'root',
-group => 'root',
+if $initscript == 'systemd' and $mask {
+file { $path:
+ensure => 'link',
+target => '/dev/null',
+owner => 'root',
+group => 'root',
+}
+} else {
+file { $path:
+ensure => $ensure,
+content => $content,
+mode=> $i_mode,
+owner => 'root',
+group => 'root',
+}
}
if $declare_service {
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index fa00b81..66506df 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -75,12 +75,14 @@
systemd=> systemd_template('jobrunner'),
upstart=> upstart_template('jobrunner'),
service_params => $params,
+mask => !$running,
}
base::service_unit { 'jobchron':
systemd=> systemd_template('jobchron'),
upstart=> upstart_template('jobchron'),
service_params => $params,
+mask => !$running,
}
if $::initsystem == 'systemd' {
--
To view, visit https://gerrit.wikimedia.org/r/374438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09ba869f9a914c76c161ba7d125b6afb5e0e6b91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.30.0-wmf.15
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373669 )
Change subject: all wikis to 1.30.0-wmf.15
..
all wikis to 1.30.0-wmf.15
Change-Id: Id5ca6d8c8471b022475c56f1607f9f833ab03ec5
---
M wikiversions.json
1 file changed, 304 insertions(+), 304 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/69/373669/1
diff --git a/wikiversions.json b/wikiversions.json
index 162bc66..4d48172 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
{
-"aawiki": "php-1.30.0-wmf.14",
+"aawiki": "php-1.30.0-wmf.15",
"aawikibooks": "php-1.30.0-wmf.15",
"aawiktionary": "php-1.30.0-wmf.15",
-"abwiki": "php-1.30.0-wmf.14",
+"abwiki": "php-1.30.0-wmf.15",
"abwiktionary": "php-1.30.0-wmf.15",
-"acewiki": "php-1.30.0-wmf.14",
+"acewiki": "php-1.30.0-wmf.15",
"advisorywiki": "php-1.30.0-wmf.15",
-"adywiki": "php-1.30.0-wmf.14",
-"afwiki": "php-1.30.0-wmf.14",
+"adywiki": "php-1.30.0-wmf.15",
+"afwiki": "php-1.30.0-wmf.15",
"afwikibooks": "php-1.30.0-wmf.15",
"afwikiquote": "php-1.30.0-wmf.15",
"afwiktionary": "php-1.30.0-wmf.15",
-"akwiki": "php-1.30.0-wmf.14",
+"akwiki": "php-1.30.0-wmf.15",
"akwikibooks": "php-1.30.0-wmf.15",
"akwiktionary": "php-1.30.0-wmf.15",
-"alswiki": "php-1.30.0-wmf.14",
+"alswiki": "php-1.30.0-wmf.15",
"alswikibooks": "php-1.30.0-wmf.15",
"alswikiquote": "php-1.30.0-wmf.15",
"alswiktionary": "php-1.30.0-wmf.15",
-"amwiki": "php-1.30.0-wmf.14",
+"amwiki": "php-1.30.0-wmf.15",
"amwikiquote": "php-1.30.0-wmf.15",
"amwiktionary": "php-1.30.0-wmf.15",
-"angwiki": "php-1.30.0-wmf.14",
+"angwiki": "php-1.30.0-wmf.15",
"angwikibooks": "php-1.30.0-wmf.15",
"angwikiquote": "php-1.30.0-wmf.15",
"angwikisource": "php-1.30.0-wmf.15",
"angwiktionary": "php-1.30.0-wmf.15",
-"anwiki": "php-1.30.0-wmf.14",
+"anwiki": "php-1.30.0-wmf.15",
"anwiktionary": "php-1.30.0-wmf.15",
-"arbcom_cswiki": "php-1.30.0-wmf.14",
-"arbcom_dewiki": "php-1.30.0-wmf.14",
-"arbcom_enwiki": "php-1.30.0-wmf.14",
-"arbcom_fiwiki": "php-1.30.0-wmf.14",
-"arbcom_nlwiki": "php-1.30.0-wmf.14",
-"arcwiki": "php-1.30.0-wmf.14",
-"arwiki": "php-1.30.0-wmf.14",
+"arbcom_cswiki": "php-1.30.0-wmf.15",
+"arbcom_dewiki": "php-1.30.0-wmf.15",
+"arbcom_enwiki": "php-1.30.0-wmf.15",
+"arbcom_fiwiki": "php-1.30.0-wmf.15",
+"arbcom_nlwiki": "php-1.30.0-wmf.15",
+"arcwiki": "php-1.30.0-wmf.15",
+"arwiki": "php-1.30.0-wmf.15",
"arwikibooks": "php-1.30.0-wmf.15",
"arwikimedia": "php-1.30.0-wmf.15",
"arwikinews": "php-1.30.0-wmf.15",
@@ -42,81 +42,81 @@
"arwikisource": "php-1.30.0-wmf.15",
"arwikiversity": "php-1.30.0-wmf.15",
"arwiktionary": "php-1.30.0-wmf.15",
-"arzwiki": "php-1.30.0-wmf.14",
-"astwiki": "php-1.30.0-wmf.14",
+"arzwiki": "php-1.30.0-wmf.15",
+"astwiki": "php-1.30.0-wmf.15",
"astwikibooks": "php-1.30.0-wmf.15",
"astwikiquote": "php-1.30.0-wmf.15",
"astwiktionary": "php-1.30.0-wmf.15",
-"aswiki": "php-1.30.0-wmf.14",
+"aswiki": "php-1.30.0-wmf.15",
"aswikibooks": "php-1.30.0-wmf.15",
"aswikisource": "php-1.30.0-wmf.15",
"aswiktionary": "php-1.30.0-wmf.15",
-"atjwiki": "php-1.30.0-wmf.14",
+"atjwiki": "php-1.30.0-wmf.15",
"auditcomwiki": "php-1.30.0-wmf.15",
-"avwiki": "php-1.30.0-wmf.14",
+"avwiki": "php-1.30.0-wmf.15",
"avwiktionary": "php-1.30.0-wmf.15",
-"aywiki": "php-1.30.0-wmf.14",
+"aywiki": "php-1.30.0-wmf.15",
"aywikibooks": "php-1.30.0-wmf.15",
"aywiktionary": "php-1.30.0-wmf.15",
-"azbwiki": "php-1.30.0-wmf.14",
-"azwiki": "php-1.30.0-wmf.14",
+"azbwiki": "php-1.30.0-wmf.15",
+"azwiki": "php-1.30.0-wmf.15",
"azwikibooks": "php-1.30.0-wmf.15",
"azwikiquote": "php-1.30.0-wmf.15",
"azwikisource": "php-1.30.0-wmf.15",
"azwiktionary": "php-1.30.0-wmf.15",
-"barwiki": "php-1.30.0-wmf.14",
-"bat_smgwiki": "php-1.30.0-wmf.14",
-"bawiki": "php-1.30.0-wmf.14",
+"barwiki": "php-1.30.0-wmf.15",
+"bat_smgwiki": "php-1.30.0-wmf.15",
+"bawiki": "php-1.30.0-wmf.15",
"bawikibooks": "php-1.30.0-wmf.15",
-"bclwiki": "php-1.30.0-wmf.14",
+"bclwiki": "php-1.30.0-wmf.15",
"bdwikimedia": "php-1.30.0-wmf.15",
-"be_x_oldwiki": "php-1.30.0-wmf.14",
+"be_x_oldwiki": "php-1.30.0-wmf.15",
"betawikiversity": "php-1.30.0-wmf.15",
-"bewiki": "php-1.30.0-wmf.14",
+"bewiki": "php-1.30.0-wmf.15",
"bewikibooks": "php-1.30.0-wmf.15",
"bewikimedia": "php-1.30.0-wmf.15",
"bewikiquote": "php-1.30.0-wmf.15",
"bewikisource": "php-1.30.0-wmf.15",
"bewiktionary": "php-1.30.0-wmf.15",
-"bgwiki": "php-1.30.0-wmf.14",
+"bgwiki": "p
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.15
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373366 )
Change subject: group1 wikis to 1.30.0-wmf.15
..
group1 wikis to 1.30.0-wmf.15
Change-Id: I42639836a837d72d347e354caa4dea869d2ca635
---
M php
M wikiversions.json
2 files changed, 603 insertions(+), 603 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/66/373366/1
diff --git a/php b/php
index 39addf1..5a64e5f 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.14
\ No newline at end of file
+php-1.30.0-wmf.15
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 03b73fc..162bc66 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.14",
-"aawikibooks": "php-1.30.0-wmf.14",
-"aawiktionary": "php-1.30.0-wmf.14",
+"aawikibooks": "php-1.30.0-wmf.15",
+"aawiktionary": "php-1.30.0-wmf.15",
"abwiki": "php-1.30.0-wmf.14",
-"abwiktionary": "php-1.30.0-wmf.14",
+"abwiktionary": "php-1.30.0-wmf.15",
"acewiki": "php-1.30.0-wmf.14",
-"advisorywiki": "php-1.30.0-wmf.14",
+"advisorywiki": "php-1.30.0-wmf.15",
"adywiki": "php-1.30.0-wmf.14",
"afwiki": "php-1.30.0-wmf.14",
-"afwikibooks": "php-1.30.0-wmf.14",
-"afwikiquote": "php-1.30.0-wmf.14",
-"afwiktionary": "php-1.30.0-wmf.14",
+"afwikibooks": "php-1.30.0-wmf.15",
+"afwikiquote": "php-1.30.0-wmf.15",
+"afwiktionary": "php-1.30.0-wmf.15",
"akwiki": "php-1.30.0-wmf.14",
-"akwikibooks": "php-1.30.0-wmf.14",
-"akwiktionary": "php-1.30.0-wmf.14",
+"akwikibooks": "php-1.30.0-wmf.15",
+"akwiktionary": "php-1.30.0-wmf.15",
"alswiki": "php-1.30.0-wmf.14",
-"alswikibooks": "php-1.30.0-wmf.14",
-"alswikiquote": "php-1.30.0-wmf.14",
-"alswiktionary": "php-1.30.0-wmf.14",
+"alswikibooks": "php-1.30.0-wmf.15",
+"alswikiquote": "php-1.30.0-wmf.15",
+"alswiktionary": "php-1.30.0-wmf.15",
"amwiki": "php-1.30.0-wmf.14",
-"amwikiquote": "php-1.30.0-wmf.14",
-"amwiktionary": "php-1.30.0-wmf.14",
+"amwikiquote": "php-1.30.0-wmf.15",
+"amwiktionary": "php-1.30.0-wmf.15",
"angwiki": "php-1.30.0-wmf.14",
-"angwikibooks": "php-1.30.0-wmf.14",
-"angwikiquote": "php-1.30.0-wmf.14",
-"angwikisource": "php-1.30.0-wmf.14",
-"angwiktionary": "php-1.30.0-wmf.14",
+"angwikibooks": "php-1.30.0-wmf.15",
+"angwikiquote": "php-1.30.0-wmf.15",
+"angwikisource": "php-1.30.0-wmf.15",
+"angwiktionary": "php-1.30.0-wmf.15",
"anwiki": "php-1.30.0-wmf.14",
-"anwiktionary": "php-1.30.0-wmf.14",
+"anwiktionary": "php-1.30.0-wmf.15",
"arbcom_cswiki": "php-1.30.0-wmf.14",
"arbcom_dewiki": "php-1.30.0-wmf.14",
"arbcom_enwiki": "php-1.30.0-wmf.14",
@@ -35,880 +35,880 @@
"arbcom_nlwiki": "php-1.30.0-wmf.14",
"arcwiki": "php-1.30.0-wmf.14",
"arwiki": "php-1.30.0-wmf.14",
-"arwikibooks": "php-1.30.0-wmf.14",
-"arwikimedia": "php-1.30.0-wmf.14",
-"arwikinews": "php-1.30.0-wmf.14",
-"arwikiquote": "php-1.30.0-wmf.14",
-"arwikisource": "php-1.30.0-wmf.14",
-"arwikiversity": "php-1.30.0-wmf.14",
-"arwiktionary": "php-1.30.0-wmf.14",
+"arwikibooks": "php-1.30.0-wmf.15",
+"arwikimedia": "php-1.30.0-wmf.15",
+"arwikinews": "php-1.30.0-wmf.15",
+"arwikiquote": "php-1.30.0-wmf.15",
+"arwikisource": "php-1.30.0-wmf.15",
+"arwikiversity": "php-1.30.0-wmf.15",
+"arwiktionary": "php-1.30.0-wmf.15",
"arzwiki": "php-1.30.0-wmf.14",
"astwiki": "php-1.30.0-wmf.14",
-"astwikibooks": "php-1.30.0-wmf.14",
-"astwikiquote": "php-1.30.0-wmf.14",
-"astwiktionary": "php-1.30.0-wmf.14",
+"astwikibooks": "php-1.30.0-wmf.15",
+"astwikiquote": "php-1.30.0-wmf.15",
+"astwiktionary": "php-1.30.0-wmf.15",
"aswiki": "php-1.30.0-wmf.14",
-"aswikibooks": "php-1.30.0-wmf.14",
-"aswikisource": "php-1.30.0-wmf.14",
-"aswiktionary": "php-1.30.0-wmf.14",
+"aswikibooks": "php-1.30.0-wmf.15",
+"aswikisource": "php-1.30.0-wmf.15",
+"aswiktionary": "php-1.30.0-wmf.15",
"atjwiki": "php-1.30.0-wmf.14",
-"auditcomwiki": "php-1.30.0-wmf.14",
+"auditcomwiki": "php-1.30.0-wmf.15",
"avwiki": "php-1.30.0-wmf.14",
-"avwiktionary": "php-1.30.0-wmf.14",
+"avwiktionary": "php-1.30.0-wmf.15",
"aywiki": "php-1.30.0-wmf.14",
-"aywikibooks": "php-1.30.0-wmf.14",
-"aywiktionary": "php-1.30.0-wmf.14",
+"aywikibooks": "php-1.30.0-wmf.15",
+"aywiktionary": "php-1.30.0-wmf.15",
"azbwiki": "php-1.30.0-wmf.14",
"azwiki": "php-1.30.0-wmf.14",
-"azwikibooks": "php-1.30.0-wmf.14",
-"azwikiquote": "php-1.30.0-wmf.14",
-"azwikisource": "php-1.30.0-wmf.14",
-"azwiktionary": "php-1.30.0-wmf.14",
+"azwikibooks": "php-1.30.0-wmf.15",
+"azwikiquote": "php-1.30.0-wmf.15",
+"azwi
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.30.0-wmf.15]: Revert to db7507246665e69384c1d92af2aedc62263a5116
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373351 )
Change subject: Revert to db7507246665e69384c1d92af2aedc62263a5116
..
Revert to db7507246665e69384c1d92af2aedc62263a5116
Moves function related to display out of PageDisplayHandler
This reverts commit 9e21fdabc8278889ea5f04c62931bdeee1a4db18.
This reverts commit e596fbd97018b2b9c476ec32406e4914d3e583d3
This reverts commit c98a61b1d8517cd6a255f71aaba5ca959bc81002
This reverts commit ab2eaeb9fbd51de38c6e2acf8018430ec7b0a89c
This reverts commit f6ca5179d7eec5ee72c0bd29607e4c0de22b03bc
This reverts commit 24f9d414fe856d21b16f54074d5130e9b9251198
This reverts commit 760d213788061dc8d6dfbc7724dfe4c8ad18ef6a
This reverts commit b48f361d7d606eff5ab48cc2a64c1cae4e794c84.
Bug: T173520
Change-Id: Ia419c028f1578792e1d7dc9c6e14d192d4264f38
(cherry picked from commit db5ee90de0038b528b9448cbd808eb190a66df95)
---
M ProofreadPage.body.php
M ProofreadPage.namespaces.php
M composer.json
M extension.json
M i18n/mr.json
M i18n/ug-arab.json
M includes/Context.php
M includes/Pagination/PageList.php
M includes/Pagination/PageNumber.php
M includes/Pagination/Pagination.php
M includes/Parser/PagesTagParser.php
M includes/ProofreadPageInit.php
D includes/index/CustomIndexFieldsParser.php
M includes/index/EditIndexPage.php
M includes/index/IndexContent.php
M includes/index/IndexContentHandler.php
D includes/index/IndexDifferenceEngine.php
M includes/index/ProofreadIndexDbConnector.php
R includes/index/ProofreadIndexEntry.php
M includes/index/ProofreadIndexPage.php
M includes/page/PageContentBuilder.php
M includes/page/PageDifferenceEngine.php
M includes/page/PageDisplayHandler.php
M includes/page/PageLevel.php
M includes/page/ProofreadPageDbConnector.php
M includes/page/ProofreadPagePage.php
M phpcs.xml
M tests/phpunit/ContextTest.php
M tests/phpunit/FileProviderTest.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PagePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
M tests/phpunit/ProofreadPageInitTest.php
M tests/phpunit/ProofreadPageTestCase.php
D tests/phpunit/index/CustomIndexFieldsParserTest.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/index/IndexRedirectContentTest.php
M tests/phpunit/index/ProofreadIndexPageTest.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageContentTest.php
M tests/phpunit/page/PageDisplayHandlerTest.php
M tests/phpunit/page/PageLevelTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
43 files changed, 738 insertions(+), 934 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/51/373351/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..eda957a 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -38,7 +38,7 @@
*
* Returns id of Page namespace.
*
-* @return int
+* @return integer
*/
public static function getPageNamespaceId() {
return Context::getDefaultContext()->getPageNamespaceId();
@@ -49,7 +49,7 @@
*
* Returns id of Index namespace.
*
-* @return int
+* @return integer
*/
public static function getIndexNamespaceId() {
return Context::getDefaultContext()->getIndexNamespaceId();
@@ -86,7 +86,7 @@
*
* @param Title $title the title page
* @param string $model the content model for the page
-* @return bool if we have to continue the research for a content
handler
+* @return boolean if we have to continue the research for a content
handler
*/
public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
@@ -104,7 +104,7 @@
* Set up our custom parser hooks when initializing parser.
*
* @param Parser $parser
-* @return bool hook return value
+* @return boolean hook return value
*/
public static function onParserFirstCallInit( Parser $parser ) {
$parser->setHook(
diff --git a/ProofreadPage.namespaces.php b/ProofreadPage.namespaces.php
index 63216c2..572dcd7 100644
--- a/ProofreadPage.namespaces.php
+++ b/ProofreadPage.namespaces.php
@@ -240,7 +240,7 @@
'page' => 'ಪುಟ',
'page_talk' => 'ಪುಟ_ಚರ್ಚೆ',
'index' => 'ಪರಿವಿಡಿ',
- 'index_talk' => 'ಪರಿವಿಡಿ_ಚರ್ಚೆ'
+ 'index_talk' => 'ಪರಿವಿಡಿ_ಚರ್ಚೆ'
];
/** Korean (한국어) */
@@ -264,7 +264,7 @@
'page' => 'താൾ',
'page_talk' => 'താളിന്റെ_സംവാദം',
'index' => 'സൂചിക',
- 'index_talk' => 'സൂചികയുടെ_സംവാദം'
+ 'index_talk' => 'സൂചികയുടെ_സംവാദം'
];
/** Marathi (मराठी) */
@@ -272,7 +272,7 @@
'page' => 'पान',
'page_talk' => 'पान_चर्चा',
'index'
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "registration: Only allow one extension to set a spec...
Hello Paladox, Tim Starling, Reedy, Reception123, Florianschmidtwelzow,
Legoktm, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/373143
to review the following change.
Change subject: Revert "registration: Only allow one extension to set a
specific config setting"
..
Revert "registration: Only allow one extension to set a specific config setting"
Breaks mergeMessageFileList which means scap can't run in beta.
This reverts commit 50d7546057c1089228a2a6d7d4a49d78d72887e3.
Change-Id: Idb65f1098abce28d49ebbcc8254c0976b6861c59
---
M includes/registration/ExtensionProcessor.php
M tests/phpunit/includes/registration/ExtensionProcessorTest.php
2 files changed, 2 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/373143/1
diff --git a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index 14d8222..ce262bd 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -450,7 +450,7 @@
}
foreach ( $info['config'] as $key => $val ) {
if ( $key[0] !== '@' ) {
- $this->addConfigGlobal( "$prefix$key",
$val );
+ $this->globals["$prefix$key"] = $val;
}
}
}
@@ -478,24 +478,9 @@
if ( isset( $data['path'] ) && $data['path'] ) {
$value = "$dir/$value";
}
- $this->addConfigGlobal( "$prefix$key", $value );
+ $this->globals["$prefix$key"] = $value;
}
}
- }
-
- /**
-* Helper function to set a value to a specific global, if it isn't set
already.
-*
-* @param string $key The config key with the prefix and anything
-* @param mixed $value The value of the config
-*/
- private function addConfigGlobal( $key, $value ) {
- if ( array_key_exists( $key, $this->globals ) ) {
- throw new RuntimeException(
- "The configuration setting '$key' was already
set by another extension,"
- . " and cannot be set again." );
- }
- $this->globals[$key] = $value;
}
protected function extractServiceWiringFiles( $dir, array $info ) {
diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index 5ef30e8..7b56def 100644
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -220,48 +220,6 @@
$this->assertEquals( 'somevalue',
$extracted['globals']['egBar'] );
}
- /**
-* @covers ExtensionProcessor::addConfigGlobal()
-* @expectedException RuntimeException
-*/
- public function testDuplicateConfigKey1() {
- $processor = new ExtensionProcessor;
- $info = [
- 'config' => [
- 'Bar' => '',
- ]
- ] + self::$default;
- $info2 = [
- 'config' => [
- 'Bar' => 'g',
- ],
- 'name' => 'FooBar2',
- ];
- $processor->extractInfo( $this->dir, $info, 1 );
- $processor->extractInfo( $this->dir, $info2, 1 );
- }
-
- /**
-* @covers ExtensionProcessor::addConfigGlobal()
-* @expectedException RuntimeException
-*/
- public function testDuplicateConfigKey2() {
- $processor = new ExtensionProcessor;
- $info = [
- 'config' => [
- 'Bar' => [ 'value' => 'somevalue' ],
- ]
- ] + self::$default;
- $info2 = [
- 'config' => [
- 'Bar' => [ 'value' => 'somevalue' ],
- ],
- 'name' => 'FooBar2',
- ];
- $processor->extractInfo( $this->dir, $info, 2 );
- $processor->extractInfo( $this->dir, $info2, 2 );
- }
-
public static function provideExtractExtensionMessagesFiles() {
$dir = __DIR__ . '/FooBar/';
return [
--
To view, visit https://gerrit.wikimedia.org/r/373143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerri
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group0 to 1.30.0-wmf.15
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373137 ) Change subject: Group0 to 1.30.0-wmf.15 .. Group0 to 1.30.0-wmf.15 Change-Id: Ib537fa949b797eabff42bac82e28bf80aed4db3d --- M wikiversions.json 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/37/373137/1 diff --git a/wikiversions.json b/wikiversions.json index 844e4d8..03b73fc 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -445,7 +445,7 @@ "kywikiquote": "php-1.30.0-wmf.14", "kywiktionary": "php-1.30.0-wmf.14", "labswiki": "php-1.30.0-wmf.14", -"labtestwiki": "php-1.30.0-wmf.14", +"labtestwiki": "php-1.30.0-wmf.15", "ladwiki": "php-1.30.0-wmf.14", "lawiki": "php-1.30.0-wmf.14", "lawikibooks": "php-1.30.0-wmf.14", @@ -487,7 +487,7 @@ "maiwikimedia": "php-1.30.0-wmf.14", "map_bmswiki": "php-1.30.0-wmf.14", "mdfwiki": "php-1.30.0-wmf.14", -"mediawikiwiki": "php-1.30.0-wmf.14", +"mediawikiwiki": "php-1.30.0-wmf.15", "metawiki": "php-1.30.0-wmf.14", "mgwiki": "php-1.30.0-wmf.14", "mgwikibooks": "php-1.30.0-wmf.14", @@ -760,9 +760,9 @@ "tcywiki": "php-1.30.0-wmf.14", "techconductwiki": "php-1.30.0-wmf.14", "tenwiki": "php-1.30.0-wmf.14", -"test2wiki": "php-1.30.0-wmf.14", -"testwiki": "php-1.30.0-wmf.14", -"testwikidatawiki": "php-1.30.0-wmf.14", +"test2wiki": "php-1.30.0-wmf.15", +"testwiki": "php-1.30.0-wmf.15", +"testwikidatawiki": "php-1.30.0-wmf.15", "tetwiki": "php-1.30.0-wmf.14", "tewiki": "php-1.30.0-wmf.14", "tewikibooks": "php-1.30.0-wmf.14", @@ -893,7 +893,7 @@ "zawikiquote": "php-1.30.0-wmf.14", "zawiktionary": "php-1.30.0-wmf.14", "zeawiki": "php-1.30.0-wmf.14", -"zerowiki": "php-1.30.0-wmf.14", +"zerowiki": "php-1.30.0-wmf.15", "zh_classicalwiki": "php-1.30.0-wmf.14", "zh_min_nanwiki": "php-1.30.0-wmf.14", "zh_min_nanwikibooks": "php-1.30.0-wmf.14", -- To view, visit https://gerrit.wikimedia.org/r/373137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib537fa949b797eabff42bac82e28bf80aed4db3d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.14]: Restore the newFromId() approach in SpecialNewpages::feedIte...
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372465 )
Change subject: Restore the newFromId() approach in
SpecialNewpages::feedItemDesc
..
Restore the newFromId() approach in SpecialNewpages::feedItemDesc
Trying to use the row data is problematic since the text related
fields are missing. This fixing a regression from 4475e1c8c.
Also make SpecialNewpages::feedItemDesc() handle null content.
Bug: T173541
Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
---
M includes/specials/SpecialNewpages.php
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/372465/1
diff --git a/includes/specials/SpecialNewpages.php
b/includes/specials/SpecialNewpages.php
index 6a79714..e3b73a9 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -494,17 +494,22 @@
}
protected function feedItemDesc( $row ) {
- $revision = $this->revisionFromRcResult( $row );
- if ( $revision ) {
- // XXX: include content model/type in feed item?
- return '' . htmlspecialchars(
$revision->getUserText() ) .
- $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
- htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
- "\n\n" .
- nl2br( htmlspecialchars(
$revision->getContent()->serialize() ) ) . "";
+ $revision = Revision::newFromId( $row->rev_id );
+ if ( !$revision ) {
+ return '';
}
- return '';
+ $content = $revision->getContent();
+ if ( $content === null ) {
+ return '';
+ }
+
+ // XXX: include content model/type in feed item?
+ return '' . htmlspecialchars( $revision->getUserText() ) .
+ $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
+ htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
+ "\n\n" .
+ nl2br( htmlspecialchars( $content->serialize() ) ) .
"";
}
protected function getGroupName() {
--
To view, visit https://gerrit.wikimedia.org/r/372465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.30.0-wmf.14
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372444 )
Change subject: all wikis to 1.30.0-wmf.14
..
all wikis to 1.30.0-wmf.14
Change-Id: Ide8a43d4567b5761257848a15c7abe71f597672f
---
M wikiversions.json
1 file changed, 304 insertions(+), 304 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/44/372444/1
diff --git a/wikiversions.json b/wikiversions.json
index da944dc..844e4d8 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
{
-"aawiki": "php-1.30.0-wmf.13",
+"aawiki": "php-1.30.0-wmf.14",
"aawikibooks": "php-1.30.0-wmf.14",
"aawiktionary": "php-1.30.0-wmf.14",
-"abwiki": "php-1.30.0-wmf.13",
+"abwiki": "php-1.30.0-wmf.14",
"abwiktionary": "php-1.30.0-wmf.14",
-"acewiki": "php-1.30.0-wmf.13",
+"acewiki": "php-1.30.0-wmf.14",
"advisorywiki": "php-1.30.0-wmf.14",
-"adywiki": "php-1.30.0-wmf.13",
-"afwiki": "php-1.30.0-wmf.13",
+"adywiki": "php-1.30.0-wmf.14",
+"afwiki": "php-1.30.0-wmf.14",
"afwikibooks": "php-1.30.0-wmf.14",
"afwikiquote": "php-1.30.0-wmf.14",
"afwiktionary": "php-1.30.0-wmf.14",
-"akwiki": "php-1.30.0-wmf.13",
+"akwiki": "php-1.30.0-wmf.14",
"akwikibooks": "php-1.30.0-wmf.14",
"akwiktionary": "php-1.30.0-wmf.14",
-"alswiki": "php-1.30.0-wmf.13",
+"alswiki": "php-1.30.0-wmf.14",
"alswikibooks": "php-1.30.0-wmf.14",
"alswikiquote": "php-1.30.0-wmf.14",
"alswiktionary": "php-1.30.0-wmf.14",
-"amwiki": "php-1.30.0-wmf.13",
+"amwiki": "php-1.30.0-wmf.14",
"amwikiquote": "php-1.30.0-wmf.14",
"amwiktionary": "php-1.30.0-wmf.14",
-"angwiki": "php-1.30.0-wmf.13",
+"angwiki": "php-1.30.0-wmf.14",
"angwikibooks": "php-1.30.0-wmf.14",
"angwikiquote": "php-1.30.0-wmf.14",
"angwikisource": "php-1.30.0-wmf.14",
"angwiktionary": "php-1.30.0-wmf.14",
-"anwiki": "php-1.30.0-wmf.13",
+"anwiki": "php-1.30.0-wmf.14",
"anwiktionary": "php-1.30.0-wmf.14",
-"arbcom_cswiki": "php-1.30.0-wmf.13",
-"arbcom_dewiki": "php-1.30.0-wmf.13",
-"arbcom_enwiki": "php-1.30.0-wmf.13",
-"arbcom_fiwiki": "php-1.30.0-wmf.13",
-"arbcom_nlwiki": "php-1.30.0-wmf.13",
-"arcwiki": "php-1.30.0-wmf.13",
-"arwiki": "php-1.30.0-wmf.13",
+"arbcom_cswiki": "php-1.30.0-wmf.14",
+"arbcom_dewiki": "php-1.30.0-wmf.14",
+"arbcom_enwiki": "php-1.30.0-wmf.14",
+"arbcom_fiwiki": "php-1.30.0-wmf.14",
+"arbcom_nlwiki": "php-1.30.0-wmf.14",
+"arcwiki": "php-1.30.0-wmf.14",
+"arwiki": "php-1.30.0-wmf.14",
"arwikibooks": "php-1.30.0-wmf.14",
"arwikimedia": "php-1.30.0-wmf.14",
"arwikinews": "php-1.30.0-wmf.14",
@@ -42,81 +42,81 @@
"arwikisource": "php-1.30.0-wmf.14",
"arwikiversity": "php-1.30.0-wmf.14",
"arwiktionary": "php-1.30.0-wmf.14",
-"arzwiki": "php-1.30.0-wmf.13",
-"astwiki": "php-1.30.0-wmf.13",
+"arzwiki": "php-1.30.0-wmf.14",
+"astwiki": "php-1.30.0-wmf.14",
"astwikibooks": "php-1.30.0-wmf.14",
"astwikiquote": "php-1.30.0-wmf.14",
"astwiktionary": "php-1.30.0-wmf.14",
-"aswiki": "php-1.30.0-wmf.13",
+"aswiki": "php-1.30.0-wmf.14",
"aswikibooks": "php-1.30.0-wmf.14",
"aswikisource": "php-1.30.0-wmf.14",
"aswiktionary": "php-1.30.0-wmf.14",
-"atjwiki": "php-1.30.0-wmf.13",
+"atjwiki": "php-1.30.0-wmf.14",
"auditcomwiki": "php-1.30.0-wmf.14",
-"avwiki": "php-1.30.0-wmf.13",
+"avwiki": "php-1.30.0-wmf.14",
"avwiktionary": "php-1.30.0-wmf.14",
-"aywiki": "php-1.30.0-wmf.13",
+"aywiki": "php-1.30.0-wmf.14",
"aywikibooks": "php-1.30.0-wmf.14",
"aywiktionary": "php-1.30.0-wmf.14",
-"azbwiki": "php-1.30.0-wmf.13",
-"azwiki": "php-1.30.0-wmf.13",
+"azbwiki": "php-1.30.0-wmf.14",
+"azwiki": "php-1.30.0-wmf.14",
"azwikibooks": "php-1.30.0-wmf.14",
"azwikiquote": "php-1.30.0-wmf.14",
"azwikisource": "php-1.30.0-wmf.14",
"azwiktionary": "php-1.30.0-wmf.14",
-"barwiki": "php-1.30.0-wmf.13",
-"bat_smgwiki": "php-1.30.0-wmf.13",
-"bawiki": "php-1.30.0-wmf.13",
+"barwiki": "php-1.30.0-wmf.14",
+"bat_smgwiki": "php-1.30.0-wmf.14",
+"bawiki": "php-1.30.0-wmf.14",
"bawikibooks": "php-1.30.0-wmf.14",
-"bclwiki": "php-1.30.0-wmf.13",
+"bclwiki": "php-1.30.0-wmf.14",
"bdwikimedia": "php-1.30.0-wmf.14",
-"be_x_oldwiki": "php-1.30.0-wmf.13",
+"be_x_oldwiki": "php-1.30.0-wmf.14",
"betawikiversity": "php-1.30.0-wmf.14",
-"bewiki": "php-1.30.0-wmf.13",
+"bewiki": "php-1.30.0-wmf.14",
"bewikibooks": "php-1.30.0-wmf.14",
"bewikimedia": "php-1.30.0-wmf.14",
"bewikiquote": "php-1.30.0-wmf.14",
"bewikisource": "php-1.30.0-wmf.14",
"bewiktionary": "php-1.30.0-wmf.14",
-"bgwiki": "php-1.30.0-wmf.13",
+"bgwiki": "p
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Group1 wikis to wmf.14""
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372433 )
Change subject: Revert "Revert "Group1 wikis to wmf.14""
..
Revert "Revert "Group1 wikis to wmf.14""
This reverts commit a5197676aecbc47b682246b59bce990785049365.
Change-Id: I4833c2d98618457a07ae3ec171751a1f2ab1546c
---
M php
M wikiversions.json
2 files changed, 603 insertions(+), 603 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/33/372433/1
diff --git a/php b/php
index a342232..39addf1 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.13
\ No newline at end of file
+php-1.30.0-wmf.14
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 6ae6add..da944dc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.13",
-"aawikibooks": "php-1.30.0-wmf.13",
-"aawiktionary": "php-1.30.0-wmf.13",
+"aawikibooks": "php-1.30.0-wmf.14",
+"aawiktionary": "php-1.30.0-wmf.14",
"abwiki": "php-1.30.0-wmf.13",
-"abwiktionary": "php-1.30.0-wmf.13",
+"abwiktionary": "php-1.30.0-wmf.14",
"acewiki": "php-1.30.0-wmf.13",
-"advisorywiki": "php-1.30.0-wmf.13",
+"advisorywiki": "php-1.30.0-wmf.14",
"adywiki": "php-1.30.0-wmf.13",
"afwiki": "php-1.30.0-wmf.13",
-"afwikibooks": "php-1.30.0-wmf.13",
-"afwikiquote": "php-1.30.0-wmf.13",
-"afwiktionary": "php-1.30.0-wmf.13",
+"afwikibooks": "php-1.30.0-wmf.14",
+"afwikiquote": "php-1.30.0-wmf.14",
+"afwiktionary": "php-1.30.0-wmf.14",
"akwiki": "php-1.30.0-wmf.13",
-"akwikibooks": "php-1.30.0-wmf.13",
-"akwiktionary": "php-1.30.0-wmf.13",
+"akwikibooks": "php-1.30.0-wmf.14",
+"akwiktionary": "php-1.30.0-wmf.14",
"alswiki": "php-1.30.0-wmf.13",
-"alswikibooks": "php-1.30.0-wmf.13",
-"alswikiquote": "php-1.30.0-wmf.13",
-"alswiktionary": "php-1.30.0-wmf.13",
+"alswikibooks": "php-1.30.0-wmf.14",
+"alswikiquote": "php-1.30.0-wmf.14",
+"alswiktionary": "php-1.30.0-wmf.14",
"amwiki": "php-1.30.0-wmf.13",
-"amwikiquote": "php-1.30.0-wmf.13",
-"amwiktionary": "php-1.30.0-wmf.13",
+"amwikiquote": "php-1.30.0-wmf.14",
+"amwiktionary": "php-1.30.0-wmf.14",
"angwiki": "php-1.30.0-wmf.13",
-"angwikibooks": "php-1.30.0-wmf.13",
-"angwikiquote": "php-1.30.0-wmf.13",
-"angwikisource": "php-1.30.0-wmf.13",
-"angwiktionary": "php-1.30.0-wmf.13",
+"angwikibooks": "php-1.30.0-wmf.14",
+"angwikiquote": "php-1.30.0-wmf.14",
+"angwikisource": "php-1.30.0-wmf.14",
+"angwiktionary": "php-1.30.0-wmf.14",
"anwiki": "php-1.30.0-wmf.13",
-"anwiktionary": "php-1.30.0-wmf.13",
+"anwiktionary": "php-1.30.0-wmf.14",
"arbcom_cswiki": "php-1.30.0-wmf.13",
"arbcom_dewiki": "php-1.30.0-wmf.13",
"arbcom_enwiki": "php-1.30.0-wmf.13",
@@ -35,880 +35,880 @@
"arbcom_nlwiki": "php-1.30.0-wmf.13",
"arcwiki": "php-1.30.0-wmf.13",
"arwiki": "php-1.30.0-wmf.13",
-"arwikibooks": "php-1.30.0-wmf.13",
-"arwikimedia": "php-1.30.0-wmf.13",
-"arwikinews": "php-1.30.0-wmf.13",
-"arwikiquote": "php-1.30.0-wmf.13",
-"arwikisource": "php-1.30.0-wmf.13",
-"arwikiversity": "php-1.30.0-wmf.13",
-"arwiktionary": "php-1.30.0-wmf.13",
+"arwikibooks": "php-1.30.0-wmf.14",
+"arwikimedia": "php-1.30.0-wmf.14",
+"arwikinews": "php-1.30.0-wmf.14",
+"arwikiquote": "php-1.30.0-wmf.14",
+"arwikisource": "php-1.30.0-wmf.14",
+"arwikiversity": "php-1.30.0-wmf.14",
+"arwiktionary": "php-1.30.0-wmf.14",
"arzwiki": "php-1.30.0-wmf.13",
"astwiki": "php-1.30.0-wmf.13",
-"astwikibooks": "php-1.30.0-wmf.13",
-"astwikiquote": "php-1.30.0-wmf.13",
-"astwiktionary": "php-1.30.0-wmf.13",
+"astwikibooks": "php-1.30.0-wmf.14",
+"astwikiquote": "php-1.30.0-wmf.14",
+"astwiktionary": "php-1.30.0-wmf.14",
"aswiki": "php-1.30.0-wmf.13",
-"aswikibooks": "php-1.30.0-wmf.13",
-"aswikisource": "php-1.30.0-wmf.13",
-"aswiktionary": "php-1.30.0-wmf.13",
+"aswikibooks": "php-1.30.0-wmf.14",
+"aswikisource": "php-1.30.0-wmf.14",
+"aswiktionary": "php-1.30.0-wmf.14",
"atjwiki": "php-1.30.0-wmf.13",
-"auditcomwiki": "php-1.30.0-wmf.13",
+"auditcomwiki": "php-1.30.0-wmf.14",
"avwiki": "php-1.30.0-wmf.13",
-"avwiktionary": "php-1.30.0-wmf.13",
+"avwiktionary": "php-1.30.0-wmf.14",
"aywiki": "php-1.30.0-wmf.13",
-"aywikibooks": "php-1.30.0-wmf.13",
-"aywiktionary": "php-1.30.0-wmf.13",
+"aywikibooks": "php-1.30.0-wmf.14",
+"aywiktionary": "php-1.30.0-wmf.14",
"azbwiki": "php-1.30.0-wmf.13",
"azwiki": "php-1.30.0-wmf.13",
-"azwikibooks": "php-1.30.0-wmf.13",
-"azwikiquote": "php-1.30.0-wmf.13",
-"azwikisource": "php-1.30.0-wmf.13",
-"azwiktionary": "php-1.30.0-wmf.13",
+"a
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.30.0-wmf.14]: Revert to db7507246665e69384c1d92af2aedc62263a5116
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372427 )
Change subject: Revert to db7507246665e69384c1d92af2aedc62263a5116
..
Revert to db7507246665e69384c1d92af2aedc62263a5116
Moves function related to display out of PageDisplayHandler
This reverts commit 9e21fdabc8278889ea5f04c62931bdeee1a4db18.
This reverts commit e596fbd97018b2b9c476ec32406e4914d3e583d3
This reverts commit c98a61b1d8517cd6a255f71aaba5ca959bc81002
This reverts commit ab2eaeb9fbd51de38c6e2acf8018430ec7b0a89c
This reverts commit f6ca5179d7eec5ee72c0bd29607e4c0de22b03bc
This reverts commit 24f9d414fe856d21b16f54074d5130e9b9251198
This reverts commit 760d213788061dc8d6dfbc7724dfe4c8ad18ef6a
This reverts commit b48f361d7d606eff5ab48cc2a64c1cae4e794c84.
Bug: T173520
Change-Id: Ia419c028f1578792e1d7dc9c6e14d192d4264f38
---
M ProofreadPage.body.php
M ProofreadPage.namespaces.php
M composer.json
M extension.json
M i18n/mr.json
M i18n/ug-arab.json
M includes/Context.php
M includes/Pagination/PageList.php
M includes/Pagination/PageNumber.php
M includes/Pagination/Pagination.php
M includes/Parser/PagesTagParser.php
M includes/ProofreadPageInit.php
D includes/index/CustomIndexFieldsParser.php
M includes/index/EditIndexPage.php
M includes/index/IndexContent.php
M includes/index/IndexContentHandler.php
D includes/index/IndexDifferenceEngine.php
M includes/index/ProofreadIndexDbConnector.php
R includes/index/ProofreadIndexEntry.php
M includes/index/ProofreadIndexPage.php
M includes/page/PageContentBuilder.php
M includes/page/PageDifferenceEngine.php
M includes/page/PageDisplayHandler.php
M includes/page/PageLevel.php
M includes/page/ProofreadPageDbConnector.php
M includes/page/ProofreadPagePage.php
M phpcs.xml
M tests/phpunit/ContextTest.php
M tests/phpunit/FileProviderTest.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PagePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
M tests/phpunit/ProofreadPageInitTest.php
M tests/phpunit/ProofreadPageTestCase.php
D tests/phpunit/index/CustomIndexFieldsParserTest.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/index/IndexRedirectContentTest.php
M tests/phpunit/index/ProofreadIndexPageTest.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageContentTest.php
M tests/phpunit/page/PageDisplayHandlerTest.php
M tests/phpunit/page/PageLevelTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
43 files changed, 738 insertions(+), 934 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/27/372427/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..eda957a 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -38,7 +38,7 @@
*
* Returns id of Page namespace.
*
-* @return int
+* @return integer
*/
public static function getPageNamespaceId() {
return Context::getDefaultContext()->getPageNamespaceId();
@@ -49,7 +49,7 @@
*
* Returns id of Index namespace.
*
-* @return int
+* @return integer
*/
public static function getIndexNamespaceId() {
return Context::getDefaultContext()->getIndexNamespaceId();
@@ -86,7 +86,7 @@
*
* @param Title $title the title page
* @param string $model the content model for the page
-* @return bool if we have to continue the research for a content
handler
+* @return boolean if we have to continue the research for a content
handler
*/
public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
@@ -104,7 +104,7 @@
* Set up our custom parser hooks when initializing parser.
*
* @param Parser $parser
-* @return bool hook return value
+* @return boolean hook return value
*/
public static function onParserFirstCallInit( Parser $parser ) {
$parser->setHook(
diff --git a/ProofreadPage.namespaces.php b/ProofreadPage.namespaces.php
index 63216c2..572dcd7 100644
--- a/ProofreadPage.namespaces.php
+++ b/ProofreadPage.namespaces.php
@@ -240,7 +240,7 @@
'page' => 'ಪುಟ',
'page_talk' => 'ಪುಟ_ಚರ್ಚೆ',
'index' => 'ಪರಿವಿಡಿ',
- 'index_talk' => 'ಪರಿವಿಡಿ_ಚರ್ಚೆ'
+ 'index_talk' => 'ಪರಿವಿಡಿ_ಚರ್ಚೆ'
];
/** Korean (한국어) */
@@ -264,7 +264,7 @@
'page' => 'താൾ',
'page_talk' => 'താളിന്റെ_സംവാദം',
'index' => 'സൂചിക',
- 'index_talk' => 'സൂചികയുടെ_സംവാദം'
+ 'index_talk' => 'സൂചികയുടെ_സംവാദം'
];
/** Marathi (मराठी) */
@@ -272,7 +272,7 @@
'page' => 'पान',
'page_talk' => 'पान_चर्चा',
'index' => 'अनुक्रमणिका',
- 'index_talk' => 'अनुक्रमणिका_चर्चा'
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Group1 wikis to wmf.14""
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372415 )
Change subject: Revert "Revert "Group1 wikis to wmf.14""
..
Revert "Revert "Group1 wikis to wmf.14""
This reverts commit a5197676aecbc47b682246b59bce990785049365.
Change-Id: I4f484b4dc1ab5306f84f59eccaad2e613e140689
---
M php
M wikiversions.json
2 files changed, 603 insertions(+), 603 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/15/372415/1
diff --git a/php b/php
index a342232..39addf1 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.13
\ No newline at end of file
+php-1.30.0-wmf.14
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 6ae6add..da944dc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.13",
-"aawikibooks": "php-1.30.0-wmf.13",
-"aawiktionary": "php-1.30.0-wmf.13",
+"aawikibooks": "php-1.30.0-wmf.14",
+"aawiktionary": "php-1.30.0-wmf.14",
"abwiki": "php-1.30.0-wmf.13",
-"abwiktionary": "php-1.30.0-wmf.13",
+"abwiktionary": "php-1.30.0-wmf.14",
"acewiki": "php-1.30.0-wmf.13",
-"advisorywiki": "php-1.30.0-wmf.13",
+"advisorywiki": "php-1.30.0-wmf.14",
"adywiki": "php-1.30.0-wmf.13",
"afwiki": "php-1.30.0-wmf.13",
-"afwikibooks": "php-1.30.0-wmf.13",
-"afwikiquote": "php-1.30.0-wmf.13",
-"afwiktionary": "php-1.30.0-wmf.13",
+"afwikibooks": "php-1.30.0-wmf.14",
+"afwikiquote": "php-1.30.0-wmf.14",
+"afwiktionary": "php-1.30.0-wmf.14",
"akwiki": "php-1.30.0-wmf.13",
-"akwikibooks": "php-1.30.0-wmf.13",
-"akwiktionary": "php-1.30.0-wmf.13",
+"akwikibooks": "php-1.30.0-wmf.14",
+"akwiktionary": "php-1.30.0-wmf.14",
"alswiki": "php-1.30.0-wmf.13",
-"alswikibooks": "php-1.30.0-wmf.13",
-"alswikiquote": "php-1.30.0-wmf.13",
-"alswiktionary": "php-1.30.0-wmf.13",
+"alswikibooks": "php-1.30.0-wmf.14",
+"alswikiquote": "php-1.30.0-wmf.14",
+"alswiktionary": "php-1.30.0-wmf.14",
"amwiki": "php-1.30.0-wmf.13",
-"amwikiquote": "php-1.30.0-wmf.13",
-"amwiktionary": "php-1.30.0-wmf.13",
+"amwikiquote": "php-1.30.0-wmf.14",
+"amwiktionary": "php-1.30.0-wmf.14",
"angwiki": "php-1.30.0-wmf.13",
-"angwikibooks": "php-1.30.0-wmf.13",
-"angwikiquote": "php-1.30.0-wmf.13",
-"angwikisource": "php-1.30.0-wmf.13",
-"angwiktionary": "php-1.30.0-wmf.13",
+"angwikibooks": "php-1.30.0-wmf.14",
+"angwikiquote": "php-1.30.0-wmf.14",
+"angwikisource": "php-1.30.0-wmf.14",
+"angwiktionary": "php-1.30.0-wmf.14",
"anwiki": "php-1.30.0-wmf.13",
-"anwiktionary": "php-1.30.0-wmf.13",
+"anwiktionary": "php-1.30.0-wmf.14",
"arbcom_cswiki": "php-1.30.0-wmf.13",
"arbcom_dewiki": "php-1.30.0-wmf.13",
"arbcom_enwiki": "php-1.30.0-wmf.13",
@@ -35,880 +35,880 @@
"arbcom_nlwiki": "php-1.30.0-wmf.13",
"arcwiki": "php-1.30.0-wmf.13",
"arwiki": "php-1.30.0-wmf.13",
-"arwikibooks": "php-1.30.0-wmf.13",
-"arwikimedia": "php-1.30.0-wmf.13",
-"arwikinews": "php-1.30.0-wmf.13",
-"arwikiquote": "php-1.30.0-wmf.13",
-"arwikisource": "php-1.30.0-wmf.13",
-"arwikiversity": "php-1.30.0-wmf.13",
-"arwiktionary": "php-1.30.0-wmf.13",
+"arwikibooks": "php-1.30.0-wmf.14",
+"arwikimedia": "php-1.30.0-wmf.14",
+"arwikinews": "php-1.30.0-wmf.14",
+"arwikiquote": "php-1.30.0-wmf.14",
+"arwikisource": "php-1.30.0-wmf.14",
+"arwikiversity": "php-1.30.0-wmf.14",
+"arwiktionary": "php-1.30.0-wmf.14",
"arzwiki": "php-1.30.0-wmf.13",
"astwiki": "php-1.30.0-wmf.13",
-"astwikibooks": "php-1.30.0-wmf.13",
-"astwikiquote": "php-1.30.0-wmf.13",
-"astwiktionary": "php-1.30.0-wmf.13",
+"astwikibooks": "php-1.30.0-wmf.14",
+"astwikiquote": "php-1.30.0-wmf.14",
+"astwiktionary": "php-1.30.0-wmf.14",
"aswiki": "php-1.30.0-wmf.13",
-"aswikibooks": "php-1.30.0-wmf.13",
-"aswikisource": "php-1.30.0-wmf.13",
-"aswiktionary": "php-1.30.0-wmf.13",
+"aswikibooks": "php-1.30.0-wmf.14",
+"aswikisource": "php-1.30.0-wmf.14",
+"aswiktionary": "php-1.30.0-wmf.14",
"atjwiki": "php-1.30.0-wmf.13",
-"auditcomwiki": "php-1.30.0-wmf.13",
+"auditcomwiki": "php-1.30.0-wmf.14",
"avwiki": "php-1.30.0-wmf.13",
-"avwiktionary": "php-1.30.0-wmf.13",
+"avwiktionary": "php-1.30.0-wmf.14",
"aywiki": "php-1.30.0-wmf.13",
-"aywikibooks": "php-1.30.0-wmf.13",
-"aywiktionary": "php-1.30.0-wmf.13",
+"aywikibooks": "php-1.30.0-wmf.14",
+"aywiktionary": "php-1.30.0-wmf.14",
"azbwiki": "php-1.30.0-wmf.13",
"azwiki": "php-1.30.0-wmf.13",
-"azwikibooks": "php-1.30.0-wmf.13",
-"azwikiquote": "php-1.30.0-wmf.13",
-"azwikisource": "php-1.30.0-wmf.13",
-"azwiktionary": "php-1.30.0-wmf.13",
+"a
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.14]: Avoid lock acquisition errors for multi-title refreshlinks jobs
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372414 ) Change subject: Avoid lock acquisition errors for multi-title refreshlinks jobs .. Avoid lock acquisition errors for multi-title refreshlinks jobs Bug: T173462 Change-Id: I9dab9b4e5c4cae7306dc29bad9e62287d54b2281 --- M includes/jobqueue/jobs/RefreshLinksJob.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/14/372414/1 diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php index 02bb829..0c84a13 100644 --- a/includes/jobqueue/jobs/RefreshLinksJob.php +++ b/includes/jobqueue/jobs/RefreshLinksJob.php @@ -279,6 +279,10 @@ InfoAction::invalidateCache( $title ); + // Commit any writes here in case this method is called in a loop. + // In that case, the scoped lock will fail to be acquired. + $lbFactory->commitAndWaitForReplication( __METHOD__, $ticket ); + return true; } -- To view, visit https://gerrit.wikimedia.org/r/372414 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9dab9b4e5c4cae7306dc29bad9e62287d54b2281 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.14 Gerrit-Owner: Thcipriani Gerrit-Reviewer: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Group1 wikis to wmf.14"
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372193 )
Change subject: Revert "Group1 wikis to wmf.14"
..
Revert "Group1 wikis to wmf.14"
This reverts commit f26fe02a95b090547eae653dc5599805e91a74ed.
This reverts commit 81e286afd4dea83c0192058843f1a16d1d611c5c.
Change-Id: Iaadb1737063e515e3bb0659bd930bf5b9bff0f89
---
M php
M wikiversions.json
2 files changed, 603 insertions(+), 603 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/93/372193/1
diff --git a/php b/php
index 39addf1..a342232 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.14
\ No newline at end of file
+php-1.30.0-wmf.13
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index da944dc..6ae6add 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.13",
-"aawikibooks": "php-1.30.0-wmf.14",
-"aawiktionary": "php-1.30.0-wmf.14",
+"aawikibooks": "php-1.30.0-wmf.13",
+"aawiktionary": "php-1.30.0-wmf.13",
"abwiki": "php-1.30.0-wmf.13",
-"abwiktionary": "php-1.30.0-wmf.14",
+"abwiktionary": "php-1.30.0-wmf.13",
"acewiki": "php-1.30.0-wmf.13",
-"advisorywiki": "php-1.30.0-wmf.14",
+"advisorywiki": "php-1.30.0-wmf.13",
"adywiki": "php-1.30.0-wmf.13",
"afwiki": "php-1.30.0-wmf.13",
-"afwikibooks": "php-1.30.0-wmf.14",
-"afwikiquote": "php-1.30.0-wmf.14",
-"afwiktionary": "php-1.30.0-wmf.14",
+"afwikibooks": "php-1.30.0-wmf.13",
+"afwikiquote": "php-1.30.0-wmf.13",
+"afwiktionary": "php-1.30.0-wmf.13",
"akwiki": "php-1.30.0-wmf.13",
-"akwikibooks": "php-1.30.0-wmf.14",
-"akwiktionary": "php-1.30.0-wmf.14",
+"akwikibooks": "php-1.30.0-wmf.13",
+"akwiktionary": "php-1.30.0-wmf.13",
"alswiki": "php-1.30.0-wmf.13",
-"alswikibooks": "php-1.30.0-wmf.14",
-"alswikiquote": "php-1.30.0-wmf.14",
-"alswiktionary": "php-1.30.0-wmf.14",
+"alswikibooks": "php-1.30.0-wmf.13",
+"alswikiquote": "php-1.30.0-wmf.13",
+"alswiktionary": "php-1.30.0-wmf.13",
"amwiki": "php-1.30.0-wmf.13",
-"amwikiquote": "php-1.30.0-wmf.14",
-"amwiktionary": "php-1.30.0-wmf.14",
+"amwikiquote": "php-1.30.0-wmf.13",
+"amwiktionary": "php-1.30.0-wmf.13",
"angwiki": "php-1.30.0-wmf.13",
-"angwikibooks": "php-1.30.0-wmf.14",
-"angwikiquote": "php-1.30.0-wmf.14",
-"angwikisource": "php-1.30.0-wmf.14",
-"angwiktionary": "php-1.30.0-wmf.14",
+"angwikibooks": "php-1.30.0-wmf.13",
+"angwikiquote": "php-1.30.0-wmf.13",
+"angwikisource": "php-1.30.0-wmf.13",
+"angwiktionary": "php-1.30.0-wmf.13",
"anwiki": "php-1.30.0-wmf.13",
-"anwiktionary": "php-1.30.0-wmf.14",
+"anwiktionary": "php-1.30.0-wmf.13",
"arbcom_cswiki": "php-1.30.0-wmf.13",
"arbcom_dewiki": "php-1.30.0-wmf.13",
"arbcom_enwiki": "php-1.30.0-wmf.13",
@@ -35,880 +35,880 @@
"arbcom_nlwiki": "php-1.30.0-wmf.13",
"arcwiki": "php-1.30.0-wmf.13",
"arwiki": "php-1.30.0-wmf.13",
-"arwikibooks": "php-1.30.0-wmf.14",
-"arwikimedia": "php-1.30.0-wmf.14",
-"arwikinews": "php-1.30.0-wmf.14",
-"arwikiquote": "php-1.30.0-wmf.14",
-"arwikisource": "php-1.30.0-wmf.14",
-"arwikiversity": "php-1.30.0-wmf.14",
-"arwiktionary": "php-1.30.0-wmf.14",
+"arwikibooks": "php-1.30.0-wmf.13",
+"arwikimedia": "php-1.30.0-wmf.13",
+"arwikinews": "php-1.30.0-wmf.13",
+"arwikiquote": "php-1.30.0-wmf.13",
+"arwikisource": "php-1.30.0-wmf.13",
+"arwikiversity": "php-1.30.0-wmf.13",
+"arwiktionary": "php-1.30.0-wmf.13",
"arzwiki": "php-1.30.0-wmf.13",
"astwiki": "php-1.30.0-wmf.13",
-"astwikibooks": "php-1.30.0-wmf.14",
-"astwikiquote": "php-1.30.0-wmf.14",
-"astwiktionary": "php-1.30.0-wmf.14",
+"astwikibooks": "php-1.30.0-wmf.13",
+"astwikiquote": "php-1.30.0-wmf.13",
+"astwiktionary": "php-1.30.0-wmf.13",
"aswiki": "php-1.30.0-wmf.13",
-"aswikibooks": "php-1.30.0-wmf.14",
-"aswikisource": "php-1.30.0-wmf.14",
-"aswiktionary": "php-1.30.0-wmf.14",
+"aswikibooks": "php-1.30.0-wmf.13",
+"aswikisource": "php-1.30.0-wmf.13",
+"aswiktionary": "php-1.30.0-wmf.13",
"atjwiki": "php-1.30.0-wmf.13",
-"auditcomwiki": "php-1.30.0-wmf.14",
+"auditcomwiki": "php-1.30.0-wmf.13",
"avwiki": "php-1.30.0-wmf.13",
-"avwiktionary": "php-1.30.0-wmf.14",
+"avwiktionary": "php-1.30.0-wmf.13",
"aywiki": "php-1.30.0-wmf.13",
-"aywikibooks": "php-1.30.0-wmf.14",
-"aywiktionary": "php-1.30.0-wmf.14",
+"aywikibooks": "php-1.30.0-wmf.13",
+"aywiktionary": "php-1.30.0-wmf.13",
"azbwiki": "php-1.30.0-wmf.13",
"azwiki": "php-1.30.0-wmf.13",
-"azwikibooks": "php-1.30.0-wmf.14",
-"azwikiquote": "php-1.30.0-wmf.14",
-"azwikisource": "php-1.30.0-wmf.14",
-
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group1 wikis to wmf.14
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372178 )
Change subject: Group1 wikis to wmf.14
..
Group1 wikis to wmf.14
Change-Id: I38596943ca88df433a92a22f5907626321eecd88
---
M wikiversions.json
1 file changed, 602 insertions(+), 602 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/78/372178/1
diff --git a/wikiversions.json b/wikiversions.json
index a9dfbc9..da944dc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.13",
-"aawikibooks": "php-1.30.0-wmf.13",
-"aawiktionary": "php-1.30.0-wmf.13",
+"aawikibooks": "php-1.30.0-wmf.14",
+"aawiktionary": "php-1.30.0-wmf.14",
"abwiki": "php-1.30.0-wmf.13",
-"abwiktionary": "php-1.30.0-wmf.13",
+"abwiktionary": "php-1.30.0-wmf.14",
"acewiki": "php-1.30.0-wmf.13",
-"advisorywiki": "php-1.30.0-wmf.13",
+"advisorywiki": "php-1.30.0-wmf.14",
"adywiki": "php-1.30.0-wmf.13",
"afwiki": "php-1.30.0-wmf.13",
-"afwikibooks": "php-1.30.0-wmf.13",
-"afwikiquote": "php-1.30.0-wmf.13",
-"afwiktionary": "php-1.30.0-wmf.13",
+"afwikibooks": "php-1.30.0-wmf.14",
+"afwikiquote": "php-1.30.0-wmf.14",
+"afwiktionary": "php-1.30.0-wmf.14",
"akwiki": "php-1.30.0-wmf.13",
-"akwikibooks": "php-1.30.0-wmf.13",
-"akwiktionary": "php-1.30.0-wmf.13",
+"akwikibooks": "php-1.30.0-wmf.14",
+"akwiktionary": "php-1.30.0-wmf.14",
"alswiki": "php-1.30.0-wmf.13",
-"alswikibooks": "php-1.30.0-wmf.13",
-"alswikiquote": "php-1.30.0-wmf.13",
-"alswiktionary": "php-1.30.0-wmf.13",
+"alswikibooks": "php-1.30.0-wmf.14",
+"alswikiquote": "php-1.30.0-wmf.14",
+"alswiktionary": "php-1.30.0-wmf.14",
"amwiki": "php-1.30.0-wmf.13",
-"amwikiquote": "php-1.30.0-wmf.13",
-"amwiktionary": "php-1.30.0-wmf.13",
+"amwikiquote": "php-1.30.0-wmf.14",
+"amwiktionary": "php-1.30.0-wmf.14",
"angwiki": "php-1.30.0-wmf.13",
-"angwikibooks": "php-1.30.0-wmf.13",
-"angwikiquote": "php-1.30.0-wmf.13",
-"angwikisource": "php-1.30.0-wmf.13",
-"angwiktionary": "php-1.30.0-wmf.13",
+"angwikibooks": "php-1.30.0-wmf.14",
+"angwikiquote": "php-1.30.0-wmf.14",
+"angwikisource": "php-1.30.0-wmf.14",
+"angwiktionary": "php-1.30.0-wmf.14",
"anwiki": "php-1.30.0-wmf.13",
-"anwiktionary": "php-1.30.0-wmf.13",
+"anwiktionary": "php-1.30.0-wmf.14",
"arbcom_cswiki": "php-1.30.0-wmf.13",
"arbcom_dewiki": "php-1.30.0-wmf.13",
"arbcom_enwiki": "php-1.30.0-wmf.13",
@@ -35,880 +35,880 @@
"arbcom_nlwiki": "php-1.30.0-wmf.13",
"arcwiki": "php-1.30.0-wmf.13",
"arwiki": "php-1.30.0-wmf.13",
-"arwikibooks": "php-1.30.0-wmf.13",
-"arwikimedia": "php-1.30.0-wmf.13",
-"arwikinews": "php-1.30.0-wmf.13",
-"arwikiquote": "php-1.30.0-wmf.13",
-"arwikisource": "php-1.30.0-wmf.13",
-"arwikiversity": "php-1.30.0-wmf.13",
-"arwiktionary": "php-1.30.0-wmf.13",
+"arwikibooks": "php-1.30.0-wmf.14",
+"arwikimedia": "php-1.30.0-wmf.14",
+"arwikinews": "php-1.30.0-wmf.14",
+"arwikiquote": "php-1.30.0-wmf.14",
+"arwikisource": "php-1.30.0-wmf.14",
+"arwikiversity": "php-1.30.0-wmf.14",
+"arwiktionary": "php-1.30.0-wmf.14",
"arzwiki": "php-1.30.0-wmf.13",
"astwiki": "php-1.30.0-wmf.13",
-"astwikibooks": "php-1.30.0-wmf.13",
-"astwikiquote": "php-1.30.0-wmf.13",
-"astwiktionary": "php-1.30.0-wmf.13",
+"astwikibooks": "php-1.30.0-wmf.14",
+"astwikiquote": "php-1.30.0-wmf.14",
+"astwiktionary": "php-1.30.0-wmf.14",
"aswiki": "php-1.30.0-wmf.13",
-"aswikibooks": "php-1.30.0-wmf.13",
-"aswikisource": "php-1.30.0-wmf.13",
-"aswiktionary": "php-1.30.0-wmf.13",
+"aswikibooks": "php-1.30.0-wmf.14",
+"aswikisource": "php-1.30.0-wmf.14",
+"aswiktionary": "php-1.30.0-wmf.14",
"atjwiki": "php-1.30.0-wmf.13",
-"auditcomwiki": "php-1.30.0-wmf.13",
+"auditcomwiki": "php-1.30.0-wmf.14",
"avwiki": "php-1.30.0-wmf.13",
-"avwiktionary": "php-1.30.0-wmf.13",
+"avwiktionary": "php-1.30.0-wmf.14",
"aywiki": "php-1.30.0-wmf.13",
-"aywikibooks": "php-1.30.0-wmf.13",
-"aywiktionary": "php-1.30.0-wmf.13",
+"aywikibooks": "php-1.30.0-wmf.14",
+"aywiktionary": "php-1.30.0-wmf.14",
"azbwiki": "php-1.30.0-wmf.13",
"azwiki": "php-1.30.0-wmf.13",
-"azwikibooks": "php-1.30.0-wmf.13",
-"azwikiquote": "php-1.30.0-wmf.13",
-"azwikisource": "php-1.30.0-wmf.13",
-"azwiktionary": "php-1.30.0-wmf.13",
+"azwikibooks": "php-1.30.0-wmf.14",
+"azwikiquote": "php-1.30.0-wmf.14",
+"azwikisource": "php-1.30.0-wmf.14",
+"azwiktionary": "php-1.30.0-wmf.14",
"barwiki": "php-1.30.0-wmf.13",
"bat_smgwiki": "php-1.30.0-wmf.13",
"bawiki": "php-1.30.0-wmf.13",
-"bawiki
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.13
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372177 ) Change subject: group1 wikis to 1.30.0-wmf.13 .. group1 wikis to 1.30.0-wmf.13 Change-Id: Ia844a75d4cdbedadb681889b08e0a9c0d9e859a9 --- M php M wikiversions.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/77/372177/1 diff --git a/php b/php index a342232..39addf1 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.30.0-wmf.13 \ No newline at end of file +php-1.30.0-wmf.14 \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index 6ae6add..a9dfbc9 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -857,7 +857,7 @@ "wawiktionary": "php-1.30.0-wmf.13", "wbwikimedia": "php-1.30.0-wmf.13", "wg_enwiki": "php-1.30.0-wmf.13", -"wikidatawiki": "php-1.30.0-wmf.11", +"wikidatawiki": "php-1.30.0-wmf.13", "wikimania2005wiki": "php-1.30.0-wmf.13", "wikimania2006wiki": "php-1.30.0-wmf.13", "wikimania2007wiki": "php-1.30.0-wmf.13", -- To view, visit https://gerrit.wikimedia.org/r/372177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia844a75d4cdbedadb681889b08e0a9c0d9e859a9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Thcipriani Gerrit-Reviewer: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.13]: Disable cirrus MLR ab test
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372169 )
Change subject: Disable cirrus MLR ab test
..
Disable cirrus MLR ab test
Bug: T171214
Change-Id: Iee8ba571885f80636bb2a0cd155f6aadaa34a659
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/69/372169/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 6d16eed..fcf85bc 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,12 +113,7 @@
function initialize( session ) {
var sessionId = session.get( 'sessionId' ),
- // LTR sub test
- // Test is running on enwiki only, which
reports ~14k sessions per day
- // at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
- // per day. Those 56k sessions will be split
15k to dashboards, and
- // 7k per bucket, for ~50k per bucket in a week.
- validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
+ validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -140,8 +135,8 @@
subTest: null
},
enwiki: {
- test: 500,
- subTest: 0.75
+ test: 2000,
+ subTest: null
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee8ba571885f80636bb2a0cd155f6aadaa34a659
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.13
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.14]: Disable cirrus MLR ab test
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372170 )
Change subject: Disable cirrus MLR ab test
..
Disable cirrus MLR ab test
Bug: T171214
Change-Id: Iee8ba571885f80636bb2a0cd155f6aadaa34a659
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/70/372170/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 6d16eed..fcf85bc 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,12 +113,7 @@
function initialize( session ) {
var sessionId = session.get( 'sessionId' ),
- // LTR sub test
- // Test is running on enwiki only, which
reports ~14k sessions per day
- // at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
- // per day. Those 56k sessions will be split
15k to dashboards, and
- // 7k per bucket, for ~50k per bucket in a week.
- validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
+ validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -140,8 +135,8 @@
subTest: null
},
enwiki: {
- test: 500,
- subTest: 0.75
+ test: 2000,
+ subTest: null
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee8ba571885f80636bb2a0cd155f6aadaa34a659
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "JobQueueEventBus: Enable on group1 wikis"
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370862 ) Change subject: Revert "JobQueueEventBus: Enable on group1 wikis" .. Revert "JobQueueEventBus: Enable on group1 wikis" This reverts commit fe24c855ba9a9152b654d9bc24027200d0620a97. Bug: T163380 Change-Id: I5ad59f9c76497b4ac261a7f9833bbfe9ca403591 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/62/370862/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d9eb72c..fab2d9d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19195,11 +19195,10 @@ 'wmgDebugJobQueueEventBus' => [ 'default' => false, - 'mediawikiwiki' => true, - 'test2wiki' => true, 'testwiki' => true, + 'test2wiki' => true, 'testwikidatawiki' => true, - 'group1' => true, + 'mediawikiwiki' => true, ], 'wmgUseCapiunto' => [ -- To view, visit https://gerrit.wikimedia.org/r/370862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ad59f9c76497b4ac261a7f9833bbfe9ca403591 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove mediawiki-extension-* assert-no-mediawiki-errors
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370691 ) Change subject: Remove mediawiki-extension-* assert-no-mediawiki-errors .. Remove mediawiki-extension-* assert-no-mediawiki-errors This removes the assert-no-mediawiki-errors builder from: mediawiki-extensions-hhvm-jessie mediawiki-extensions-php55-trusty mediawiki-extensions-php70-jessie mediawiki-extensions-qunit-jessie I have yet to see an extension pass this since deploying. Partial revert of Ic8e06c4581da3441d4a5a7262583ed2b4fe7606a Bug: T50002 Change-Id: Ib5535e0c7b544e333c0da7f440f81bff56e18d56 --- M jjb/mediawiki.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/91/370691/1 diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 150706c..ae24e87 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -242,7 +242,6 @@ - composer-test-mwextension - mw-fetch-composer-dev - mw-run-phpunit-allexts - - assert-no-mediawiki-errors publishers: - junit: results: 'log/junit*.xml' -- To view, visit https://gerrit.wikimedia.org/r/370691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5535e0c7b544e333c0da7f440f81bff56e18d56 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
