[MediaWiki-commits] [Gerrit] fundraising: remove nrpe from role - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129636
Change subject: fundraising: remove nrpe from role
..
fundraising: remove nrpe from role
nrpe is now in base see https://gerrit.wikimedia.org/r/#/c/124576/
This means since the host already has nrpe via base there is no need to include
it again
Change-Id: I757decbde9bbe5300418e3e7352c7a4b9a923362
---
M manifests/role/fundraising.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/129636/1
diff --git a/manifests/role/fundraising.pp b/manifests/role/fundraising.pp
index 844416a..f7e34dc 100644
--- a/manifests/role/fundraising.pp
+++ b/manifests/role/fundraising.pp
@@ -29,7 +29,6 @@
include misc::fundraising
include misc::fundraising::backup::backupmover_user
include misc::fundraising::mail
-include nrpe
monitor_service { 'smtp':
description = 'Exim SMTP',
--
To view, visit https://gerrit.wikimedia.org/r/129636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I757decbde9bbe5300418e3e7352c7a4b9a923362
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] poolcounter: remove nrpe from role - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129637
Change subject: poolcounter: remove nrpe from role
..
poolcounter: remove nrpe from role
nrpe is now in base see https://gerrit.wikimedia.org/r/#/c/124576/
This means since the host already has nrpe via base there is no need to include
it again
Change-Id: I6ab7f1afeb661e6c765be95b4d5435e47f2ba94d
---
M manifests/role/poolcounter.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/129637/1
diff --git a/manifests/role/poolcounter.pp b/manifests/role/poolcounter.pp
index 5ca6c9e..2c90647 100644
--- a/manifests/role/poolcounter.pp
+++ b/manifests/role/poolcounter.pp
@@ -1,6 +1,5 @@
class role::poolcounter{
include ::poolcounter
-include nrpe
system::role { 'role::poolcounter':
description = 'PoolCounter server',
--
To view, visit https://gerrit.wikimedia.org/r/129637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ab7f1afeb661e6c765be95b4d5435e47f2ba94d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the Developers link in the footer not-'external' - change (mediawiki...WikimediaMessages)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the Developers link in the footer not-'external'
..
Make the Developers link in the footer not-'external'
Linker::makeExternalLink() adds class=external to the link, which
results in an itty-bitty arrow being rendered next to it on Vector.
We do not want that.
Also don't pass the contents of the 'wikimedia-developers' message
through Title::newFromText()-__toString(), no idea why that was done.
Change-Id: Id650073e7e0a3ca1800c8a4398321750413e0db8
---
M WikimediaMessages.php
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.php b/WikimediaMessages.php
index d47a74d..855b3e3 100644
--- a/WikimediaMessages.php
+++ b/WikimediaMessages.php
@@ -100,11 +100,12 @@
* @return bool
*/
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = function( $skin, $template
) {
- // Use the value of MediaWiki:Wikimedia-developers
- $title = Title::newFromText( $skin-msg( 'wikimedia-developers'
)-text() );
- // Use the value of MediaWiki:Wikimedia-developers-url
$destination = Skin::makeInternalOrExternalUrl( $skin-msg(
'wikimedia-developers-url' )-inContentLanguage()-text() );
- $link = Linker::makeExternalLink( $destination, $title );
+ $link = Html::element(
+ 'a',
+ array( 'href' = $destination ),
+ $skin-msg( 'wikimedia-developers' )-text()
+ );
$template-set( 'developers', $link );
$template-data['footerlinks']['places'][] = 'developers';
return true;
--
To view, visit https://gerrit.wikimedia.org/r/127437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id650073e7e0a3ca1800c8a4398321750413e0db8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Liangent liang...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] otrs: remove nrpe from role - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129638
Change subject: otrs: remove nrpe from role
..
otrs: remove nrpe from role
nrpe is now in base see https://gerrit.wikimedia.org/r/#/c/124576/
This means since the host already has nrpe via base there is no need to include
it again
Change-Id: Ib596a84c35c8ee4058603cd1b8783baa7eb4bb11
---
M manifests/role/otrs.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/129638/1
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 9e1a18c..a22efe4 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -8,7 +8,6 @@
include standard-noexim
include webserver::apache
-include nrpe
include network::constants
generic::systemuser { 'otrs':
--
To view, visit https://gerrit.wikimedia.org/r/129638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib596a84c35c8ee4058603cd1b8783baa7eb4bb11
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Language::parseFormattedNumber for lzh and zh-classical - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix Language::parseFormattedNumber for lzh and zh-classical
..
Fix Language::parseFormattedNumber for lzh and zh-classical
When parsing, filter any array values that are empty string
before using strtr php function so that strtr can handle
the array.
Bug: 64347
Change-Id: I94761caa70d44febfa0999c91048a01044fc1fbe
---
M languages/Language.php
M tests/phpunit/languages/LanguageTest.php
2 files changed, 28 insertions(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/Language.php b/languages/Language.php
index c635ebb..95bd31e 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3130,14 +3130,18 @@
* @param string $number
* @return string
*/
- function parseFormattedNumber( $number ) {
+ public function parseFormattedNumber( $number ) {
$s = $this-digitTransformTable();
if ( $s ) {
+ // eliminate empty array values such as ''. (bug 64347)
+ $s = array_filter( $s );
$number = strtr( $number, array_flip( $s ) );
}
$s = $this-separatorTransformTable();
if ( $s ) {
+ // eliminate empty array values such as ''. (bug 64347)
+ $s = array_filter( $s );
$number = strtr( $number, array_flip( $s ) );
}
diff --git a/tests/phpunit/languages/LanguageTest.php
b/tests/phpunit/languages/LanguageTest.php
index 13d84f7..ed89159 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1473,6 +1473,29 @@
}
/**
+* @dataProvider parseFormattedNumberProvider
+*/
+ public function testParseFormattedNumber( $langCode, $number ) {
+ $lang = Language::factory( $langCode );
+
+ $localisedNum = $lang-formatNum( $number );
+ $normalisedNum = $lang-parseFormattedNumber( $localisedNum );
+
+ $this-assertEquals( $number, $normalisedNum );
+ }
+
+ public function parseFormattedNumberProvider() {
+ return array(
+ array( 'de', 377.01 ),
+ array( 'fa', 334 ),
+ array( 'fa', 382.772 ),
+ array( 'ar', 1844 ),
+ array( 'lzh', 3731 ),
+ array( 'zh-classical', 7432 )
+ );
+ }
+
+ /**
* @covers Language::commafy()
* @dataProvider provideCommafyData
*/
--
To view, visit https://gerrit.wikimedia.org/r/129369
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94761caa70d44febfa0999c91048a01044fc1fbe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in message key - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129639
Change subject: Fix typo in message key
..
Fix typo in message key
Change-Id: Id67b47e56243ab8b9cc71f6b086746ee01db4da6
Follows-Up: I52fda61d3c633fb207af5361496e3eabe6392598
---
M specials/SpecialCentralAuth.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/39/129639/1
diff --git a/specials/SpecialCentralAuth.php b/specials/SpecialCentralAuth.php
index 26f93bf..db77c81 100644
--- a/specials/SpecialCentralAuth.php
+++ b/specials/SpecialCentralAuth.php
@@ -455,7 +455,7 @@
function formatBlockStatus( $row ) {
if ( isset( $row['blocked'] ) $row['blocked'] ) {
if ( $row['block-expiry'] == 'infinity' ) {
- $text = $this-msg(
'centralauth-admin-blocked-indef2' )-parse();
+ $text = $this-msg(
'centralauth-admin-blocked2-indef' )-parse();
} else {
$expiry = $this-getLanguage()-timeanddate(
$row['block-expiry'], true );
$expiryd = $this-getLanguage()-date(
$row['block-expiry'], true );
--
To view, visit https://gerrit.wikimedia.org/r/129639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id67b47e56243ab8b9cc71f6b086746ee01db4da6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in message key - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129640
Change subject: Fix typo in message key
..
Fix typo in message key
Change-Id: Id67b47e56243ab8b9cc71f6b086746ee01db4da6
Follows-Up: I52fda61d3c633fb207af5361496e3eabe6392598
---
M specials/SpecialCentralAuth.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/40/129640/1
diff --git a/specials/SpecialCentralAuth.php b/specials/SpecialCentralAuth.php
index 26f93bf..db77c81 100644
--- a/specials/SpecialCentralAuth.php
+++ b/specials/SpecialCentralAuth.php
@@ -455,7 +455,7 @@
function formatBlockStatus( $row ) {
if ( isset( $row['blocked'] ) $row['blocked'] ) {
if ( $row['block-expiry'] == 'infinity' ) {
- $text = $this-msg(
'centralauth-admin-blocked-indef2' )-parse();
+ $text = $this-msg(
'centralauth-admin-blocked2-indef' )-parse();
} else {
$expiry = $this-getLanguage()-timeanddate(
$row['block-expiry'], true );
$expiryd = $this-getLanguage()-date(
$row['block-expiry'], true );
--
To view, visit https://gerrit.wikimedia.org/r/129640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id67b47e56243ab8b9cc71f6b086746ee01db4da6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: wmf/1.24wmf2
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] FormatJson: Skip whitespace cleanup when unnecessary - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: FormatJson: Skip whitespace cleanup when unnecessary
..
FormatJson: Skip whitespace cleanup when unnecessary
The patch[1] for PHP bug 66021[2], which removes the same undesirable
whitespace that WS_CLEANUP_REGEX does, has been merged into php-src.
Subsequent PHP versions having the patch shouldn't have to take the
10-20% performance hit from that workaround.
[1]: https://github.com/php/php-src/commit/82a4f1a1a287
[2]: https://bugs.php.net/bug.php?id=66021
Change-Id: I717a0e164952cc6ace104f13f6236e86c4ab8b58
---
M includes/json/FormatJson.php
1 file changed, 10 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 97d98a4..eb5e632 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -136,6 +136,11 @@
* @return string|bool
*/
private static function encode54( $value, $pretty, $escaping ) {
+ static $bug66021;
+ if ( $pretty !== false $bug66021 === null ) {
+ $bug66021 = json_encode( array(), JSON_PRETTY_PRINT )
!== '[]';
+ }
+
// PHP escapes '/' to prevent breaking out of inline script
blocks using '/script',
// which is hardly useful when '' and '' are escaped (and
inadequate), and such
// escaping negatively impacts the human readability of URLs
and similar strings.
@@ -149,9 +154,11 @@
}
if ( $pretty !== false ) {
- // Remove whitespace inside empty arrays/objects;
different JSON encoders
- // vary on this, and we want our output to be
consistent across implementations.
- $json = preg_replace( self::WS_CLEANUP_REGEX, '', $json
);
+ // Workaround for
https://bugs.php.net/bug.php?id=66021
+ // Can be removed once we require PHP = 5.4.28,
5.5.12, 5.6.0
+ if ( $bug66021 ) {
+ $json = preg_replace( self::WS_CLEANUP_REGEX,
'', $json );
+ }
if ( $pretty !== '' ) {
// Change the four-space indent to a tab indent
$json = str_replace( \n, \n\t, $json );
--
To view, visit https://gerrit.wikimedia.org/r/129631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I717a0e164952cc6ace104f13f6236e86c4ab8b58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand pleasest...@live.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in message key - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix typo in message key
..
Fix typo in message key
Change-Id: Id67b47e56243ab8b9cc71f6b086746ee01db4da6
Follows-Up: I52fda61d3c633fb207af5361496e3eabe6392598
---
M specials/SpecialCentralAuth.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/specials/SpecialCentralAuth.php b/specials/SpecialCentralAuth.php
index 26f93bf..db77c81 100644
--- a/specials/SpecialCentralAuth.php
+++ b/specials/SpecialCentralAuth.php
@@ -455,7 +455,7 @@
function formatBlockStatus( $row ) {
if ( isset( $row['blocked'] ) $row['blocked'] ) {
if ( $row['block-expiry'] == 'infinity' ) {
- $text = $this-msg(
'centralauth-admin-blocked-indef2' )-parse();
+ $text = $this-msg(
'centralauth-admin-blocked2-indef' )-parse();
} else {
$expiry = $this-getLanguage()-timeanddate(
$row['block-expiry'], true );
$expiryd = $this-getLanguage()-date(
$row['block-expiry'], true );
--
To view, visit https://gerrit.wikimedia.org/r/129639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id67b47e56243ab8b9cc71f6b086746ee01db4da6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Initial twemproxy configs for labs - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/129641 Change subject: WIP: Initial twemproxy configs for labs .. WIP: Initial twemproxy configs for labs Bug: 62836 Change-Id: Ic9c0ff585a556db263bf1defa7f9445e2d776e9e --- D docroot/noc/conf/noncirrus.dblist A docroot/noc/conf/twemproxy-hhvm-labs.yaml.txt A docroot/noc/conf/twemproxy-labs.yaml.txt M docroot/noc/createTxtFileSymlinks.sh A wmf-config/twemproxy-hhvm-labs.yaml A wmf-config/twemproxy-labs.yaml 6 files changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/41/129641/1 diff --git a/docroot/noc/conf/noncirrus.dblist b/docroot/noc/conf/noncirrus.dblist deleted file mode 12 index ab9ba8d..000 --- a/docroot/noc/conf/noncirrus.dblist +++ /dev/null @@ -1 +0,0 @@ -../../../noncirrus.dblist \ No newline at end of file diff --git a/docroot/noc/conf/twemproxy-hhvm-labs.yaml.txt b/docroot/noc/conf/twemproxy-hhvm-labs.yaml.txt new file mode 12 index 000..2be4fc6 --- /dev/null +++ b/docroot/noc/conf/twemproxy-hhvm-labs.yaml.txt @@ -0,0 +1 @@ +../../../wmf-config/twemproxy-hhvm-labs.yaml \ No newline at end of file diff --git a/docroot/noc/conf/twemproxy-labs.yaml.txt b/docroot/noc/conf/twemproxy-labs.yaml.txt new file mode 12 index 000..86f2738 --- /dev/null +++ b/docroot/noc/conf/twemproxy-labs.yaml.txt @@ -0,0 +1 @@ +../../../wmf-config/twemproxy-labs.yaml \ No newline at end of file diff --git a/docroot/noc/createTxtFileSymlinks.sh b/docroot/noc/createTxtFileSymlinks.sh index 5657b94..8fd6407 100755 --- a/docroot/noc/createTxtFileSymlinks.sh +++ b/docroot/noc/createTxtFileSymlinks.sh @@ -40,6 +40,8 @@ wmf-config/session.php wmf-config/session-labs.php wmf-config/twemproxy-eqiad.yaml + wmf-config/twemproxy-hhvm-labs.yaml + wmf-config/twemproxy-labs.yaml wmf-config/Wikibase.php ) diff --git a/wmf-config/twemproxy-hhvm-labs.yaml b/wmf-config/twemproxy-hhvm-labs.yaml new file mode 100644 index 000..d426540 --- /dev/null +++ b/wmf-config/twemproxy-hhvm-labs.yaml @@ -0,0 +1,14 @@ +memcached: + listen: 127.0.0.1:11211 + hash: md5 + distribution: ketama + timeout: 250 + preconnect: true + redis: false + auto_eject_hosts: true + server_retry_timeout: 3 + server_failure_limit: 3 + server_connections: 2 + servers: + - 10.68.17.69:11211:1 + - 10.68.17.71:11211:1 diff --git a/wmf-config/twemproxy-labs.yaml b/wmf-config/twemproxy-labs.yaml new file mode 100644 index 000..d178e39 --- /dev/null +++ b/wmf-config/twemproxy-labs.yaml @@ -0,0 +1,14 @@ +memcached: + listen: 127.0.0.1:11211 + hash: md5 + distribution: ketama + timeout: 250 + preconnect: true + redis: false + auto_eject_hosts: true + server_retry_timeout: 3 + server_failure_limit: 3 + server_connections: 2 + servers: + - 10.68.16.14:11211:1 + - 10.68.16.15:11211:1 -- To view, visit https://gerrit.wikimedia.org/r/129641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9c0ff585a556db263bf1defa7f9445e2d776e9e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update MWRealm to drop pmtpa - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129642
Change subject: Update MWRealm to drop pmtpa
..
Update MWRealm to drop pmtpa
Change-Id: Ib4e8a64fd97eb2e4557d267bd7d5dfdbe3a22df6
---
M multiversion/MWRealm.php
M multiversion/MWRealm.sh
2 files changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/42/129642/1
diff --git a/multiversion/MWRealm.php b/multiversion/MWRealm.php
index 90c5b4b..58946bc 100644
--- a/multiversion/MWRealm.php
+++ b/multiversion/MWRealm.php
@@ -4,8 +4,7 @@
# location. Thet should be provisioned by puppet in /etc/wikimedia-site and
# /etc/wikimedia-realm.
#
-# The possible values of $wmfRealm and $wmfDatacenter as of February 2014 are:
-# - labs + pmtpa
+# The possible values of $wmfRealm and $wmfDatacenter as of April 2014 are:
# - labs + eqiad
# - production + eqiad
global $wmfDatacenter, $wmfRealm;
@@ -24,7 +23,7 @@
switch( $wmfRealm ) {
case 'labs':
case 'production':
- if ( ! in_array( $wmfDatacenter, array( 'pmtpa', 'eqiad' ) ) ) {
+ if ( ! in_array( $wmfDatacenter, array( 'eqiad' ) ) ) {
$wmfDatacenter = 'eqiad';
}
break;
@@ -41,7 +40,6 @@
function listAllRealmsAndDatacenters() {
return array(
array( 'production', 'eqiad' ),
- array( 'labs', 'pmtpa' ),
array( 'labs', 'eqiad' ),
);
}
diff --git a/multiversion/MWRealm.sh b/multiversion/MWRealm.sh
index 308bfbe..7f8ca13 100644
--- a/multiversion/MWRealm.sh
+++ b/multiversion/MWRealm.sh
@@ -16,10 +16,10 @@
case $WMF_REALM in
production|labs)
case $WMF_DATACENTER in
- pmtpa|eqiad)
+ eqiad)
;;
*)
- WMF_DATACENTER=pmtpa
+ WMF_DATACENTER=eqiad
;;
esac
;;
@@ -27,7 +27,7 @@
*)
# Assume something vaguely resembling a default
WMF_REALM=production
- WMF_DATACENTER=pmtpa
+ WMF_DATACENTER=eqiad
;;
esac
--
To view, visit https://gerrit.wikimedia.org/r/129642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4e8a64fd97eb2e4557d267bd7d5dfdbe3a22df6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Variable twemproxy config location - change (operations/puppet)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129644
Change subject: Variable twemproxy config location
..
Variable twemproxy config location
Bug: 62836
Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/129644/1
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index bf13fc1..a065708 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,9 +13,12 @@
respawn limit 5 5
pre-start script
-[ -f /etc/wikimedia-site ] || { stop; exit 0; }
-[ -f /usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site).yaml ] || { stop; exit 0; }
+[ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
+./usr/local/lib/mw-deployment-vars.sh
+[ -f $MW_COMMON_SOURCE/multiversion/MWRealm.sh ] || { stop; exit 0; }
+env config = `getRealmSpecificFilename
$MW_COMMON_SOURCE/wmf-config/twemproxy.yaml`
+[ -f /usr/local/apache/common/wmf-config/$config ] || { stop; exit
0; }
end script
-exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/twemproxy-$(cat /etc/wikimedia-site).yaml
+exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/$config
--
To view, visit https://gerrit.wikimedia.org/r/129644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for crash if no login token retrieved. - change (apps...wikipedia)
Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129643
Change subject: Fix for crash if no login token retrieved.
..
Fix for crash if no login token retrieved.
Change-Id: I63cd6b0910ab6d114abc5e061cac198a75d31110
---
M wikipedia/View Controllers/Login/LoginViewController.m
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/43/129643/1
diff --git a/wikipedia/View Controllers/Login/LoginViewController.m
b/wikipedia/View Controllers/Login/LoginViewController.m
index 4be9318..7003904 100644
--- a/wikipedia/View Controllers/Login/LoginViewController.m
+++ b/wikipedia/View Controllers/Login/LoginViewController.m
@@ -263,9 +263,10 @@
NSLog(@loginTokenOp token = %@,
tokenRetrieved);
loginOp.token = tokenRetrieved;
- [self logEvent: @{@loginSessionToken:
tokenRetrieved}
- schema: LOG_SCHEMA_LOGIN];
-
+ if (tokenRetrieved) {
+ [self logEvent: @{@loginSessionToken:
tokenRetrieved}
+ schema: LOG_SCHEMA_LOGIN];
+ }
} cancelledBlock: ^(NSError *error){
[self showAlert:@];
--
To view, visit https://gerrit.wikimedia.org/r/129643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63cd6b0910ab6d114abc5e061cac198a75d31110
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop version parameter entirely - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Drop version parameter entirely
..
Drop version parameter entirely
For SauceLabs jobs we have to specify the browser version. Since for
each browser we only care about a specific version (and thus have only
one job), there is no need to generate multiple jobs.
Instead of using a version parameter, set VERSION depending on the value
of BROWSER.
UNTESTED!
Change-Id: I50680e0dec2851455eaa3147fb2e8fa4d3c31dd9
---
M job_template.yaml
M jobs.yaml
M macro.yaml
3 files changed, 32 insertions(+), 27 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/job_template.yaml b/job_template.yaml
index 2eee2cf..db8c9bb 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -29,7 +29,6 @@
mediawiki_url: '{mediawiki_url}'
mediawiki_user: '{mediawiki_user}'
platform: '{platform}'
- version: '{version}'
publishers:
- junit:
@@ -112,7 +111,6 @@
browser: '{browser}'
folder: '{folder}'
platform: '{platform}'
- version: '{version}'
- builder:
name: VisualEditor
@@ -122,7 +120,22 @@
export BROWSER={browser}
export HEADLESS=true
export PLATFORM='{platform}'
- export VERSION={version}
+
+ # We only care about one version of our browser and do not need a job
+ # per version. Thus the versions to use are hardcoded there.
+ #
+ # VERSION is used for SauceLabs
+ #
+ case $BROWSER in
+'firefox')
+export VERSION=27
+;;
+*)
+echo Browser '$BROWSER' unsupported. Can not determine
version
+exit 1
+;;
+ esac
+ echo Using browser: $BROWSER at version $VERSION
# Shared cache of gems to avoid hitting rubygems all the time
# See https://github.com/bundler/bundler/issues/2856
diff --git a/jobs.yaml b/jobs.yaml
index f5407b4..776c4b9 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -33,7 +33,6 @@
platform: Linux
recipients: *emails-CentralAuth
repository: mediawiki/extensions/CentralAuth
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -52,7 +51,6 @@
platform: Linux
recipients: *emails-CirrusSearch
repository: mediawiki/extensions/CirrusSearch
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -69,7 +67,6 @@
platform: Linux
recipients: *emails-CirrusSearch
repository: mediawiki/extensions/CirrusSearch
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -88,7 +85,6 @@
platform: Linux
recipients: *emails-ULS
repository: mediawiki/extensions/ContentTranslation
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -107,7 +103,6 @@
platform: Linux
recipients: *emails-qa
repository: mediawiki/extensions/Flow
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -124,7 +119,6 @@
platform: Linux
recipients: *emails-qa
repository: mediawiki/extensions/Flow
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -143,7 +137,6 @@
platform: Linux
recipients: *emails-mobile
repository: mediawiki/extensions/MobileFrontend
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -160,7 +153,6 @@
platform: Linux
recipients: *emails-mobile
repository: mediawiki/extensions/MobileFrontend
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -177,7 +169,6 @@
platform: Linux
recipients: *emails-mobile
repository: mediawiki/extensions/MobileFrontend
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -196,7 +187,6 @@
platform: Linux
recipients: *emails-multimedia
repository: mediawiki/extensions/MultimediaViewer
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -215,7 +205,6 @@
platform: Linux
recipients: *emails-i18n
repository: mediawiki/extensions/TwnMainPage
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -234,7 +223,6 @@
platform: Linux
recipients: *emails-i18n
repository: mediawiki/extensions/Translate
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -251,7 +239,6 @@
platform: Linux
recipients: *emails-i18n
repository: mediawiki/extensions/Translate
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -271,7 +258,6 @@
platform: Linux
recipients: *emails-ULS
repository: mediawiki/extensions/UniversalLanguageSelector
-version: 27
jobs:
- 'browsertests-{name}-{browser}'
@@ -288,7 +274,6 @@
platform: Linux
[MediaWiki-commits] [Gerrit] otrs: remove nrpe from role - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: otrs: remove nrpe from role
..
otrs: remove nrpe from role
nrpe is now in base see https://gerrit.wikimedia.org/r/#/c/124576/
This means since the host already has nrpe via base there is no need to include
it again
Change-Id: Ib596a84c35c8ee4058603cd1b8783baa7eb4bb11
---
M manifests/role/otrs.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 9e1a18c..a22efe4 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -8,7 +8,6 @@
include standard-noexim
include webserver::apache
-include nrpe
include network::constants
generic::systemuser { 'otrs':
--
To view, visit https://gerrit.wikimedia.org/r/129638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib596a84c35c8ee4058603cd1b8783baa7eb4bb11
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove noncirrus noc symlink - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/129645 Change subject: Remove noncirrus noc symlink .. Remove noncirrus noc symlink Change-Id: I494fc0a2ad757e05ea7b9d4a6cb32dc42f951514 --- D docroot/noc/conf/noncirrus.dblist 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/45/129645/1 diff --git a/docroot/noc/conf/noncirrus.dblist b/docroot/noc/conf/noncirrus.dblist deleted file mode 12 index ab9ba8d..000 --- a/docroot/noc/conf/noncirrus.dblist +++ /dev/null @@ -1 +0,0 @@ -../../../noncirrus.dblist \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/129645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I494fc0a2ad757e05ea7b9d4a6cb32dc42f951514 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove noncirrus noc symlink - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove noncirrus noc symlink .. Remove noncirrus noc symlink Change-Id: I494fc0a2ad757e05ea7b9d4a6cb32dc42f951514 --- D docroot/noc/conf/noncirrus.dblist 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/noc/conf/noncirrus.dblist b/docroot/noc/conf/noncirrus.dblist deleted file mode 12 index ab9ba8d..000 --- a/docroot/noc/conf/noncirrus.dblist +++ /dev/null @@ -1 +0,0 @@ -../../../noncirrus.dblist \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/129645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I494fc0a2ad757e05ea7b9d4a6cb32dc42f951514 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] poolcounter: remove nrpe from role - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: poolcounter: remove nrpe from role
..
poolcounter: remove nrpe from role
nrpe is now in base see https://gerrit.wikimedia.org/r/#/c/124576/
This means since the host already has nrpe via base there is no need to include
it again
Change-Id: I6ab7f1afeb661e6c765be95b4d5435e47f2ba94d
---
M manifests/role/poolcounter.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/poolcounter.pp b/manifests/role/poolcounter.pp
index 5ca6c9e..2c90647 100644
--- a/manifests/role/poolcounter.pp
+++ b/manifests/role/poolcounter.pp
@@ -1,6 +1,5 @@
class role::poolcounter{
include ::poolcounter
-include nrpe
system::role { 'role::poolcounter':
description = 'PoolCounter server',
--
To view, visit https://gerrit.wikimedia.org/r/129637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ab7f1afeb661e6c765be95b4d5435e47f2ba94d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fundraising: remove nrpe from role - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: fundraising: remove nrpe from role
..
fundraising: remove nrpe from role
nrpe is now in base see https://gerrit.wikimedia.org/r/#/c/124576/
This means since the host already has nrpe via base there is no need to include
it again
Change-Id: I757decbde9bbe5300418e3e7352c7a4b9a923362
---
M manifests/role/fundraising.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/fundraising.pp b/manifests/role/fundraising.pp
index 844416a..f7e34dc 100644
--- a/manifests/role/fundraising.pp
+++ b/manifests/role/fundraising.pp
@@ -29,7 +29,6 @@
include misc::fundraising
include misc::fundraising::backup::backupmover_user
include misc::fundraising::mail
-include nrpe
monitor_service { 'smtp':
description = 'Exim SMTP',
--
To view, visit https://gerrit.wikimedia.org/r/129636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I757decbde9bbe5300418e3e7352c7a4b9a923362
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add comments to map memcached ips to hostnames - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/129646 Change subject: Add comments to map memcached ips to hostnames .. Add comments to map memcached ips to hostnames Change-Id: I4a68dc8321b7b302f5e89b5adafcff096f2ac35b --- M wmf-config/mc.php M wmf-config/twemproxy-eqiad.yaml 2 files changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/46/129646/1 diff --git a/wmf-config/mc.php b/wmf-config/mc.php index 8f4e2af..55e0db5 100644 --- a/wmf-config/mc.php +++ b/wmf-config/mc.php @@ -28,22 +28,22 @@ 'class' = 'MemcachedPeclBagOStuff', 'serializer' = 'php', 'servers'= array( - '10.64.0.180', - '10.64.0.181', - '10.64.0.182', - '10.64.0.183', - '10.64.0.184', - '10.64.0.185', - '10.64.0.186', - '10.64.0.187', - '10.64.0.188', - '10.64.0.189', - '10.64.0.190', - '10.64.0.191', - '10.64.0.192', - '10.64.0.193', - '10.64.0.194', - '10.64.0.195', + '10.64.0.180', # mc1001 + '10.64.0.181', # mc1002 + '10.64.0.182', # mc1003 + '10.64.0.183', # mc1004 + '10.64.0.184', # mc1005 + '10.64.0.185', # mc1006 + '10.64.0.186', # mc1007 + '10.64.0.187', # mc1008 + '10.64.0.188', # mc1009 + '10.64.0.189', # mc1010 + '10.64.0.190', # mc1011 + '10.64.0.191', # mc1012 + '10.64.0.192', # mc1013 + '10.64.0.193', # mc1014 + '10.64.0.194', # mc1015 + '10.64.0.195', # mc1015 ) ); ***/ diff --git a/wmf-config/twemproxy-eqiad.yaml b/wmf-config/twemproxy-eqiad.yaml index 29e3ef1..8a7f02a 100644 --- a/wmf-config/twemproxy-eqiad.yaml +++ b/wmf-config/twemproxy-eqiad.yaml @@ -10,19 +10,19 @@ server_failure_limit: 3 server_connections: 2 servers: - - 10.64.0.180:11211:1 - - 10.64.0.181:11211:1 - - 10.64.0.182:11211:1 - - 10.64.0.183:11211:1 - - 10.64.0.184:11211:1 - - 10.64.0.185:11211:1 - - 10.64.0.186:11211:1 - - 10.64.0.187:11211:1 - - 10.64.0.188:11211:1 - - 10.64.0.189:11211:1 - - 10.64.0.190:11211:1 - - 10.64.0.191:11211:1 - - 10.64.0.192:11211:1 - - 10.64.0.193:11211:1 - - 10.64.0.194:11211:1 - - 10.64.0.195:11211:1 + - 10.64.0.180:11211:1 # mc1001 + - 10.64.0.181:11211:1 # mc1002 + - 10.64.0.182:11211:1 # mc1003 + - 10.64.0.183:11211:1 # mc1004 + - 10.64.0.184:11211:1 # mc1005 + - 10.64.0.185:11211:1 # mc1006 + - 10.64.0.186:11211:1 # mc1007 + - 10.64.0.187:11211:1 # mc1008 + - 10.64.0.188:11211:1 # mc1009 + - 10.64.0.189:11211:1 # mc1010 + - 10.64.0.190:11211:1 # mc1011 + - 10.64.0.191:11211:1 # mc1012 + - 10.64.0.192:11211:1 # mc1013 + - 10.64.0.193:11211:1 # mc1014 + - 10.64.0.194:11211:1 # mc1015 + - 10.64.0.195:11211:1 # mc1016 -- To view, visit https://gerrit.wikimedia.org/r/129646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a68dc8321b7b302f5e89b5adafcff096f2ac35b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove tampa.tech.wikimedia.org - change (operations/dns)
Dzahn has submitted this change and it was merged. Change subject: remove tampa.tech.wikimedia.org .. remove tampa.tech.wikimedia.org this was once This is the laptop IP for our on site tech Change-Id: If2cf6ef8c1c3cf27edc03071c5db195777c69adb --- M templates/152.80.208.in-addr.arpa M templates/wikimedia.org 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: Cmjohnson: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index 5f81a91..0d9f74a 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -36,7 +36,6 @@ 1361H IN PTR mexia.wikimedia.org. 1371H IN PTR torrus.wikimedia.org. -1391H IN PTR tampa.tech.wikimedia.org. 1411H IN PTR wireless.tech.wikimedia.org. 1431H IN PTR url-downloader.wikimedia.org. 1441H IN PTR ae0-101.cr1-sdtpa.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 224c92c..e3845e2 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -652,8 +652,6 @@ ; Misc -tampa.tech 1H IN A208.80.152.139 - ; Google apps googlef3fe6c2a164e9650 1H IN CNAMEgoogle.com. -- To view, visit https://gerrit.wikimedia.org/r/129383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2cf6ef8c1c3cf27edc03071c5db195777c69adb Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] decom the decom script - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: decom the decom script .. decom the decom script https://wikitech.wikimedia.org/wiki/Server_Lifecycle says: Inclusion in decommissioning.pp removes the host from puppet's storedconfig, but with a delay of several hours to a day, and not always reliably, so we don't rely on that mechanism any more. that is why we have stopped using it since quite a while instead we just use puppetstoredconfigclean.rb manually on the puppetmaster to decom so this is not in sync at all anyways, and we should just remove it for being called unreliable, having that delay and not containing valid info anymore. to check what has _not_ been decom'ed yet in Tampa, check dsh groups instead Change-Id: I76c59c5f23647c756ad7a5d06ff2b6ed74804b37 --- D manifests/decommissioning.pp M manifests/nagios.pp M manifests/site.pp M modules/puppetmaster/manifests/scripts.pp D modules/puppetmaster/templates/decom_servers.sh.erb 5 files changed, 0 insertions(+), 180 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp deleted file mode 100644 index 0c768d8..000 --- a/manifests/decommissioning.pp +++ /dev/null @@ -1,146 +0,0 @@ -# decomissioning.pp - -# ALPHABETIC order! - -$decommissioned_servers = [ -'analytics1001', #renamed virt1001 -'analytics1002', #renamed virt1002 -'analytics1005', #renamed virt1003 -'analytics1006', #renamed virt1008 -'analytics1008', #renamed virt1009 -'arsenic', -'br1-knams', -'controller', -'cp1021',# cp 1021-1042 were reclaimed, 5981 -'cp1022', -'cp1023', -'cp1024', -'cp1025', -'cp1026', -'cp1027', -'cp1028', -'cp1029', -'cp1030', -'cp1031', -'cp1032', -'cp1033', -'cp1034', -'cp1035', -'cp1036', -'cp1041', -'cp1042', -'cp3001', -'cp3002', -'db29', -'db31', -'db32', -'db33', -'db34', -'db36', -'db37', -'db39', -'db42', -'db43', -'db44', -'db45', -'db46', -'db47', -'db49', -'db50', -'db51', -'db52', -'db53', -'db54', -'db55', -'db56', -'db57', -'db58', -'db59', -'emery', -#dysprosium -- add this back later when it is reclaimed -'loudon', #6633 decomed -'ms1', -'ms2',#5994 decommed -'ms3', -'ms4',#885 decommed -'payments1', -'payments2', -'payments3', -'payments4', -'professor', #6269 decommed -'search21', #6106 decommed search21-36 -'search22', -'search23', -'search24', -'search25', -'search26', -'search27', -'search28', -'search29', -'search30', -'search31', -'search32', -'search33', -'search34', -'search35', -'search36', -'stat1', -'sq31', #1706 decommed -'sq32', #2472 decommed -'sq33', #4992 decommed -'sq34', #2823 decommed -'sq35', #1404 decommed -'sq36', #5727 decommed -'sq37', #6520 decommed -'sq38', #2017 decommed -'sq39', #2581 decommed -'sq40', #2581 decommed -'sq41', #5646 decommed -'sq42', #5754 decommed -'sq43', #6520 decommed -'sq44', #6367 decommed -'sq45', #5986 decommed -'sq46', #2581 decommed -'sq47', #1597 decommed -'sq48', #6274 decommed -'sq49', #6520 decommed -'sq50', #6520 decommed -'sq51', #6520 decommed -'sq52', #6520 decommed -'sq53', #6520 decommed -'sq54', #6520 decommed -'sq55', #6520 decommed -'sq56', #6520 decommed -'sq57', #6520 decommed -'sq58', #6520 decommed -'sq59', #6520 decommed -'sq60', #6520 decommed -'sq61', #6520 decommed -'sq62', #6520 decommed -'sq63', #6520 decommed -'sq64', #6520 decommed -'sq65', #6520 decommed -'sq66', #6520 decommed -'sq71', #6520 decommed -'sq72', #6520 decommed -'sq73', #6520 decommed -'sq74', #6520 decommed -'sq75', #6520 decommed -'sq76', #6520 decommed -'sq77', #6520 decommed -'sq78', #6520 decommed -'sq79', #6520 decommed -'sq80', #6520 decommed -'sq81', #6520 decommed -'sq82', #6520 decommed -'sq83', #6520 decommed -'sq84', #6520 decommed -'sq85', #6520 decommed -'sq86', #6520 decommed -'ssl3004', #added 9/17 -'virt1', #5645 decommed -'virt3', -'virt4', -'wikinews-lb.wikimedia.org', -'williams', #5908 decommed -] diff --git a/manifests/nagios.pp b/manifests/nagios.pp index c296840..b5546ab 100644 --- a/manifests/nagios.pp +++ b/manifests/nagios.pp @@ -1,7 +1,6 @@ # nagios.pp import generic-definitions.pp -import decommissioning.pp $nagios_config_dir = '/etc/nagios' diff --git a/manifests/site.pp b/manifests/site.pp index a717c60..6366613 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -7,7 +7,6 @@ import 'admins.pp' import 'backups.pp' import 'certs.pp' -import 'decommissioning.pp' import 'dns.pp' import 'facilities.pp' import 'ganglia.pp' diff --git a/modules/puppetmaster/manifests/scripts.pp b/modules/puppetmaster/manifests/scripts.pp index da75246..3a3f80a 100644 --- a/modules/puppetmaster/manifests/scripts.pp +++ b/modules/puppetmaster/manifests/scripts.pp @@ -19,11 +19,6 @@ group = 'root', mode= '0555', source =
[MediaWiki-commits] [Gerrit] Restore WikiLove job! - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/129647 Change subject: Restore WikiLove job! .. Restore WikiLove job! The ZeroRatedMobileAccess project definition was missing the '- project'. Since it cames just after the WikiLove project definition, the WikiLove job was never generated. Creates job: browsertests-WikiLove-en.wikipedia.beta.wmflabs.org-linux-firefox Change-Id: I337dfcf94c021af65c2194b42a9e3c292549d935 --- M jobs.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/47/129647/1 diff --git a/jobs.yaml b/jobs.yaml index 776c4b9..1e4be9e 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -405,6 +405,7 @@ ## en.m.wikipedia.org +- project: name: en.m.wikipedia.org-linux-phantomjs browser: phantomjs folder: tests -- To view, visit https://gerrit.wikimedia.org/r/129647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I337dfcf94c021af65c2194b42a9e3c292549d935 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove remnants of the old decom script - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129648
Change subject: remove remnants of the old decom script
..
remove remnants of the old decom script
removed the decom script in Change-Id: I76c59c5f23
these now also need to go to avoid
puppet errors
Change-Id: I6532ce51ba6b39b165480b064d702cea29b9614c
---
M manifests/ganglia.pp
M manifests/misc/icinga.pp
M manifests/nagios.pp
M modules/base/manifests/init.pp
4 files changed, 0 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/129648/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 287c019..6430c47 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -30,10 +30,6 @@
cluster = $ganglia_cluster,
}
} else {
-if $::hostname in $::decommissioned_servers {
-$cluster = 'decommissioned'
-$deaf = 'no'
-} else {
if ! $::cluster {
$cluster = 'misc'
}
@@ -45,7 +41,6 @@
} else {
$deaf = 'yes'
}
-}
$authority_url = 'http://ganglia.wikimedia.org'
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index cfa2ae2..6bfb873 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -711,8 +711,6 @@
notify = Service[icinga],
}
-# Decommission servers
-decommission_monitor_host { $::decommissioned_servers: }
}
# NSCA - Nagios Service Check Acceptor
diff --git a/manifests/nagios.pp b/manifests/nagios.pp
index b5546ab..eb2e778 100644
--- a/manifests/nagios.pp
+++ b/manifests/nagios.pp
@@ -78,32 +78,6 @@
fail(Parameter $host not defined!)
}
-if $::hostname in $::decommissioned_servers {
-# Export the nagios service instance
-@@nagios_service { $::hostname $title:
-ensure= 'absent',
-target=
${::nagios_config_dir}/puppet_checks.d/${host}.cfg,
-host_name = $host,
-servicegroups = $group ? {
-/.+/= $group,
-default = undef,
-},
-service_description = $description,
-check_command = $check_command,
-max_check_attempts= $retries,
-normal_check_interval = $normal_check_interval,
-retry_check_interval = $retry_check_interval,
-check_period = '24x7',
-notification_interval = 0,
-notification_period = '24x7',
-notification_options = 'c,r,f',
-contact_groups= $critical ? {
-'true' = 'admins,sms',
-default = $contact_group,
-},
-}
-}
-else {
# Export the nagios service instance
@@nagios_service { $::hostname $title:
ensure = $ensure,
@@ -146,7 +120,6 @@
'true' = $freshness,
default = undef,
},
-}
}
}
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index b6b5c73..323c340 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -321,12 +321,6 @@
}
}
-class base::decommissioned {
-if $::hostname in $::decommissioned_servers {
-system::role { 'base::decommissioned': description = 'DECOMMISSIONED
server' }
-}
-}
-
class base::instance-upstarts {
file { '/etc/init/ttyS0.conf':
@@ -470,7 +464,6 @@
}
include passwords::root,
-base::decommissioned,
base::grub,
base::resolving,
base::remote-syslog,
--
To view, visit https://gerrit.wikimedia.org/r/129648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6532ce51ba6b39b165480b064d702cea29b9614c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Vary twemproxy config location based on getRealmSpecificFile... - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Vary twemproxy config location based on
getRealmSpecificFilename()
..
Vary twemproxy config location based on getRealmSpecificFilename()
Bug: 62836
Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index bf13fc1..1b9ce87 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,9 +13,15 @@
respawn limit 5 5
pre-start script
-[ -f /etc/wikimedia-site ] || { stop; exit 0; }
-[ -f /usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site).yaml ] || { stop; exit 0; }
+[ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
+. /usr/local/lib/mw-deployment-vars.sh
+
+[ -f $MW_COMMON_SOURCE/multiversion/MWRealm.sh ] || { stop; exit 0; }
+. $MW_COMMON_SOURCE/multiversion/MWRealm.sh
+env config = `getRealmSpecificFilename
$MW_COMMON_SOURCE/wmf-config/twemproxy.yaml`
+
+[ -f /usr/local/apache/common/wmf-config/$config ] || { stop; exit
0; }
end script
-exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/twemproxy-$(cat /etc/wikimedia-site).yaml
+exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/$config
--
To view, visit https://gerrit.wikimedia.org/r/129644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update MWRealm to drop pmtpa - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Update MWRealm to drop pmtpa
..
Update MWRealm to drop pmtpa
Change-Id: Ib4e8a64fd97eb2e4557d267bd7d5dfdbe3a22df6
---
M multiversion/MWRealm.php
M multiversion/MWRealm.sh
2 files changed, 5 insertions(+), 7 deletions(-)
Approvals:
Reedy: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/multiversion/MWRealm.php b/multiversion/MWRealm.php
index 90c5b4b..58946bc 100644
--- a/multiversion/MWRealm.php
+++ b/multiversion/MWRealm.php
@@ -4,8 +4,7 @@
# location. Thet should be provisioned by puppet in /etc/wikimedia-site and
# /etc/wikimedia-realm.
#
-# The possible values of $wmfRealm and $wmfDatacenter as of February 2014 are:
-# - labs + pmtpa
+# The possible values of $wmfRealm and $wmfDatacenter as of April 2014 are:
# - labs + eqiad
# - production + eqiad
global $wmfDatacenter, $wmfRealm;
@@ -24,7 +23,7 @@
switch( $wmfRealm ) {
case 'labs':
case 'production':
- if ( ! in_array( $wmfDatacenter, array( 'pmtpa', 'eqiad' ) ) ) {
+ if ( ! in_array( $wmfDatacenter, array( 'eqiad' ) ) ) {
$wmfDatacenter = 'eqiad';
}
break;
@@ -41,7 +40,6 @@
function listAllRealmsAndDatacenters() {
return array(
array( 'production', 'eqiad' ),
- array( 'labs', 'pmtpa' ),
array( 'labs', 'eqiad' ),
);
}
diff --git a/multiversion/MWRealm.sh b/multiversion/MWRealm.sh
index 308bfbe..7f8ca13 100644
--- a/multiversion/MWRealm.sh
+++ b/multiversion/MWRealm.sh
@@ -16,10 +16,10 @@
case $WMF_REALM in
production|labs)
case $WMF_DATACENTER in
- pmtpa|eqiad)
+ eqiad)
;;
*)
- WMF_DATACENTER=pmtpa
+ WMF_DATACENTER=eqiad
;;
esac
;;
@@ -27,7 +27,7 @@
*)
# Assume something vaguely resembling a default
WMF_REALM=production
- WMF_DATACENTER=pmtpa
+ WMF_DATACENTER=eqiad
;;
esac
--
To view, visit https://gerrit.wikimedia.org/r/129642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4e8a64fd97eb2e4557d267bd7d5dfdbe3a22df6
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add comments to map memcached ips to hostnames - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add comments to map memcached ips to hostnames .. Add comments to map memcached ips to hostnames Change-Id: I4a68dc8321b7b302f5e89b5adafcff096f2ac35b --- M wmf-config/mc.php M wmf-config/twemproxy-eqiad.yaml 2 files changed, 32 insertions(+), 32 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/mc.php b/wmf-config/mc.php index 8f4e2af..55e0db5 100644 --- a/wmf-config/mc.php +++ b/wmf-config/mc.php @@ -28,22 +28,22 @@ 'class' = 'MemcachedPeclBagOStuff', 'serializer' = 'php', 'servers'= array( - '10.64.0.180', - '10.64.0.181', - '10.64.0.182', - '10.64.0.183', - '10.64.0.184', - '10.64.0.185', - '10.64.0.186', - '10.64.0.187', - '10.64.0.188', - '10.64.0.189', - '10.64.0.190', - '10.64.0.191', - '10.64.0.192', - '10.64.0.193', - '10.64.0.194', - '10.64.0.195', + '10.64.0.180', # mc1001 + '10.64.0.181', # mc1002 + '10.64.0.182', # mc1003 + '10.64.0.183', # mc1004 + '10.64.0.184', # mc1005 + '10.64.0.185', # mc1006 + '10.64.0.186', # mc1007 + '10.64.0.187', # mc1008 + '10.64.0.188', # mc1009 + '10.64.0.189', # mc1010 + '10.64.0.190', # mc1011 + '10.64.0.191', # mc1012 + '10.64.0.192', # mc1013 + '10.64.0.193', # mc1014 + '10.64.0.194', # mc1015 + '10.64.0.195', # mc1015 ) ); ***/ diff --git a/wmf-config/twemproxy-eqiad.yaml b/wmf-config/twemproxy-eqiad.yaml index 29e3ef1..8a7f02a 100644 --- a/wmf-config/twemproxy-eqiad.yaml +++ b/wmf-config/twemproxy-eqiad.yaml @@ -10,19 +10,19 @@ server_failure_limit: 3 server_connections: 2 servers: - - 10.64.0.180:11211:1 - - 10.64.0.181:11211:1 - - 10.64.0.182:11211:1 - - 10.64.0.183:11211:1 - - 10.64.0.184:11211:1 - - 10.64.0.185:11211:1 - - 10.64.0.186:11211:1 - - 10.64.0.187:11211:1 - - 10.64.0.188:11211:1 - - 10.64.0.189:11211:1 - - 10.64.0.190:11211:1 - - 10.64.0.191:11211:1 - - 10.64.0.192:11211:1 - - 10.64.0.193:11211:1 - - 10.64.0.194:11211:1 - - 10.64.0.195:11211:1 + - 10.64.0.180:11211:1 # mc1001 + - 10.64.0.181:11211:1 # mc1002 + - 10.64.0.182:11211:1 # mc1003 + - 10.64.0.183:11211:1 # mc1004 + - 10.64.0.184:11211:1 # mc1005 + - 10.64.0.185:11211:1 # mc1006 + - 10.64.0.186:11211:1 # mc1007 + - 10.64.0.187:11211:1 # mc1008 + - 10.64.0.188:11211:1 # mc1009 + - 10.64.0.189:11211:1 # mc1010 + - 10.64.0.190:11211:1 # mc1011 + - 10.64.0.191:11211:1 # mc1012 + - 10.64.0.192:11211:1 # mc1013 + - 10.64.0.193:11211:1 # mc1014 + - 10.64.0.194:11211:1 # mc1015 + - 10.64.0.195:11211:1 # mc1016 -- To view, visit https://gerrit.wikimedia.org/r/129646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a68dc8321b7b302f5e89b5adafcff096f2ac35b Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove remnants of the old decom script - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: remove remnants of the old decom script
..
remove remnants of the old decom script
removed the decom script in Change-Id: I76c59c5f23
these now also need to go to avoid
puppet errors
Change-Id: I6532ce51ba6b39b165480b064d702cea29b9614c
---
M manifests/ganglia.pp
M manifests/misc/icinga.pp
M manifests/nagios.pp
M modules/base/manifests/init.pp
4 files changed, 0 insertions(+), 41 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 287c019..6430c47 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -30,10 +30,6 @@
cluster = $ganglia_cluster,
}
} else {
-if $::hostname in $::decommissioned_servers {
-$cluster = 'decommissioned'
-$deaf = 'no'
-} else {
if ! $::cluster {
$cluster = 'misc'
}
@@ -45,7 +41,6 @@
} else {
$deaf = 'yes'
}
-}
$authority_url = 'http://ganglia.wikimedia.org'
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index cfa2ae2..6bfb873 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -711,8 +711,6 @@
notify = Service[icinga],
}
-# Decommission servers
-decommission_monitor_host { $::decommissioned_servers: }
}
# NSCA - Nagios Service Check Acceptor
diff --git a/manifests/nagios.pp b/manifests/nagios.pp
index b5546ab..eb2e778 100644
--- a/manifests/nagios.pp
+++ b/manifests/nagios.pp
@@ -78,32 +78,6 @@
fail(Parameter $host not defined!)
}
-if $::hostname in $::decommissioned_servers {
-# Export the nagios service instance
-@@nagios_service { $::hostname $title:
-ensure= 'absent',
-target=
${::nagios_config_dir}/puppet_checks.d/${host}.cfg,
-host_name = $host,
-servicegroups = $group ? {
-/.+/= $group,
-default = undef,
-},
-service_description = $description,
-check_command = $check_command,
-max_check_attempts= $retries,
-normal_check_interval = $normal_check_interval,
-retry_check_interval = $retry_check_interval,
-check_period = '24x7',
-notification_interval = 0,
-notification_period = '24x7',
-notification_options = 'c,r,f',
-contact_groups= $critical ? {
-'true' = 'admins,sms',
-default = $contact_group,
-},
-}
-}
-else {
# Export the nagios service instance
@@nagios_service { $::hostname $title:
ensure = $ensure,
@@ -146,7 +120,6 @@
'true' = $freshness,
default = undef,
},
-}
}
}
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index b6b5c73..323c340 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -321,12 +321,6 @@
}
}
-class base::decommissioned {
-if $::hostname in $::decommissioned_servers {
-system::role { 'base::decommissioned': description = 'DECOMMISSIONED
server' }
-}
-}
-
class base::instance-upstarts {
file { '/etc/init/ttyS0.conf':
@@ -470,7 +464,6 @@
}
include passwords::root,
-base::decommissioned,
base::grub,
base::resolving,
base::remote-syslog,
--
To view, visit https://gerrit.wikimedia.org/r/129648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6532ce51ba6b39b165480b064d702cea29b9614c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make platform all lower case - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/129650 Change subject: Make platform all lower case .. Make platform all lower case The job template will vary by platform. Zeljkof confirmed that Saucelabs platform can be set all lower case which saves us from rename the jobs from linux to Linux. Change: -export PLATFORM='Linux' +export PLATFORM='linux' Change-Id: I31624526aa5c7c2f2e57ea30fadd7aeaa9ed45e1 --- M jobs.yaml 1 file changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/50/129650/1 diff --git a/jobs.yaml b/jobs.yaml index c0a7e94..7a5047a 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -30,7 +30,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-CentralAuth repository: mediawiki/extensions/CentralAuth @@ -48,7 +48,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-CirrusSearch repository: mediawiki/extensions/CirrusSearch @@ -64,7 +64,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-CirrusSearch repository: mediawiki/extensions/CirrusSearch @@ -82,7 +82,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG mediawiki_url: language-stage.wmflabs.org mediawiki_user: TranslatorToDa -platform: Linux +platform: linux recipients: *emails-ULS repository: mediawiki/extensions/ContentTranslation @@ -100,7 +100,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-qa repository: mediawiki/extensions/Flow @@ -116,7 +116,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-qa repository: mediawiki/extensions/Flow @@ -134,7 +134,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.m.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-mobile repository: mediawiki/extensions/MobileFrontend @@ -150,7 +150,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: en.m.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-mobile repository: mediawiki/extensions/MobileFrontend @@ -166,7 +166,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.m.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-mobile repository: mediawiki/extensions/MobileFrontend @@ -184,7 +184,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-multimedia repository: mediawiki/extensions/MultimediaViewer @@ -202,7 +202,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET mediawiki_url: sandbox.translatewiki.net mediawiki_user: Selenium -platform: Linux +platform: linux recipients: *emails-i18n repository: mediawiki/extensions/TwnMainPage @@ -220,7 +220,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET mediawiki_url: meta.wikimedia.org mediawiki_user: Selenium -platform: Linux +platform: linux recipients: *emails-i18n repository: mediawiki/extensions/Translate @@ -236,7 +236,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET mediawiki_url: sandbox.translatewiki.net mediawiki_user: Selenium-Translate -platform: Linux +platform: linux recipients: *emails-i18n repository: mediawiki/extensions/Translate @@ -255,7 +255,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG mediawiki_url: commons.wikimedia.beta.wmflabs.org mediawiki_user: Uls -
[MediaWiki-commits] [Gerrit] Make the job templates to vary by platform - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129651
Change subject: Make the job templates to vary by platform
..
Make the job templates to vary by platform
Although unused right now, we will have to run similar jobs on different
platforms whenever we start using SauceLabs for Windows host. Add
platform to the job template names.
Change-Id: I329aa5f16c7b94d013531ce36c4ee914fd8944a3
---
M job_template.yaml
M jobs.yaml
2 files changed, 53 insertions(+), 52 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/51/129651/1
diff --git a/job_template.yaml b/job_template.yaml
index 677bb85..a635ee9 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -1,7 +1,7 @@
# default
- job-template:
-name: 'browsertests-{name}-{browser}'
+name: 'browsertests-{name}-{platform}-{browser}'
defaults: browsertests
- defaults:
@@ -100,7 +100,7 @@
# VisualEditor
- job-template:
-name: 'browsertests-VisualEditor-{name}-{browser}'
+name: 'browsertests-VisualEditor-{name}-{platform}-{browser}'
defaults: browsertests
triggers:
@@ -164,7 +164,7 @@
# ZeroRatedMobileAccess
- job-template:
-name: 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
+name: 'browsertests-ZeroRatedMobileAccess-{name}-{platform}-{browser}'
defaults: browsertests
builders:
diff --git a/jobs.yaml b/jobs.yaml
index 7a5047a..65622e5 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -24,7 +24,7 @@
## test2.wikipedia.org
- project:
-name: CentralAuth-test2.wikipedia.org-linux
+name: CentralAuth-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -35,14 +35,14 @@
repository: mediawiki/extensions/CentralAuth
jobs:
-- 'browsertests-{name}-{browser}'
+- 'browsertests-{name}-{platform}-{browser}'
# CirrusSearch
## en.wikipedia.beta.wmflabs.org
- project:
-name: CirrusSearch-en.wikipedia.beta.wmflabs.org-linux
+name: CirrusSearch-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -53,12 +53,12 @@
repository: mediawiki/extensions/CirrusSearch
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
-name: CirrusSearch-test2.wikipedia.org-linux
+name: CirrusSearch-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -69,14 +69,14 @@
repository: mediawiki/extensions/CirrusSearch
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# ContentTranslation
## language-stage.wmflabs.org
- project:
-name: ContentTranslation-language-stage.wmflabs.org-linux
+name: ContentTranslation-language-stage.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG
@@ -87,14 +87,14 @@
repository: mediawiki/extensions/ContentTranslation
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# Flow
## en.wikipedia.beta.wmflabs.org
- project:
-name: Flow-en.wikipedia.beta.wmflabs.org-linux
+name: Flow-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -105,12 +105,12 @@
repository: mediawiki/extensions/Flow
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
-name: Flow-test2.wikipedia.org-linux
+name: Flow-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -121,14 +121,14 @@
repository: mediawiki/extensions/Flow
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# MobileFrontend
## en.m.wikipedia.beta.wmflabs.org
- project:
-name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org-linux
+name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -139,12 +139,12 @@
repository: mediawiki/extensions/MobileFrontend
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## en.m.wikipedia.org
- project:
-name: MobileFrontend-en.m.wikipedia.org-linux
+name: MobileFrontend-en.m.wikipedia.org
browser: firefox
folder: tests
[MediaWiki-commits] [Gerrit] Vary VisualEditor and ZeroRatedMobileAccess by browser - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129649
Change subject: Vary VisualEditor and ZeroRatedMobileAccess by browser
..
Vary VisualEditor and ZeroRatedMobileAccess by browser
In fb8e6634 Make the job template to vary by browser I forgot to
update the job templates being used for VisualEditor and
ZeroRatedmobileAccess. Simply add {browser} to them.
Change-Id: I58840939c209329551a02e2dd939383f464e3fc5
---
M job_template.yaml
M jobs.yaml
2 files changed, 6 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/49/129649/1
diff --git a/job_template.yaml b/job_template.yaml
index db8c9bb..677bb85 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -100,7 +100,7 @@
# VisualEditor
- job-template:
-name: 'browsertests-VisualEditor-{name}'
+name: 'browsertests-VisualEditor-{name}-{browser}'
defaults: browsertests
triggers:
@@ -164,7 +164,7 @@
# ZeroRatedMobileAccess
- job-template:
-name: 'browsertests-ZeroRatedMobileAccess-{name}'
+name: 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
defaults: browsertests
builders:
diff --git a/jobs.yaml b/jobs.yaml
index 1e4be9e..c0a7e94 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -357,7 +357,7 @@
## production
- project:
-name: production-linux-firefox
+name: production-linux
browser: firefox
folder: modules/ve-mw/test
platform: Linux
@@ -365,7 +365,7 @@
repository: mediawiki/extensions/VisualEditor
jobs:
- - 'browsertests-VisualEditor-{name}'
+ - 'browsertests-VisualEditor-{name}-{browser}'
## test2.wikipedia.org
@@ -406,7 +406,7 @@
## en.m.wikipedia.org
- project:
-name: en.m.wikipedia.org-linux-phantomjs
+name: en.m.wikipedia.org-linux
browser: phantomjs
folder: tests
mediawiki_url: en.m.wikipedia.org
@@ -414,7 +414,7 @@
repository: mediawiki/extensions/ZeroRatedMobileAccess
jobs:
- - 'browsertests-ZeroRatedMobileAccess-{name}'
+ - 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
# browsertests
--
To view, visit https://gerrit.wikimedia.org/r/129649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58840939c209329551a02e2dd939383f464e3fc5
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup mockups and docs related to localized error parameters - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129652
Change subject: Cleanup mockups and docs related to localized error parameters
..
Cleanup mockups and docs related to localized error parameters
This is a direct follow-up to change
I2240d6e0ced47fc2ab1eb5795073c185e6ad336f (bug 64308).
Change-Id: I57f6c76bf54ae09dcc9be55aab28b666c9d6b029
---
M lib/tests/phpunit/Validators/ValidatorErrorLocalizerTest.php
M lib/tests/phpunit/i18n/WikibaseExceptionLocalizerTest.php
M repo/tests/phpunit/includes/PreSaveChecksTest.php
M repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
4 files changed, 14 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/52/129652/1
diff --git a/lib/tests/phpunit/Validators/ValidatorErrorLocalizerTest.php
b/lib/tests/phpunit/Validators/ValidatorErrorLocalizerTest.php
index 0b817d6..56af961 100644
--- a/lib/tests/phpunit/Validators/ValidatorErrorLocalizerTest.php
+++ b/lib/tests/phpunit/Validators/ValidatorErrorLocalizerTest.php
@@ -2,7 +2,6 @@
namespace Wikibase\Test\Validators;
-use Status;
use ValueFormatters\ValueFormatter;
use ValueValidators\Error;
use ValueValidators\Result;
@@ -32,11 +31,9 @@
function ( $param ) {
if ( is_array( $param ) ) {
$param = implode( '|', $param );
- } else {
- $param = $param;
}
- return $param;
+ return wfEscapeWikiText( strval( $param
) );
}
) );
@@ -98,4 +95,4 @@
$this-assertEquals( count( $result-getErrors() ), count(
$status-getErrorsArray() ), 'Error count:' );
}
-}
\ No newline at end of file
+}
diff --git a/lib/tests/phpunit/i18n/WikibaseExceptionLocalizerTest.php
b/lib/tests/phpunit/i18n/WikibaseExceptionLocalizerTest.php
index 46d455d..96f616e 100644
--- a/lib/tests/phpunit/i18n/WikibaseExceptionLocalizerTest.php
+++ b/lib/tests/phpunit/i18n/WikibaseExceptionLocalizerTest.php
@@ -1,6 +1,7 @@
?php
namespace Wikibase\Test;
+
use Exception;
use RuntimeException;
use ValueFormatters\ValueFormatter;
@@ -53,11 +54,9 @@
function ( $param ) {
if ( is_array( $param ) ) {
$param = implode( '|', $param );
- } else {
- $param = $param;
}
- return $param;
+ return wfEscapeWikiText( strval( $param
) );
}
) );
@@ -79,4 +78,4 @@
$this-assertEquals( $expectedParams, $message-getParams(),
'Message parameters:' );
}
-}
\ No newline at end of file
+}
diff --git a/repo/tests/phpunit/includes/PreSaveChecksTest.php
b/repo/tests/phpunit/includes/PreSaveChecksTest.php
index f5e0cbb..8fe5616 100644
--- a/repo/tests/phpunit/includes/PreSaveChecksTest.php
+++ b/repo/tests/phpunit/includes/PreSaveChecksTest.php
@@ -7,6 +7,7 @@
use ValueValidators\Result;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\PreSaveChecks;
use Wikibase\Validators\TermValidatorFactory;
use Wikibase\Validators\ValidatorErrorLocalizer;
@@ -24,7 +25,6 @@
class PreSaveChecksTest extends \PHPUnit_Framework_TestCase {
public function providePreSaveChecks() {
-
return array(
'empty' = array(
'Wikibase\DataModel\Entity\Item',
@@ -160,6 +160,7 @@
/**
* @dataProvider providePreSaveChecks
*
+* @param string $class
* @param array $oldData
* @param array $newData
* @param string[] $expectedErrors
@@ -180,8 +181,9 @@
$errorLocalizer
);
- /* @var Entity $oldEntity */
- /* @var Entity $newEntity */
+ /** @var Item $class */
+ /** @var Entity $oldEntity */
+ /** @var Entity $newEntity */
$oldEntity = $oldData == null ? null : $class::newFromArray(
$oldData );
$newEntity = $class::newFromArray( $newData );
$diff = $oldEntity == null ? null : $oldEntity-getDiff(
$newEntity );
diff --git a/repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
[MediaWiki-commits] [Gerrit] Simple clean up of article before parsing - change (mediawiki...cxserver)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129653
Change subject: Simple clean up of article before parsing
..
Simple clean up of article before parsing
Just get body of the content from Parsoid
Change-Id: I8f4127f4d21f1c00652ef1e18baac0c9d1ff0612
---
M segmentation/CXSegmenter.js
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/53/129653/1
diff --git a/segmentation/CXSegmenter.js b/segmentation/CXSegmenter.js
index 7591432..9ea81fb 100644
--- a/segmentation/CXSegmenter.js
+++ b/segmentation/CXSegmenter.js
@@ -27,6 +27,7 @@
};
CXSegmenter.prototype.parse = function () {
+ this.content = this.getBody( this.content );
this.parser.parse( this.content );
this.links = this.parser.links;
this.segmentedContent = this.parser.segmentedContent;
@@ -34,6 +35,15 @@
CXSegmenter.prototype.getLinks = function () {
return this.links;
+};
+
+/**
+ * Get the body part alone for the content.
+ */
+CXSegmenter.prototype.getBody = function () {
+ var $container = $( 'div' ).html( this.content );
+ $container = $container.find( 'body' );
+ return $container.length ? $container[ 0 ].outerHTML : this.content;
};
CXSegmenter.prototype.extractSegments = function () {
@@ -44,7 +54,7 @@
var $section = $( section ),
segmentId = $section.data( 'segmentid' );
- segmenter.segments[segmentId] = {
+ segmenter.segments[ segmentId ] = {
source: $section.html()
};
} );
--
To view, visit https://gerrit.wikimedia.org/r/129653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f4127f4d21f1c00652ef1e18baac0c9d1ff0612
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prefix the two qa/browsertests jobs with 'qa-' - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/129654 Change subject: Prefix the two qa/browsertests jobs with 'qa-' .. Prefix the two qa/browsertests jobs with 'qa-' Jobs renamed: -browsertests-en.wikipedia.beta.wmflabs.org-linux-firefox +browsertests-qa-en.wikipedia.beta.wmflabs.org-linux-firefox -browsertests-test2.wikipedia.org-linux-firefox +browsertests-qa-test2.wikipedia.org-linux-firefox Renamed them both manually. Change-Id: Id7aa42db4daea035517aebe26e1bff6e0445e63f --- M jobs.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/54/129654/1 diff --git a/jobs.yaml b/jobs.yaml index 65622e5..cfbf635 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -422,7 +422,7 @@ ## en.wikipedia.beta.wmflabs.org - project: -name: en.wikipedia.beta.wmflabs.org +name: qa-en.wikipedia.beta.wmflabs.org browser: firefox folder: tests mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG @@ -438,7 +438,7 @@ ## test2.wikipedia.org - project: -name: test2.wikipedia.org +name: qa-test2.wikipedia.org browser: firefox folder: tests mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG -- To view, visit https://gerrit.wikimedia.org/r/129654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7aa42db4daea035517aebe26e1bff6e0445e63f Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial twemproxy configs for labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Initial twemproxy configs for labs .. Initial twemproxy configs for labs No twemproxy for hhvm Bug: 62836 Change-Id: Ic9c0ff585a556db263bf1defa7f9445e2d776e9e --- A docroot/noc/conf/twemproxy-labs.yaml.txt M docroot/noc/createTxtFileSymlinks.sh M wmf-config/mc-labs.php A wmf-config/twemproxy-labs.yaml 4 files changed, 17 insertions(+), 3 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/noc/conf/twemproxy-labs.yaml.txt b/docroot/noc/conf/twemproxy-labs.yaml.txt new file mode 12 index 000..86f2738 --- /dev/null +++ b/docroot/noc/conf/twemproxy-labs.yaml.txt @@ -0,0 +1 @@ +../../../wmf-config/twemproxy-labs.yaml \ No newline at end of file diff --git a/docroot/noc/createTxtFileSymlinks.sh b/docroot/noc/createTxtFileSymlinks.sh index 5657b94..1c37453 100755 --- a/docroot/noc/createTxtFileSymlinks.sh +++ b/docroot/noc/createTxtFileSymlinks.sh @@ -40,6 +40,7 @@ wmf-config/session.php wmf-config/session-labs.php wmf-config/twemproxy-eqiad.yaml + wmf-config/twemproxy-labs.yaml wmf-config/Wikibase.php ) diff --git a/wmf-config/mc-labs.php b/wmf-config/mc-labs.php index 45c4e15..e395c05 100644 --- a/wmf-config/mc-labs.php +++ b/wmf-config/mc-labs.php @@ -27,10 +27,8 @@ defined( 'HHVM_VERSION' ) ? array( 0 = '10.68.17.69:11211', # deployment-memc04.eqiad 1 = '10.68.17.71:11211', # deployment-memc05.eqiad - ) : array( - 0 = '10.68.16.14:11211', # deployment-memc02.eqiad - 1 = '10.68.16.15:11211', # deployment-memc03.eqiad ) + : array( '127.0.0.1' ) ), 'retry_timeout' = 1, ); diff --git a/wmf-config/twemproxy-labs.yaml b/wmf-config/twemproxy-labs.yaml new file mode 100644 index 000..e9aef91 --- /dev/null +++ b/wmf-config/twemproxy-labs.yaml @@ -0,0 +1,14 @@ +memcached: + listen: 127.0.0.1:11211 + hash: md5 + distribution: ketama + timeout: 250 + preconnect: true + redis: false + auto_eject_hosts: true + server_retry_timeout: 3 + server_failure_limit: 3 + server_connections: 2 + servers: + - 10.68.16.14:11211:1 # deployment-memc02.eqiad.wmflabs + - 10.68.16.15:11211:1 # deployment-memc03.eqiad.wmflabs -- To view, visit https://gerrit.wikimedia.org/r/129641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9c0ff585a556db263bf1defa7f9445e2d776e9e Gerrit-PatchSet: 6 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore WikiLove job! - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Restore WikiLove job! .. Restore WikiLove job! The ZeroRatedMobileAccess project definition was missing the '- project'. Since it cames just after the WikiLove project definition, the WikiLove job was never generated. Creates job: browsertests-WikiLove-en.wikipedia.beta.wmflabs.org-linux-firefox Change-Id: I337dfcf94c021af65c2194b42a9e3c292549d935 --- M jobs.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, but someone else must approve Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/jobs.yaml b/jobs.yaml index 776c4b9..1e4be9e 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -405,6 +405,7 @@ ## en.m.wikipedia.org +- project: name: en.m.wikipedia.org-linux-phantomjs browser: phantomjs folder: tests -- To view, visit https://gerrit.wikimedia.org/r/129647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I337dfcf94c021af65c2194b42a9e3c292549d935 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Vary VisualEditor and ZeroRatedMobileAccess by browser - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Vary VisualEditor and ZeroRatedMobileAccess by browser
..
Vary VisualEditor and ZeroRatedMobileAccess by browser
In fb8e6634 Make the job template to vary by browser I forgot to
update the job templates being used for VisualEditor and
ZeroRatedmobileAccess. Simply add {browser} to them.
Change-Id: I58840939c209329551a02e2dd939383f464e3fc5
---
M job_template.yaml
M jobs.yaml
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job_template.yaml b/job_template.yaml
index db8c9bb..677bb85 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -100,7 +100,7 @@
# VisualEditor
- job-template:
-name: 'browsertests-VisualEditor-{name}'
+name: 'browsertests-VisualEditor-{name}-{browser}'
defaults: browsertests
triggers:
@@ -164,7 +164,7 @@
# ZeroRatedMobileAccess
- job-template:
-name: 'browsertests-ZeroRatedMobileAccess-{name}'
+name: 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
defaults: browsertests
builders:
diff --git a/jobs.yaml b/jobs.yaml
index 1e4be9e..c0a7e94 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -357,7 +357,7 @@
## production
- project:
-name: production-linux-firefox
+name: production-linux
browser: firefox
folder: modules/ve-mw/test
platform: Linux
@@ -365,7 +365,7 @@
repository: mediawiki/extensions/VisualEditor
jobs:
- - 'browsertests-VisualEditor-{name}'
+ - 'browsertests-VisualEditor-{name}-{browser}'
## test2.wikipedia.org
@@ -406,7 +406,7 @@
## en.m.wikipedia.org
- project:
-name: en.m.wikipedia.org-linux-phantomjs
+name: en.m.wikipedia.org-linux
browser: phantomjs
folder: tests
mediawiki_url: en.m.wikipedia.org
@@ -414,7 +414,7 @@
repository: mediawiki/extensions/ZeroRatedMobileAccess
jobs:
- - 'browsertests-ZeroRatedMobileAccess-{name}'
+ - 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
# browsertests
--
To view, visit https://gerrit.wikimedia.org/r/129649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58840939c209329551a02e2dd939383f464e3fc5
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make platform all lower case - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Make platform all lower case .. Make platform all lower case The job template will vary by platform. Zeljkof confirmed that Saucelabs platform can be set all lower case which saves us from rename the jobs from linux to Linux. Change: -export PLATFORM='Linux' +export PLATFORM='linux' Change-Id: I31624526aa5c7c2f2e57ea30fadd7aeaa9ed45e1 --- M jobs.yaml 1 file changed, 23 insertions(+), 23 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/jobs.yaml b/jobs.yaml index c0a7e94..7a5047a 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -30,7 +30,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-CentralAuth repository: mediawiki/extensions/CentralAuth @@ -48,7 +48,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-CirrusSearch repository: mediawiki/extensions/CirrusSearch @@ -64,7 +64,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-CirrusSearch repository: mediawiki/extensions/CirrusSearch @@ -82,7 +82,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG mediawiki_url: language-stage.wmflabs.org mediawiki_user: TranslatorToDa -platform: Linux +platform: linux recipients: *emails-ULS repository: mediawiki/extensions/ContentTranslation @@ -100,7 +100,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-qa repository: mediawiki/extensions/Flow @@ -116,7 +116,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-qa repository: mediawiki/extensions/Flow @@ -134,7 +134,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.m.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-mobile repository: mediawiki/extensions/MobileFrontend @@ -150,7 +150,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: en.m.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-mobile repository: mediawiki/extensions/MobileFrontend @@ -166,7 +166,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG mediawiki_url: test2.m.wikipedia.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-mobile repository: mediawiki/extensions/MobileFrontend @@ -184,7 +184,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: en.wikipedia.beta.wmflabs.org mediawiki_user: Selenium_user -platform: Linux +platform: linux recipients: *emails-multimedia repository: mediawiki/extensions/MultimediaViewer @@ -202,7 +202,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET mediawiki_url: sandbox.translatewiki.net mediawiki_user: Selenium -platform: Linux +platform: linux recipients: *emails-i18n repository: mediawiki/extensions/TwnMainPage @@ -220,7 +220,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET mediawiki_url: meta.wikimedia.org mediawiki_user: Selenium -platform: Linux +platform: linux recipients: *emails-i18n repository: mediawiki/extensions/Translate @@ -236,7 +236,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET mediawiki_url: sandbox.translatewiki.net mediawiki_user: Selenium-Translate -platform: Linux +platform: linux recipients: *emails-i18n repository: mediawiki/extensions/Translate @@ -255,7 +255,7 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG mediawiki_url: commons.wikimedia.beta.wmflabs.org mediawiki_user: Uls -platform: Linux +platform: linux recipients: *emails-ULS
[MediaWiki-commits] [Gerrit] Make the job templates to vary by platform - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the job templates to vary by platform
..
Make the job templates to vary by platform
Although unused right now, we will have to run similar jobs on different
platforms whenever we start using SauceLabs for Windows host. Add
platform to the job template names.
Change-Id: I329aa5f16c7b94d013531ce36c4ee914fd8944a3
---
M job_template.yaml
M jobs.yaml
2 files changed, 53 insertions(+), 52 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job_template.yaml b/job_template.yaml
index 677bb85..a635ee9 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -1,7 +1,7 @@
# default
- job-template:
-name: 'browsertests-{name}-{browser}'
+name: 'browsertests-{name}-{platform}-{browser}'
defaults: browsertests
- defaults:
@@ -100,7 +100,7 @@
# VisualEditor
- job-template:
-name: 'browsertests-VisualEditor-{name}-{browser}'
+name: 'browsertests-VisualEditor-{name}-{platform}-{browser}'
defaults: browsertests
triggers:
@@ -164,7 +164,7 @@
# ZeroRatedMobileAccess
- job-template:
-name: 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
+name: 'browsertests-ZeroRatedMobileAccess-{name}-{platform}-{browser}'
defaults: browsertests
builders:
diff --git a/jobs.yaml b/jobs.yaml
index 7a5047a..65622e5 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -24,7 +24,7 @@
## test2.wikipedia.org
- project:
-name: CentralAuth-test2.wikipedia.org-linux
+name: CentralAuth-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -35,14 +35,14 @@
repository: mediawiki/extensions/CentralAuth
jobs:
-- 'browsertests-{name}-{browser}'
+- 'browsertests-{name}-{platform}-{browser}'
# CirrusSearch
## en.wikipedia.beta.wmflabs.org
- project:
-name: CirrusSearch-en.wikipedia.beta.wmflabs.org-linux
+name: CirrusSearch-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -53,12 +53,12 @@
repository: mediawiki/extensions/CirrusSearch
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
-name: CirrusSearch-test2.wikipedia.org-linux
+name: CirrusSearch-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -69,14 +69,14 @@
repository: mediawiki/extensions/CirrusSearch
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# ContentTranslation
## language-stage.wmflabs.org
- project:
-name: ContentTranslation-language-stage.wmflabs.org-linux
+name: ContentTranslation-language-stage.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG
@@ -87,14 +87,14 @@
repository: mediawiki/extensions/ContentTranslation
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# Flow
## en.wikipedia.beta.wmflabs.org
- project:
-name: Flow-en.wikipedia.beta.wmflabs.org-linux
+name: Flow-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -105,12 +105,12 @@
repository: mediawiki/extensions/Flow
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
-name: Flow-test2.wikipedia.org-linux
+name: Flow-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -121,14 +121,14 @@
repository: mediawiki/extensions/Flow
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# MobileFrontend
## en.m.wikipedia.beta.wmflabs.org
- project:
-name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org-linux
+name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -139,12 +139,12 @@
repository: mediawiki/extensions/MobileFrontend
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## en.m.wikipedia.org
- project:
-name: MobileFrontend-en.m.wikipedia.org-linux
+name: MobileFrontend-en.m.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
[MediaWiki-commits] [Gerrit] Prefix the two qa/browsertests jobs with 'qa-' - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Prefix the two qa/browsertests jobs with 'qa-' .. Prefix the two qa/browsertests jobs with 'qa-' Follow a discussion with Zeljkof. I would like to vary the template by project name and targeted hostname. Jobs renamed: -browsertests-en.wikipedia.beta.wmflabs.org-linux-firefox +browsertests-qa-en.wikipedia.beta.wmflabs.org-linux-firefox -browsertests-test2.wikipedia.org-linux-firefox +browsertests-qa-test2.wikipedia.org-linux-firefox Renamed them both manually. Change-Id: Id7aa42db4daea035517aebe26e1bff6e0445e63f --- M jobs.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/jobs.yaml b/jobs.yaml index 65622e5..cfbf635 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -422,7 +422,7 @@ ## en.wikipedia.beta.wmflabs.org - project: -name: en.wikipedia.beta.wmflabs.org +name: qa-en.wikipedia.beta.wmflabs.org browser: firefox folder: tests mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG @@ -438,7 +438,7 @@ ## test2.wikipedia.org - project: -name: test2.wikipedia.org +name: qa-test2.wikipedia.org browser: firefox folder: tests mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG -- To view, visit https://gerrit.wikimedia.org/r/129654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7aa42db4daea035517aebe26e1bff6e0445e63f Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Vary twemproxy config location based on getRealmSpec... - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129655
Change subject: Revert Vary twemproxy config location based on
getRealmSpecificFilename()
..
Revert Vary twemproxy config location based on getRealmSpecificFilename()
/usr/local/lib/mw-deployment-vars.sh is not valid dash syntax and as a
result upstart fails badly to start the job.
This reverts commit 70fed5288d2697aa3eead6af1932a4c4d89dc70c.
Change-Id: I587d8af7871e8db695171a5296562e33f9ccb128
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 3 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/129655/1
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index 1b9ce87..bf13fc1 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,15 +13,9 @@
respawn limit 5 5
pre-start script
-[ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
-. /usr/local/lib/mw-deployment-vars.sh
-
-[ -f $MW_COMMON_SOURCE/multiversion/MWRealm.sh ] || { stop; exit 0; }
-. $MW_COMMON_SOURCE/multiversion/MWRealm.sh
-env config = `getRealmSpecificFilename
$MW_COMMON_SOURCE/wmf-config/twemproxy.yaml`
-
-[ -f /usr/local/apache/common/wmf-config/$config ] || { stop; exit
0; }
+[ -f /etc/wikimedia-site ] || { stop; exit 0; }
+[ -f /usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site).yaml ] || { stop; exit 0; }
end script
-exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/$config
+exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/twemproxy-$(cat /etc/wikimedia-site).yaml
--
To view, visit https://gerrit.wikimedia.org/r/129655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I587d8af7871e8db695171a5296562e33f9ccb128
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cannot use mw-deployment-vars.sh in dash/upstart - change (operations/puppet)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129656
Change subject: Cannot use mw-deployment-vars.sh in dash/upstart
..
Cannot use mw-deployment-vars.sh in dash/upstart
Comment out that code, leave a comment
Manually set MW_COMMON=/usr/local/apache/common-local
Change-Id: I553f9113b574844814a15eb23e66c6a24433cc92
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/129656/1
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index 1b9ce87..06dc5a9 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,15 +13,16 @@
respawn limit 5 5
pre-start script
-[ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
-. /usr/local/lib/mw-deployment-vars.sh
+# Cannot use mw-deployment-vars.sh as not compatible with dash
+# [ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
+# . /usr/local/lib/mw-deployment-vars.sh
-[ -f $MW_COMMON_SOURCE/multiversion/MWRealm.sh ] || { stop; exit 0; }
-. $MW_COMMON_SOURCE/multiversion/MWRealm.sh
+env MW_COMMON = /usr/local/apache/common-local
+[ -f $MW_COMMON/multiversion/MWRealm.sh ] || { stop; exit 0; }
+. $MW_COMMON/multiversion/MWRealm.sh
env config = `getRealmSpecificFilename
$MW_COMMON_SOURCE/wmf-config/twemproxy.yaml`
[ -f /usr/local/apache/common/wmf-config/$config ] || { stop; exit
0; }
end script
exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/$config
-
--
To view, visit https://gerrit.wikimedia.org/r/129656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I553f9113b574844814a15eb23e66c6a24433cc92
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some cleanup on html before saving - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129658
Change subject: Some cleanup on html before saving
..
Some cleanup on html before saving
This will eventually moved to server as noted as TODO
Change-Id: I0e3e81fd09e6fb3029db1b5dfecf4157b6b34e57
---
M modules/translation/ext.cx.publish.js
1 file changed, 2 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/58/129658/1
diff --git a/modules/translation/ext.cx.publish.js
b/modules/translation/ext.cx.publish.js
index bb0e08c..c8ae9d2 100644
--- a/modules/translation/ext.cx.publish.js
+++ b/modules/translation/ext.cx.publish.js
@@ -24,6 +24,8 @@
$translatedContent.find( '.cx-segment' ).replaceWith( function
() {
return $( this ).html();
} );
+ // TODO: This clean up should be done even before segmentation
at server.
+ $translatedContent.find( 'link, title' ).remove();
// Remove placeholder sections that are empty
// TODO: This can be better done if all placeholder sections
has a semantic
--
To view, visit https://gerrit.wikimedia.org/r/129658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e3e81fd09e6fb3029db1b5dfecf4157b6b34e57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] FormatJson: Skip whitespace cleanup when unnecessary - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129659
Change subject: FormatJson: Skip whitespace cleanup when unnecessary
..
FormatJson: Skip whitespace cleanup when unnecessary
The patch[1] for PHP bug 66021[2], which removes the same undesirable
whitespace that WS_CLEANUP_REGEX does, has been merged into php-src.
Subsequent PHP versions having the patch shouldn't have to take the
10-20% performance hit from that workaround.
[1]: https://github.com/php/php-src/commit/82a4f1a1a287
[2]: https://bugs.php.net/bug.php?id=66021
Change-Id: I717a0e164952cc6ace104f13f6236e86c4ab8b58
(cherry picked from commit bec7e8287c690ef33ae2b0da084ae274bf192220)
---
M includes/json/FormatJson.php
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/129659/1
diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 97d98a4..eb5e632 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -136,6 +136,11 @@
* @return string|bool
*/
private static function encode54( $value, $pretty, $escaping ) {
+ static $bug66021;
+ if ( $pretty !== false $bug66021 === null ) {
+ $bug66021 = json_encode( array(), JSON_PRETTY_PRINT )
!== '[]';
+ }
+
// PHP escapes '/' to prevent breaking out of inline script
blocks using '/script',
// which is hardly useful when '' and '' are escaped (and
inadequate), and such
// escaping negatively impacts the human readability of URLs
and similar strings.
@@ -149,9 +154,11 @@
}
if ( $pretty !== false ) {
- // Remove whitespace inside empty arrays/objects;
different JSON encoders
- // vary on this, and we want our output to be
consistent across implementations.
- $json = preg_replace( self::WS_CLEANUP_REGEX, '', $json
);
+ // Workaround for
https://bugs.php.net/bug.php?id=66021
+ // Can be removed once we require PHP = 5.4.28,
5.5.12, 5.6.0
+ if ( $bug66021 ) {
+ $json = preg_replace( self::WS_CLEANUP_REGEX,
'', $json );
+ }
if ( $pretty !== '' ) {
// Change the four-space indent to a tab indent
$json = str_replace( \n, \n\t, $json );
--
To view, visit https://gerrit.wikimedia.org/r/129659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I717a0e164952cc6ace104f13f6236e86c4ab8b58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: PleaseStand pleasest...@live.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Redirect metrics.wikimedia.org to Wikimetrics - change (operations/puppet)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/129660
to review the following change.
Change subject: Redirect metrics.wikimedia.org to Wikimetrics
..
Redirect metrics.wikimedia.org to Wikimetrics
While the domain has been removed in
59eab3e4b248405d7a08dc3d7e5a35a7fa21d470, search engines and some old
documentation still refer to it. So we redirect any requests to those
domains to the replacement service “Wikimetrics”.
Since the certificate for metrics.wikimedia.org has not been upgraded
since the Heartbleed vulnerability, we cannot reuse the old
certificate, and hence only redirect http traffic for now.
Bug: 64276
Change-Id: I43f978ad3db8076951523a247a12a06a10a3f73e
---
M manifests/misc/statistics.pp
M manifests/role/statistics.pp
A templates/apache/sites/metrics.wikimedia.org.erb
3 files changed, 79 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/129660/1
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index ba08915..02416b3 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -358,6 +358,41 @@
}
}
+# mertics.wikimedia.org and metrics-api.wikimedia.org
+# They should just redirect to Wikimetrics
+#
+class misc::statistics::sites::metrics {
+require misc::statistics::user
+
+$site_name = metrics.wikimedia.org
+$redirect_target = https://metrics.wmflabs.org/;
+
+include webserver::apache
+webserver::apache::module { alias: }
+
+# install metrics.wikimedia.org SSL certificate
+install_certificate{ $site_name: }
+
+# Set up the VirtualHost
+file { /etc/apache2/sites-available/$site_name:
+content = template(apache/sites/${site_name}.erb),
+require = [Class[webserver::apache],
Webserver::Apache::Module['alias']],
+notify = Class['webserver::apache::service'],
+}
+file { /etc/apache2/sites-enabled/$site_name:
+ensure = link,
+target = /etc/apache2/sites-available/${site_name},
+require = File[/etc/apache2/sites-available/${site_name}],
+notify = Class['webserver::apache::service'],
+}
+
+# make access and error log for metrics-api readable by wikidev group
+file { [/var/log/apache2/access.metrics.log,
/var/log/apache2/error.metrics.log]:
+group = wikidev,
+require = File[/etc/apache2/sites-enabled/$site_name],
+}
+}
+
# installs MonogDB
class misc::statistics::db::mongo {
include misc::statistics::base
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 6f43742..c127434 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -42,6 +42,8 @@
misc::statistics::sites::stats,
# community-analytics.wikimedia.org
misc::statistics::sites::community_analytics,
+ # metrics.wikimedia,.org and metrics-api.wikimedia.org
+ misc::statistics::sites::metrics,
# reportcard.wikimedia.org
misc::statistics::sites::reportcard,
# rsync public datasets from stat1003 hourly
diff --git a/templates/apache/sites/metrics.wikimedia.org.erb
b/templates/apache/sites/metrics.wikimedia.org.erb
new file mode 100644
index 000..f1571db
--- /dev/null
+++ b/templates/apache/sites/metrics.wikimedia.org.erb
@@ -0,0 +1,42 @@
+# Note: This file is managed by Puppet.
+%
+# ERb template variables:
+#
+# site_name
+# redirect_target
+#
+-%
+
+VirtualHost *:80
+ # metrics-api.wikimedia.org is deprecated. The services it provided
+ # are now available through Wikimetrics.
+ #
+ # We keep the domain around only because old documentation and
+ # search engines still refer to it.
+
+ ServerName metrics-api.wikimedia.org
+ ServerAdmin n...@wikimedia.org
+
+ Redirect permanent / %= redirect_target %
+
+ ErrorLog /var/log/apache2/error.metrics.log
+ LogLevel warn
+ CustomLog /var/log/apache2/access.metrics.log combined
+/VirtualHost
+
+VirtualHost *:80
+ # %= site_name % is deprecated. The services it provided
+ # are now available through Wikimetrics.
+ #
+ # We keep the domain around only because old documentation and
+ # search engines still refer to it.
+
+ ServerName %= site_name %
+ ServerAdmin n...@wikimedia.org
+
+ Redirect permanent / %= redirect_target %
+
+ ErrorLog /var/log/apache2/error.metrics.log
+ LogLevel warn
+ CustomLog /var/log/apache2/access.metrics.log combined
+/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/129660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f978ad3db8076951523a247a12a06a10a3f73e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata
[MediaWiki-commits] [Gerrit] Refactor UploadWizard-API job to use a single template - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129661
Change subject: Refactor UploadWizard-API job to use a single template
..
Refactor UploadWizard-API job to use a single template
We have two UploadWizard api tests:
UploadWizard-api-commons.wikimedia.org
UploadWizard-api-commons.wikimedia.beta.wmflabs.org
This patch makes the template to vary based on the mediawiki_url
parameter. Depending on its value, use a different username and a
different password variable to match the (username, mediawiki_url).
I removed the PollScm variance in the production job. Was apparently
meant to run the job at 5:31am every day. But we already trigger it
twice per day so I dont think that is needed.
Change-Id: I595debcefbd1c53b503a4fc7e197a451367d4c5e
---
M job_template.yaml
M jobs.yaml
2 files changed, 25 insertions(+), 23 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/61/129661/1
diff --git a/job_template.yaml b/job_template.yaml
index a635ee9..b6b940f 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -53,9 +53,8 @@
# UploadWizard
- job-template:
-name: 'UploadWizard-api-{name}'
+name: 'UploadWizard-api-{mediawiki_url}'
defaults: browsertests
-mediawiki_password_variable: '{mediawiki_password_variable}'
mediawiki_url: '{mediawiki_url}'
pollscm: '{pollscm}'
@@ -65,9 +64,7 @@
builders:
- UploadWizard-api:
- mediawiki_password_variable: '{mediawiki_password_variable}'
mediawiki_url: '{mediawiki_url}'
- mediawiki_user: '{mediawiki_user}'
publishers:
- email:
@@ -80,7 +77,23 @@
- shell: |
# set up environment variables
set -e
- export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
+
+ case {mediawiki_url} in
+ 'commons.wikimedia.beta.wmflabs.org')
+ export
MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+ export MEDIAWIKI_USER='Selenium_user'
+ ;;
+ 'commons.wikimedia.org')
+ export
MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+ export MEDIAWIKI_USER='Selenium_user'
+ ;;
+ *)
+ echo Can not determine username and password env variable for
{{name}}
+ echo Unsupported mediawiki url {{mediawiki_url}}
+ exit 1
+ ;;
+ esac;
+
# install python
virtualenv --distribute DEV
@@ -90,11 +103,11 @@
# run tests
DEV/bin/python tests/api/upload-wizard_tests.py \
---username {mediawiki_user} \
+--username $MEDIAWIKI_USER \
--api_url http://{mediawiki_url}/w/api.php;
DEV/bin/python tests/api/upload-wizard_tests.py \
--gen_new_image \
---username {mediawiki_user} \
+--username $MEDIAWIKI_USER \
--api_url http://{mediawiki_url}/w/api.php;
# VisualEditor
diff --git a/jobs.yaml b/jobs.yaml
index cfbf635..b63402d 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -299,26 +299,15 @@
## API
- project:
-name: commons.wikimedia.beta.wmflabs.org
-mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
-mediawiki_url: commons.wikimedia.beta.wmflabs.org
-mediawiki_user: Selenium_user
+name: UploadWizard-api
+mediawiki_url:
+ - commons.wikimedia.beta.wmflabs.org
+ - commons.wikimedia.org
pollscm: '* * * * *'
repository: mediawiki/extensions/UploadWizard
jobs:
- - 'UploadWizard-api-{name}'
-
-- project:
-name: commons.wikimedia.org
-mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
-mediawiki_url: commons.wikimedia.org
-mediawiki_user: Selenium_user
-pollscm: '0 5 31 2 *'
-repository: mediawiki/extensions/UploadWizard
-
-jobs:
- - 'UploadWizard-api-{name}'
+ - 'UploadWizard-api-{mediawiki_url}'
## commons.wikimedia.beta.wmflabs.org
--
To view, visit https://gerrit.wikimedia.org/r/129661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I595debcefbd1c53b503a4fc7e197a451367d4c5e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Vary twemproxy config location based on getRealmSpec... - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Revert Vary twemproxy config location based on
getRealmSpecificFilename()
..
Revert Vary twemproxy config location based on getRealmSpecificFilename()
/usr/local/lib/mw-deployment-vars.sh is not valid dash syntax and as a
result upstart fails badly to start the job.
This reverts commit 70fed5288d2697aa3eead6af1932a4c4d89dc70c.
Change-Id: I587d8af7871e8db695171a5296562e33f9ccb128
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 3 insertions(+), 9 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index 1b9ce87..bf13fc1 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,15 +13,9 @@
respawn limit 5 5
pre-start script
-[ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
-. /usr/local/lib/mw-deployment-vars.sh
-
-[ -f $MW_COMMON_SOURCE/multiversion/MWRealm.sh ] || { stop; exit 0; }
-. $MW_COMMON_SOURCE/multiversion/MWRealm.sh
-env config = `getRealmSpecificFilename
$MW_COMMON_SOURCE/wmf-config/twemproxy.yaml`
-
-[ -f /usr/local/apache/common/wmf-config/$config ] || { stop; exit
0; }
+[ -f /etc/wikimedia-site ] || { stop; exit 0; }
+[ -f /usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site).yaml ] || { stop; exit 0; }
end script
-exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/$config
+exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/twemproxy-$(cat /etc/wikimedia-site).yaml
--
To view, visit https://gerrit.wikimedia.org/r/129655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I587d8af7871e8db695171a5296562e33f9ccb128
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga-wm/ircecho: do not set variables in node - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129662
Change subject: icinga-wm/ircecho: do not set variables in node
..
icinga-wm/ircecho: do not set variables in node
do not set those variables directly in site.pp
on the 'neon' node.
move them to the role class.
add a comment what this is actually for
Change-Id: I6e5d832c925178a7baae1cdc436efe25dd2c9d13
---
M manifests/role/echoirc.pp
M manifests/site.pp
2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/129662/1
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index 535eb93..801e453 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -1,4 +1,10 @@
+# role class for Icinga IRC bot
class role::echoirc {
+
+$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-operations' }
+$ircecho_nick = 'icinga-wm'
+$ircecho_server = 'chat.freenode.net'
+
include ircecho
system::role { 'ircecho': description = 'ircecho server' }
@@ -8,5 +14,6 @@
description = 'ircecho_service_running',
nrpe_command = '/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a
ircecho',
}
+
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 6366613..0ae3e52 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1840,9 +1840,6 @@
class { 'base::firewall': }
$domain_search = 'wikimedia.org pmtpa.wmnet eqiad.wmnet
esams.wikimedia.org'
-$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-operations' }
-$ircecho_nick = 'icinga-wm'
-$ircecho_server = 'chat.freenode.net'
include standard
include icinga::monitor
include role::ishmael
--
To view, visit https://gerrit.wikimedia.org/r/129662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e5d832c925178a7baae1cdc436efe25dd2c9d13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some cleanup on html before saving - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Some cleanup on html before saving
..
Some cleanup on html before saving
This will eventually moved to server as noted as TODO
Change-Id: I0e3e81fd09e6fb3029db1b5dfecf4157b6b34e57
---
M modules/translation/ext.cx.publish.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/translation/ext.cx.publish.js
b/modules/translation/ext.cx.publish.js
index bb0e08c..c8ae9d2 100644
--- a/modules/translation/ext.cx.publish.js
+++ b/modules/translation/ext.cx.publish.js
@@ -24,6 +24,8 @@
$translatedContent.find( '.cx-segment' ).replaceWith( function
() {
return $( this ).html();
} );
+ // TODO: This clean up should be done even before segmentation
at server.
+ $translatedContent.find( 'link, title' ).remove();
// Remove placeholder sections that are empty
// TODO: This can be better done if all placeholder sections
has a semantic
--
To view, visit https://gerrit.wikimedia.org/r/129658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e3e81fd09e6fb3029db1b5dfecf4157b6b34e57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga-wm/ircecho: do not set variables in node - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: icinga-wm/ircecho: do not set variables in node
..
icinga-wm/ircecho: do not set variables in node
do not set those variables directly in site.pp
on the 'neon' node.
move them to the role class.
add a comment what this is actually for
Change-Id: I6e5d832c925178a7baae1cdc436efe25dd2c9d13
---
M manifests/role/echoirc.pp
M manifests/site.pp
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index 535eb93..801e453 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -1,4 +1,10 @@
+# role class for Icinga IRC bot
class role::echoirc {
+
+$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-operations' }
+$ircecho_nick = 'icinga-wm'
+$ircecho_server = 'chat.freenode.net'
+
include ircecho
system::role { 'ircecho': description = 'ircecho server' }
@@ -8,5 +14,6 @@
description = 'ircecho_service_running',
nrpe_command = '/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a
ircecho',
}
+
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 6366613..0ae3e52 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1840,9 +1840,6 @@
class { 'base::firewall': }
$domain_search = 'wikimedia.org pmtpa.wmnet eqiad.wmnet
esams.wikimedia.org'
-$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-operations' }
-$ircecho_nick = 'icinga-wm'
-$ircecho_server = 'chat.freenode.net'
include standard
include icinga::monitor
include role::ishmael
--
To view, visit https://gerrit.wikimedia.org/r/129662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e5d832c925178a7baae1cdc436efe25dd2c9d13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Vary twemproxy config location based on getRealmSpecificFile... - change (operations/puppet)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129663
Change subject: Vary twemproxy config location based on
getRealmSpecificFilename() (take 2)
..
Vary twemproxy config location based on getRealmSpecificFilename() (take 2)
Bug: 62836
Change-Id: Ic681f577871e707b16d51afb46d2e07995827724
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/129663/1
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index bf13fc1..2cd3ca2 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,9 +13,16 @@
respawn limit 5 5
pre-start script
-[ -f /etc/wikimedia-site ] || { stop; exit 0; }
-[ -f /usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site).yaml ] || { stop; exit 0; }
+# Cannot use mw-deployment-vars.sh as not compatible with dash
+# [ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
+# . /usr/local/lib/mw-deployment-vars.sh
+
+env MW_COMMON = /usr/local/apache/common-local
+[ -f $MW_COMMON/multiversion/MWRealm.sh ] || { stop; exit 0; }
+. $MW_COMMON/multiversion/MWRealm.sh
+env config = `getRealmSpecificFilename
$MW_COMMON_SOURCE/wmf-config/twemproxy.yaml`
+
+[ -f $config ] || { stop; exit 0; }
end script
-exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
/usr/local/apache/common/wmf-config/twemproxy-$(cat /etc/wikimedia-site).yaml
-
+exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c $config
--
To view, visit https://gerrit.wikimedia.org/r/129663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic681f577871e707b16d51afb46d2e07995827724
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove skip tests in MwTimeIsoFormatterTest - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove skip tests in MwTimeIsoFormatterTest
..
Remove skip tests in MwTimeIsoFormatterTest
Once I94761ca is merged (and ideally backported to MW 1.23),
then time formatter can handle zh-classical and lzh.
Bug: 63723
Change-Id: Idf18b1bb1ecd2a8e4f8f8d85360561eba17bd167
---
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
WikidataJenkins: Verified
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
index feb0913..6f3b403 100644
--- a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
@@ -318,11 +318,6 @@
* @param string $langCode
*/
public function testFormat( $expected, TimeValue $timeValue, $roundtrip
= false, $langCode = 'en' ) {
- //TODO remove this skip section once $brokenLanguages can be
empty! BUG 63723
- if( in_array( $langCode, array( 'lzh', 'zh-classical' ) ) ) {
- $this-markTestSkipped( Test for lang {$langCode}
currently broken: Bug 63723 );
- }
-
$options = new FormatterOptions( array(
ValueFormatter::OPT_LANG = $langCode
) );
--
To view, visit https://gerrit.wikimedia.org/r/129370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf18b1bb1ecd2a8e4f8f8d85360561eba17bd167
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga-wm/echoirc: add $::realm case for labs - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129664
Change subject: icinga-wm/echoirc: add $::realm case for labs
..
icinga-wm/echoirc: add $::realm case for labs
- add a $::realm case for labs/prod flexibility
make things easier for beta
- adjust system role to match class name and edit
description
Change-Id: Ibf7167acd167e3ce1c7fa6e6f0726d8b16865ab1
---
M manifests/role/echoirc.pp
1 file changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/129664/1
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index 801e453..9c4ba2f 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -1,13 +1,25 @@
# role class for Icinga IRC bot
class role::echoirc {
-$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-operations' }
-$ircecho_nick = 'icinga-wm'
-$ircecho_server = 'chat.freenode.net'
+system::role { 'echoirc': description = 'server running icinga irc bot' }
+
+case $::realm {
+'production': {
+$ircecho_logs = { '/var/log/icinga/irc.log' =
'#wikimedia-operations' }
+$ircecho_nick = 'icinga-wm'
+$ircecho_server = 'chat.freenode.net'
+}
+'labs': {
+$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-labs'
}
+$ircecho_nick = 'icinga-wm-labs'
+$ircecho_server = 'chat.freenode.net'
+}
+'default': {
+fail('unknown realm, please use labs or production')
+}
+}
include ircecho
-
-system::role { 'ircecho': description = 'ircecho server' }
# bug 26784 - IRC bots process need nagios monitoring
nrpe::monitor_service { 'ircecho':
--
To view, visit https://gerrit.wikimedia.org/r/129664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf7167acd167e3ce1c7fa6e6f0726d8b16865ab1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added required Cucumber tags - change (mediawiki...ContentTranslation)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/129665 Change subject: Added required Cucumber tags .. Added required Cucumber tags Change-Id: I6783907a3898e8075e1b7e0360c6b6928fa334f8 --- M tests/browser/features/basic_mt.feature M tests/browser/features/dialog.feature M tests/browser/features/red_link_anon.feature M tests/browser/features/red_link_dialog.feature M tests/browser/features/red_link_logged_in.feature M tests/browser/features/special_content_translation.feature 6 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/65/129665/1 diff --git a/tests/browser/features/basic_mt.feature b/tests/browser/features/basic_mt.feature index 0aeced9..fd08961 100644 --- a/tests/browser/features/basic_mt.feature +++ b/tests/browser/features/basic_mt.feature @@ -1,3 +1,4 @@ +@firefox @language-stage.wmflabs.org @login Feature: Basic machine translation. As a user, diff --git a/tests/browser/features/dialog.feature b/tests/browser/features/dialog.feature index 7961cbf..5245d19 100644 --- a/tests/browser/features/dialog.feature +++ b/tests/browser/features/dialog.feature @@ -1,3 +1,4 @@ +@firefox @language-stage.wmflabs.org @login Feature: New Page dialog As a wiki editor diff --git a/tests/browser/features/red_link_anon.feature b/tests/browser/features/red_link_anon.feature index c2accfb..ebf3431 100644 --- a/tests/browser/features/red_link_anon.feature +++ b/tests/browser/features/red_link_anon.feature @@ -1,3 +1,4 @@ +@firefox @language-stage.wmflabs.org Feature: New translation from interlanguage link As a registered wiki editor who uses a wiki in a different language diff --git a/tests/browser/features/red_link_dialog.feature b/tests/browser/features/red_link_dialog.feature index fcb3cde..4fe39d6 100644 --- a/tests/browser/features/red_link_dialog.feature +++ b/tests/browser/features/red_link_dialog.feature @@ -1,3 +1,4 @@ +@firefox @language-stage.wmflabs.org @login Feature: New translation from interlanguage link As a registered wiki editor who uses a wiki in a different language diff --git a/tests/browser/features/red_link_logged_in.feature b/tests/browser/features/red_link_logged_in.feature index d1fcb9c..e17ea86 100644 --- a/tests/browser/features/red_link_logged_in.feature +++ b/tests/browser/features/red_link_logged_in.feature @@ -1,3 +1,4 @@ +@firefox @language-stage.wmflabs.org @login Feature: New translation from interlanguage link As a registered wiki editor who uses a wiki in a different language diff --git a/tests/browser/features/special_content_translation.feature b/tests/browser/features/special_content_translation.feature index 6c7ba74..64691b8 100644 --- a/tests/browser/features/special_content_translation.feature +++ b/tests/browser/features/special_content_translation.feature @@ -1,4 +1,4 @@ -@firefox @language-stage.wmflabs.org @login +@firefox @language-stage.wmflabs.org Feature: Content translation special page As a wiki editor @@ -18,6 +18,7 @@ And I don't see the translation column And I don't see a Publish Translation button + @login Scenario: Logged in user viewing the special page for translation. Given I am logged in When I am on the content translation page in a wiki in English, translating the page Bratislava to Danish @@ -43,12 +44,14 @@ And the translation progress bar is in 0% state And the text near the translation progress bar says 0% translated + @login Scenario: Writing some translation text enables the Publish Translation button Given I am logged in And I am on the content translation page in a wiki in English, translating the page Bratislava to Danish When I write Bratislava er hovedstad og største by i Slovakiet. in the editing area in the translation column Then the Publish Translation button is enabled + @login Scenario: Deleting the translation text disables the Publish Translation button Given I am logged in And I am on the content translation page in a wiki in English, translating the page Bratislava to Danish @@ -56,6 +59,7 @@ And I empty the editing area in the translation column Then the Publish Translation button is disabled + @login Scenario: Writing some translation text and saving it Given I am logged in And I am on the content translation page in a wiki in English, translating the page Bratislava to Danish @@ -63,6 +67,7 @@ And I press the Publish Translation button Then I see a notification bubble that begins with the words Page published at + @login Scenario: Writing some translation text and saving it Given I am logged in And I am on the content translation page in a wiki in English, translating the page Bratislava to Danish -- To view, visit
[MediaWiki-commits] [Gerrit] Add a new namespace to Hebrew Wikisource - change (operations/mediawiki-config)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/129666 Change subject: Add a new namespace to Hebrew Wikisource .. Add a new namespace to Hebrew Wikisource See bug for URL with on-wiki consensus for this change. Bug: 64353 Change-Id: Ic9edeedd03486b37c62755fd9e024a8e369a8090 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/66/129666/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ca1486b..cdc6fda 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4900,6 +4900,8 @@ 111 = 'שיחת_תרגום', 112 = 'מפתח', 113 = 'שיחת_מפתח', + 116 = 'מקור', // bug 64353 + 117 = 'שיחת_מקור', // bug 64353 ), 'hrwikisource' = array( 100 = 'Autor', -- To view, visit https://gerrit.wikimedia.org/r/129666 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9edeedd03486b37c62755fd9e024a8e369a8090 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder twkozlow...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update getRealmSpecificFilename comments - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129667
Change subject: Update getRealmSpecificFilename comments
..
Update getRealmSpecificFilename comments
Returns full path, not just a filename
Change-Id: Ic5989e89142cb4a031103af61b6cc3e4af4fa0fc
---
M multiversion/MWRealm.php
M multiversion/MWRealm.sh
2 files changed, 46 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/67/129667/1
diff --git a/multiversion/MWRealm.php b/multiversion/MWRealm.php
index 58946bc..64bc8e3 100644
--- a/multiversion/MWRealm.php
+++ b/multiversion/MWRealm.php
@@ -1,17 +1,17 @@
?php
-### Determine realm and datacenter we are on #
-# $wmfRealm and $wmfDatacenter are used to vary configuration based on server
-# location. Thet should be provisioned by puppet in /etc/wikimedia-site and
-# /etc/wikimedia-realm.
-#
-# The possible values of $wmfRealm and $wmfDatacenter as of April 2014 are:
-# - labs + eqiad
-# - production + eqiad
+// Determine realm and datacenter we are on
+// $wmfRealm and $wmfDatacenter are used to vary configuration based on server
+// location. They should be provisioned by puppet in /etc/wikimedia-site and
+// /etc/wikimedia-realm.
+//
+// The possible values of $wmfRealm and $wmfDatacenter as of April 2014 are:
+// - labs + eqiad
+// - production + eqiad
global $wmfDatacenter, $wmfRealm;
$wmfRealm = 'production';
$wmfDatacenter = 'eqiad';
-# Puppet provision the realm in /etc/wikimedia-realm
+// Puppet provisions the realm in /etc/wikimedia-realm
if( file_exists( '/etc/wikimedia-realm' ) ) {
$wmfRealm = trim( file_get_contents( '/etc/wikimedia-realm' ) );
}
@@ -19,7 +19,7 @@
$wmfDatacenter = trim( file_get_contents( '/etc/wikimedia-site' ) );
}
-# Validate settings
+// Validate settings
switch( $wmfRealm ) {
case 'labs':
case 'production':
@@ -35,8 +35,11 @@
break;
}
-# Function to list all valid realm/datacenter pairs, for testing purposes.
-# @returns array List of realm-datacenter pairs
+/**
+ * Function to list all valid realm/datacenter pairs, for testing purposes.
+ *
+ * @return array List of realm-datacenter pairs
+ */
function listAllRealmsAndDatacenters() {
return array(
array( 'production', 'eqiad' ),
@@ -44,17 +47,21 @@
);
}
-# Function to get the filename for the current realm/datacenter, falling back
-# to the base file if not found.
-#
-# Files checked are:
-# base-realm-datacenter.ext
-# base-realm.ext
-# base-datacenter.ext
-# base.ext
-#
-# @param $filename string Base filename, must contain an extension
-# @returns string Filename to be used
+/**
+ * Function to get the filename for the current realm/datacenter, falling back
+ * to the $filename if not found.
+ *
+ * Files checked are:
+ * base-realm-datacenter.ext
+ * base-realm.ext
+ * base-datacenter.ext
+ * base.ext
+ *
+ * @note The full path to the file is returned, not just the filename
+ *
+ * @param string $filename Full path to file. Must contain an extension
+ * @return string Full path to file to be used
+ */
function getRealmSpecificFilename( $filename ) {
global $wmfRealm, $wmfDatacenter;
@@ -65,14 +72,14 @@
$base = substr( $filename, 0, $dotPos );
$ext = substr( $filename, $dotPos );
- # Test existence of the following file suffix and return
- # immediately whenever found:
- # - {realm}-{datacenter}
- # - {realm}
- # - {datacenter}
- # - {}
- #
- # Please update /README whenever changing code below.
+ // Test existence of the following file suffix and return
+ // immediately whenever found:
+ // - {realm}-{datacenter}
+ // - {realm}
+ // - {datacenter}
+ // - {}
+ //
+ // Please update /README whenever changing code below.
$new_filename = {$base}-{$wmfRealm}-{$wmfDatacenter}{$ext};
if ( file_exists( $new_filename ) ) {
@@ -92,4 +99,5 @@
return $filename;
}
-### End /Determine realm and datacenter we are on/
+
+// End /Determine realm and datacenter we are on/
diff --git a/multiversion/MWRealm.sh b/multiversion/MWRealm.sh
index 7f8ca13..e1b7193 100644
--- a/multiversion/MWRealm.sh
+++ b/multiversion/MWRealm.sh
@@ -39,9 +39,11 @@
# base-realm.ext
# base.ext
#
-# @param $filename string Base filename, must contain an extension
-# @output string Filename to be used
-getRealmSpecificFilename () (
+# @note The full path to the file is returned, not just the filename
+#
+# @param $filename Full path to file. Must contain an extension
+# @output string Full path to file to be used
+getRealmSpecificFilename () {
BASE=${1%.*}
EXT=${1##*.}
RET=$1
@@ -60,4 +62,4 @@
fi
printf %s $RET
-)
+}
--
To view, visit
[MediaWiki-commits] [Gerrit] icinga-wm/echoirc: add $::realm case for labs - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: icinga-wm/echoirc: add $::realm case for labs
..
icinga-wm/echoirc: add $::realm case for labs
- add a $::realm case for labs/prod flexibility
make things easier for beta
- adjust system role to match class name and edit
description
Change-Id: Ibf7167acd167e3ce1c7fa6e6f0726d8b16865ab1
---
M manifests/role/echoirc.pp
1 file changed, 17 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index 801e453..9c4ba2f 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -1,13 +1,25 @@
# role class for Icinga IRC bot
class role::echoirc {
-$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-operations' }
-$ircecho_nick = 'icinga-wm'
-$ircecho_server = 'chat.freenode.net'
+system::role { 'echoirc': description = 'server running icinga irc bot' }
+
+case $::realm {
+'production': {
+$ircecho_logs = { '/var/log/icinga/irc.log' =
'#wikimedia-operations' }
+$ircecho_nick = 'icinga-wm'
+$ircecho_server = 'chat.freenode.net'
+}
+'labs': {
+$ircecho_logs = { '/var/log/icinga/irc.log' = '#wikimedia-labs'
}
+$ircecho_nick = 'icinga-wm-labs'
+$ircecho_server = 'chat.freenode.net'
+}
+'default': {
+fail('unknown realm, please use labs or production')
+}
+}
include ircecho
-
-system::role { 'ircecho': description = 'ircecho server' }
# bug 26784 - IRC bots process need nagios monitoring
nrpe::monitor_service { 'ircecho':
--
To view, visit https://gerrit.wikimedia.org/r/129664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf7167acd167e3ce1c7fa6e6f0726d8b16865ab1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Configure the entry point as a beta feature - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129668
Change subject: Configure the entry point as a beta feature
..
Configure the entry point as a beta feature
Mingle:
https://wikimedia.mingle.thoughtworks.com/projects/language_engineering/cards/3932
Change-Id: I43158b857a035dc2977c6479ab2e04e80fcb0170
---
M ContentTranslation.hooks.php
M ContentTranslation.php
M i18n/en.json
M i18n/qqq.json
A modules/entrypoint/images/translate-redlink-ltr.svg
A modules/entrypoint/images/translate-redlink-rtl.svg
6 files changed, 98 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/68/129668/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index b47e359..d56e149 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -21,7 +21,12 @@
$title = $out-getTitle();
$user = $out-getUser();
+ $redlinkFeatureEnabled = class_exists( BetaFeatures ) ?
+ BetaFeatures::isFeatureEnabled( $user,
'red-interlanguage-link' ) :
+ true;
+
if ( $user-isLoggedIn()
+ $redlinkFeatureEnabled
$title-getNamespace() === NS_MAIN
$out-getLanguage()-getCode() !==
$title-getPageLanguage()-getCode()
) {
@@ -40,6 +45,24 @@
return true;
}
+ public static function getPreferences( $user, $prefs ) {
+ global $wgExtensionAssetsPath;
+
+ $prefs['red-interlanguage-link'] = array(
+ // The first two are message keys
+ 'label-message' =
'cx-red-interlanguage-link-preference',
+ 'desc-message' =
'cx-red-interlanguage-link-preference-beta-desc',
+ 'screenshot' = array(
+ 'ltr' =
$wgExtensionAssetsPath/ContentTranslation/modules/entrypoint/images/translate-redlink-ltr.svg,
+ 'rtl' =
$wgExtensionAssetsPath/ContentTranslation/modules/entrypoint/images/translate-redlink-rtl.svg,
+ ),
+ // Link to information on the feature - use subpages on
mw.org, maybe?
+ 'info-link' =
'https://mediawiki.org/wiki/Extension:ContentTranslation',
+ // Link to discussion about the feature - talk pages
might work
+ 'discussion-link' =
'https://mediawiki.org/wiki/Extension_talk:ContentTranslation',
+ );
+ }
+
/**
* Hook: ResourceLoaderGetConfigVars
* @param array $vars
diff --git a/ContentTranslation.php b/ContentTranslation.php
index dc0fd8e..567d104 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -65,6 +65,7 @@
// Hooks
$GLOBALS['wgHooks']['BeforePageDisplay'][] =
'ContentTranslationHooks::addModules';
+$GLOBALS['wgHooks']['GetBetaFeaturePreferences'][] =
'ContentTranslationHooks::getPreferences';
$GLOBALS['wgHooks']['ResourceLoaderGetConfigVars'][] =
'ContentTranslationHooks::addConfig';
$GLOBALS['wgExtensionFunctions'][] = function () {
diff --git a/i18n/en.json b/i18n/en.json
index df4afcb..d0a0b96 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,6 +20,8 @@
cx-translation-add-translation: + Add translation,
tag-contenttranslation: ContentTranslation,
cx-source-loading: Loading $1,
+ cx-red-interlanguage-link-preference: Content Translation,
+ cx-red-interlanguage-link-preference-beta-desc: Show a red link in
the list of interlanguage links if an article doesn't have an interlanguage
link to your language.,
cx-entrypoint-title: Translate this page to $1,
cx-entrypoint-dialog-page-doesnt-exist-yet: This page does not exist
in $1 yet.br /\nDo you want to create it?,
cx-entrypoint-dialog-title-in: Title for the new page in $1:,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9655ff4..30523c9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,6 +22,8 @@
cx-translation-add-translation: This appears in the empty paragraph
in the translation column. Clicking the paragraph adds an automatic translation
of the corresponding source paragraph. The plus sign is used as an icon that
hints that something is being added.,
tag-contenttranslation: A short description of the
contenttranslation tag. Appears in the edit summary when a translated page is
created.,
cx-source-loading: Status text shown in the source article pane
while article is being loaded.\n\nParameters:\n* $1 - the title of the page
being loaded,
+ cx-red-interlanguage-link-preference: Beta feature title.,
+ cx-red-interlanguage-link-preference-beta-desc: Beta feature
description.,
[MediaWiki-commits] [Gerrit] Add cp3014 to esams mobile cache backends - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129669
Change subject: Add cp3014 to esams mobile cache backends
..
Add cp3014 to esams mobile cache backends
Change-Id: I9337697b5130a3338a90eb8bb864655a1ef1217c
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/129669/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 4a9cae8..44efefd 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -112,7 +112,7 @@
mobile = {
pmtpa = [],
'eqiad' = ['cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet',
'cp1059.eqiad.wmnet', 'cp1060.eqiad.wmnet'],
-esams = ['cp3011.esams.wikimedia.org',
'cp3012.esams.wikimedia.org', 'cp3013.esams.wmnet'],
+esams = ['cp3011.esams.wikimedia.org',
'cp3012.esams.wikimedia.org', 'cp3013.esams.wmnet', 'cp3014.esams.wmnet'],
ulsfo = ['cp4011.ulsfo.wmnet', 'cp4012.ulsfo.wmnet',
'cp4019.ulsfo.wmnet', 'cp4020.ulsfo.wmnet']
},
parsoid = {
--
To view, visit https://gerrit.wikimedia.org/r/129669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9337697b5130a3338a90eb8bb864655a1ef1217c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add cp3014 to esams mobile cache backends - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Add cp3014 to esams mobile cache backends
..
Add cp3014 to esams mobile cache backends
Change-Id: I9337697b5130a3338a90eb8bb864655a1ef1217c
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 4a9cae8..44efefd 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -112,7 +112,7 @@
mobile = {
pmtpa = [],
'eqiad' = ['cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet',
'cp1059.eqiad.wmnet', 'cp1060.eqiad.wmnet'],
-esams = ['cp3011.esams.wikimedia.org',
'cp3012.esams.wikimedia.org', 'cp3013.esams.wmnet'],
+esams = ['cp3011.esams.wikimedia.org',
'cp3012.esams.wikimedia.org', 'cp3013.esams.wmnet', 'cp3014.esams.wmnet'],
ulsfo = ['cp4011.ulsfo.wmnet', 'cp4012.ulsfo.wmnet',
'cp4019.ulsfo.wmnet', 'cp4020.ulsfo.wmnet']
},
parsoid = {
--
To view, visit https://gerrit.wikimedia.org/r/129669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9337697b5130a3338a90eb8bb864655a1ef1217c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] echoirc, wikistats, don't quote 'default' in switch - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129670
Change subject: echoirc,wikistats,don't quote 'default' in switch
..
echoirc,wikistats,don't quote 'default' in switch
..or it becomes a
WARNING: case statement without a default case
Change-Id: I9a3f3df8dbddc11b888eb7c1e512dbb0ef2e0b4f
---
M manifests/role/echoirc.pp
M manifests/role/wikistats.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/129670/1
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index 9c4ba2f..a82e768 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -14,7 +14,7 @@
$ircecho_nick = 'icinga-wm-labs'
$ircecho_server = 'chat.freenode.net'
}
-'default': {
+default: {
fail('unknown realm, please use labs or production')
}
}
diff --git a/manifests/role/wikistats.pp b/manifests/role/wikistats.pp
index 99327b5..9cf387d 100644
--- a/manifests/role/wikistats.pp
+++ b/manifests/role/wikistats.pp
@@ -14,7 +14,7 @@
'production': {
$wikistats_host = 'wikistats.wikimedia.org'
}
-'default': {
+default: {
fail('unknown realm, should be labs or production')
}
}
--
To view, visit https://gerrit.wikimedia.org/r/129670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a3f3df8dbddc11b888eb7c1e512dbb0ef2e0b4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] echoirc, wikistats, don't quote 'default' in switch - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: echoirc,wikistats,don't quote 'default' in switch
..
echoirc,wikistats,don't quote 'default' in switch
..or it becomes a
WARNING: case statement without a default case
Change-Id: I9a3f3df8dbddc11b888eb7c1e512dbb0ef2e0b4f
---
M manifests/role/echoirc.pp
M manifests/role/wikistats.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index 9c4ba2f..a82e768 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -14,7 +14,7 @@
$ircecho_nick = 'icinga-wm-labs'
$ircecho_server = 'chat.freenode.net'
}
-'default': {
+default: {
fail('unknown realm, please use labs or production')
}
}
diff --git a/manifests/role/wikistats.pp b/manifests/role/wikistats.pp
index 99327b5..9cf387d 100644
--- a/manifests/role/wikistats.pp
+++ b/manifests/role/wikistats.pp
@@ -14,7 +14,7 @@
'production': {
$wikistats_host = 'wikistats.wikimedia.org'
}
-'default': {
+default: {
fail('unknown realm, should be labs or production')
}
}
--
To view, visit https://gerrit.wikimedia.org/r/129670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a3f3df8dbddc11b888eb7c1e512dbb0ef2e0b4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move queries for bugs with ASSIGNED status - change (wikimedia...modifications)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/129671 Change subject: Move queries for bugs with ASSIGNED status .. Move queries for bugs with ASSIGNED status Queries for bugs with ASSIGNED status should be in lines of their own for clarity. Change-Id: Id60335b7e6e0003e5cdb5aa57874f18942999cb7 --- M template/en/custom/index.html.tmpl 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications refs/changes/71/129671/1 diff --git a/template/en/custom/index.html.tmpl b/template/en/custom/index.html.tmpl index a40fb20..902b268 100644 --- a/template/en/custom/index.html.tmpl +++ b/template/en/custom/index.html.tmpl @@ -152,8 +152,12 @@ [% title FILTER html %]/a ([% assignee_count FILTER html %]) a href=buglist.cgi?f1=assigned_toamp;o1=equalsamp;v1=%25user%25amp;resolution=---amp;ctype=atomamp;title=[% title FILTER uri %] class=rssnbsp;/a - a href=buglist.cgi?f1=assigned_toamp;o1=equalsamp;v1=%25user%25amp;bug_status=ASSIGNED + ul + li + a href=buglist.cgi?f1=assigned_toamp;o1=equalsamp;v1=%25user%25amp;bug_status=ASSIGNED (with ASSIGNED status)/a + /li + /ul /li li [% title = BLOCK %]Reported by me[% END %] -- To view, visit https://gerrit.wikimedia.org/r/129671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id60335b7e6e0003e5cdb5aa57874f18942999cb7 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Odder twkozlow...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace Linux RPS setting with a smarter script - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Replace Linux RPS setting with a smarter script
..
Replace Linux RPS setting with a smarter script
We were setting Receive Packet Steering as ff (i.e. all CPUs, up to 16
CPUs) to all RX queues for a given interface (eth0). While is this what
basically everyone on the web recommends, experience in the field has
shown that this was very unbalanced, with CPU 0 getting most of the load
and even spending all of its time being busy -and producing packet loss
latency- while other CPUs remained relatively idle.
A smarter way of handling the load is pinning each queue to a separate
CPU, while isolating to the greatest extent the CPUs for each. This has
proven to balance the load as fairly as possible. Experimentation has
also shown that using HyperThreading siblings (even pairing them with
each other) is actively worse and it's best to ignore them completely.
Finally, experimentation has shown that for our primary use case (LVS),
Transmit Packet Steering makes little to no difference.
This replaces the older bash one-liner with a Python script which tries
to be extra smart about how to distribute queues to CPUs (and CPUs with
HT). Unfortunately, the number of CPUs and queues can differ wildly
between boxes and -in cases such as amslvs1- can unconvienently be five
queues for four CPUs, so we need to cover multiple cases.
This has been tested manually on amslvs1 lvs1001 and made a
considerable difference.
Change-Id: I606d222616a62563cb0a2939d3e800d04db1de39
---
D modules/generic/files/upstart/enable-rps.conf
A modules/interface/files/interface-rps.py
A modules/interface/manifests/rps.pp
A modules/interface/templates/enable-rps.conf.erb
M modules/lvs/manifests/balancer.pp
5 files changed, 157 insertions(+), 11 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/generic/files/upstart/enable-rps.conf
b/modules/generic/files/upstart/enable-rps.conf
deleted file mode 100644
index caed241..000
--- a/modules/generic/files/upstart/enable-rps.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# enable-rps
-
-description Enable RPS on eth0 receive queues
-author Mark Bergsma m...@wikimedia.org
-
-start on filesystem
-task
-script
- for queue in /sys/class/net/eth0/queues/rx-*; do echo ff
$queue/rps_cpus; done
-end script
diff --git a/modules/interface/files/interface-rps.py
b/modules/interface/files/interface-rps.py
new file mode 100755
index 000..4efccb1
--- /dev/null
+++ b/modules/interface/files/interface-rps.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+
+# Sets up Receive Packet Steering (RPS) for a given interface.
+#
+# Tries to allocate separate queues to separate CPUs, rather than follow
+# what's common advice out there (all CPUs to all queues), as experience has
+# shown a tremendous difference.
+#
+# Author: Faidon Liambotis
+# Copyright (c) 2013 Wikimedia Foundation, Inc.
+
+import os
+import glob
+import sys
+
+
+def get_value(path):
+Read a (sysfs) value from path
+return open(path, 'r').read()[:-1]
+
+
+def write_value(path, value):
+Write a (sysfs) value to path
+print '%s = %s' % (path, value)
+open(path, 'w').write(value)
+
+
+def get_cpu_list():
+Get a list of all CPUs by their number (e.g. [0, 1, 2, 3])
+path_cpu = '/sys/devices/system/cpu/'
+cpu_nodes = glob.glob(os.path.join(path_cpu, 'cpu[0-9]*'))
+cpus = [int(os.path.basename(c)[3:]) for c in cpu_nodes]
+
+# filter-out HyperThreading siblings
+cores = []
+for cpu in cpus:
+path_threads = os.path.join(path_cpu, 'cpu%s' % cpu,
+'topology', 'thread_siblings_list')
+thread_siblings = get_value(path_threads).split(',')
+cores.append(int(thread_siblings[0]))
+
+# return a (unique) sorted set of CPUs without their HT siblings
+return sorted(set(cores))
+
+
+def get_rx_queues(device):
+Get a list of RX queues for device
+rx_nodes = glob.glob(os.path.join('/sys/class/net', device, 'queues',
+ 'rx-*'))
+rx_queues = [int(os.path.basename(q)[3:]) for q in rx_nodes]
+
+return rx_queues
+
+
+def assign_rx_queue_to_cpus(device, rx_queue, cpus):
+Assign a device's RX queue to a CPU set
+bitmask = 0
+for cpu in cpus:
+bitmask += 2**cpu
+
+rx_node = os.path.join('/sys/class/net', device, 'queues',
+ 'rx-%s' % rx_queue, 'rps_cpus')
+
+write_value(rx_node, format(bitmask, 'x'))
+
+
+def distribute_rx_queues_to_cpus(device, rx_queues, cpu_list):
+Performs a smart distribution of RX queues to CPUs (or vice-versa)
+if len(rx_queues) = len(cpu_list):
+# try to divide queues / CPUs and assign N CPUs per queue, isolated
+(quot, rem) = divmod(len(rx_queues), len(cpu_list))
+
+for i, cpu in enumerate(cpu_list):
+
[MediaWiki-commits] [Gerrit] Adding test for cohort uploading for cohort with cyrilic and... - change (analytics/wikimetrics)
Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129672
Change subject: Adding test for cohort uploading for cohort with cyrilic and
arabic usernames.
..
Adding test for cohort uploading for cohort with cyrilic and arabic usernames.
Added ability to specify an arbitrary cohort file and test that it validates
correctly.
In order to have testing bindings in mediawiki testing db create tables that
mimic production as close as possible, changes were done to mediawiki user model
and wikimetrics database. Alembic migration is included.
Without the database and binding changes the cohort uploading tests will fail.
Much testing was done regarding database connection args and encoding in
both wikimetrics and mediwiki database on staging with real data.
Bug: 63933
Change-Id: I0771e74f3d0745737e3ea96482614382fe09d961
---
A
database_migrations/versions/43970813b4bb_changed_mediawiki_username_to_varbinary.py
A tests/static/public/testing-cohort-arabic.txt
A tests/static/public/testing-cohort-cyrilic.txt
M tests/test_models/test_validate_cohort.py
M wikimetrics/controllers/forms/cohort_upload.py
M wikimetrics/models/mediawiki/user.py
M wikimetrics/models/validate_cohort.py
M wikimetrics/utils.py
8 files changed, 256 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/72/129672/1
diff --git
a/database_migrations/versions/43970813b4bb_changed_mediawiki_username_to_varbinary.py
b/database_migrations/versions/43970813b4bb_changed_mediawiki_username_to_varbinary.py
new file mode 100644
index 000..b342612
--- /dev/null
+++
b/database_migrations/versions/43970813b4bb_changed_mediawiki_username_to_varbinary.py
@@ -0,0 +1,28 @@
+Changed mediawiki_username to VARBINARY
+
+Revision ID: 43970813b4bb
+Revises: 1a5740750a28
+Create Date: 2014-04-25 10:27:08.597354
+
+
+
+# revision identifiers, used by Alembic.
+revision = '43970813b4bb'
+down_revision = '1a5740750a28'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.mysql import VARBINARY
+from sqlalchemy import Column, Integer, String, Boolean
+
+
+def upgrade():
+op.alter_column('wiki_user', 'mediawiki_username', type_=VARBINARY(255),
+existing_type=String(255), existing_nullable=True)
+## end Alembic commands ###
+
+
+def downgrade():
+op.alter_column('wiki_user', 'mediawiki_username', type_=String(255),
+existing_type=VARBINARY(255), existing_nullable=True)
+### end Alembic commands ###
diff --git a/tests/static/public/testing-cohort-arabic.txt
b/tests/static/public/testing-cohort-arabic.txt
new file mode 100644
index 000..189ea21
--- /dev/null
+++ b/tests/static/public/testing-cohort-arabic.txt
@@ -0,0 +1,14 @@
+Manar Abd El-Reheem
+Parvati
+تسنيم عادل
+Shahinaz Ashraf
+Shaimaa Khaled
+Amaaal Sayed
+
+Jadiga refaie
+Hoda Medhat Said
+Hanan Mohammed
+عائشة عبد العزيز
+Fatma noor
+صفا محمد فهمي
+مى مصطفى بركات
\ No newline at end of file
diff --git a/tests/static/public/testing-cohort-cyrilic.txt
b/tests/static/public/testing-cohort-cyrilic.txt
new file mode 100644
index 000..bedba99
--- /dev/null
+++ b/tests/static/public/testing-cohort-cyrilic.txt
@@ -0,0 +1,29 @@
+007master
+00eight
+0gust1
+0neman
+0xd1ma
+0zar0
+1.Big.Picture
+100%sierreno
+1025wil
+117Avenue
+11joop
+11kingston11
+12mkwikimk12`
+12sid12
+16 Pacita
+17 marzo 2011
+18Наталь
+Абрам
+Александр
+Алексей
+АльбертAlbert
+Анатолий
+Андрей
+Антон
+Аркадий
+Марат
+Марк
+Матвей
+Михаил
\ No newline at end of file
diff --git a/tests/test_models/test_validate_cohort.py
b/tests/test_models/test_validate_cohort.py
index 377a26a..61fd57f 100644
--- a/tests/test_models/test_validate_cohort.py
+++ b/tests/test_models/test_validate_cohort.py
@@ -1,12 +1,158 @@
import unittest
-from nose.tools import assert_equal, raises, assert_true, assert_false
-from wikimetrics.configurables import app
-from tests.fixtures import WebTest, QueueDatabaseTest, mediawiki_project
+import os
+from nose.tools import assert_equal, raises, assert_true, assert_false, nottest
+from wikimetrics.configurables import app, get_absolute_path
+from tests.fixtures import WebTest, QueueDatabaseTest, DatabaseTest,
mediawiki_project
from wikimetrics.controllers.forms import CohortUpload
from wikimetrics.models import (
MediawikiUser, Cohort, WikiUser, ValidateCohort, User,
normalize_project,
)
+from wikimetrics.utils import parse_username
+
+
+class MockCohort(object):
+pass
+
+
+class ValidateCohortEncodingTest(DatabaseTest):
+
+def setUp(self):
+DatabaseTest.setUp(self)
+self.test_report_path = os.path.join(get_absolute_path(), os.pardir,
'tests')
+
+def tearDown(self):
+pass
+
+def test_validate_arabic_cohort(self):
+'''
+Cohort with arabic names should validate
+
+If cohorts
[MediaWiki-commits] [Gerrit] Update tags for Pywikibot - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/129673 Change subject: Update tags for Pywikibot .. Update tags for Pywikibot Change-Id: I504de7a0aa30e1098f0187f9aa47e7675b8798a9 --- M groups/Pywikibot/Pywikibot.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/73/129673/1 diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml index 5e3b797..1d33a82 100644 --- a/groups/Pywikibot/Pywikibot.yaml +++ b/groups/Pywikibot/Pywikibot.yaml @@ -306,6 +306,10 @@ FILES: sourcePattern: %GROUPROOT%/pywikibot/redirect.py definitionFile: %GROUPROOT%/pywikibot/redirect.py + +TAGS: + optional: +- redirect-broken-redirect-template --- BASIC: id: out-pywikipedia-reflinks -- To view, visit https://gerrit.wikimedia.org/r/129673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I504de7a0aa30e1098f0187f9aa47e7675b8798a9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update tags for Pywikibot - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update tags for Pywikibot .. Update tags for Pywikibot Change-Id: I504de7a0aa30e1098f0187f9aa47e7675b8798a9 --- M groups/Pywikibot/Pywikibot.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml index 5e3b797..1d33a82 100644 --- a/groups/Pywikibot/Pywikibot.yaml +++ b/groups/Pywikibot/Pywikibot.yaml @@ -306,6 +306,10 @@ FILES: sourcePattern: %GROUPROOT%/pywikibot/redirect.py definitionFile: %GROUPROOT%/pywikibot/redirect.py + +TAGS: + optional: +- redirect-broken-redirect-template --- BASIC: id: out-pywikipedia-reflinks -- To view, visit https://gerrit.wikimedia.org/r/129673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I504de7a0aa30e1098f0187f9aa47e7675b8798a9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] show what's backed up in motd (rt #469) - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: show what's backed up in motd (rt #469)
..
show what's backed up in motd (rt #469)
Use a virtual resource so this does not get populated unless
backup::host is also included
Change-Id: Id97bef7c69c5b94f1cbf1f3c3419b3b4ab56ff8b
---
M manifests/backups.pp
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/backups.pp b/manifests/backups.pp
index cc522a4..1896f2b 100644
--- a/manifests/backups.pp
+++ b/manifests/backups.pp
@@ -10,6 +10,16 @@
fileset = $name,
jobdefaults = $jobdefaults,
}
+
+$motd_content = Backed up on this host: $name\n
+@file { /etc/update-motd.d/06-backups-${name}:
+ensure = 'present',
+owner = 'root',
+group = 'root',
+mode= '0555',
+content = $motd_content,
+tag = 'backup-motd',
+}
}
}
@@ -33,6 +43,7 @@
Bacula::Client::Job | | {
require = Class['bacula::client'],
}
+File | tag == 'backup-motd' |
# If the machine includes base::firewall then let internal servers
# connect to us
--
To view, visit https://gerrit.wikimedia.org/r/125971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id97bef7c69c5b94f1cbf1f3c3419b3b4ab56ff8b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update highlighter - change (operations...plugins)
Manybubbles has submitted this change and it was merged. Change subject: Update highlighter .. Update highlighter Change-Id: If40dfb9377f6af9a00c60396138188a10ccca8c8 --- D experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.3.jar A experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.5.jar D experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.3.jar A experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.5.jar D experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.3.jar A experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.5.jar 6 files changed, 3 insertions(+), 3 deletions(-) Approvals: Chad: Looks good to me, but someone else must approve Manybubbles: Verified; Looks good to me, approved diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.3.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.3.jar deleted file mode 100644 index 20ea357..000 --- a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.3.jar +++ /dev/null @@ -1 +0,0 @@ -#$# git-fat cf87f31fe5399c320093053794a601014bcc4f6e69428 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.5.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.5.jar new file mode 100644 index 000..b002aaf --- /dev/null +++ b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.5.jar @@ -0,0 +1 @@ +#$# git-fat 091e9f6f05af414b484313b858c8a7f0a57599b375670 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.3.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.3.jar deleted file mode 100644 index 7103f88..000 --- a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.3.jar +++ /dev/null @@ -1 +0,0 @@ -#$# git-fat be905af14295893e0500d3b195b6231ca0f1de8a28675 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.5.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.5.jar new file mode 100644 index 000..6da6f1c --- /dev/null +++ b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.5.jar @@ -0,0 +1 @@ +#$# git-fat 1570b9e13e7053d217dedfa493cdab000b752d3229585 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.3.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.3.jar deleted file mode 100644 index 0045154..000 --- a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.3.jar +++ /dev/null @@ -1 +0,0 @@ -#$# git-fat 4781a2e8a6e826fc9229d327fdc52e2a76b74dfc15046 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.5.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.5.jar new file mode 100644 index 000..aa1d3e2 --- /dev/null +++ b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.5.jar @@ -0,0 +1 @@ +#$# git-fat 1c0d9e64a5f2ad17130b07d245caaba4c943998c16602 -- To view, visit https://gerrit.wikimedia.org/r/129484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If40dfb9377f6af9a00c60396138188a10ccca8c8 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/elasticsearch/plugins Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] National Library of Scotland to wgCopyUploadsDomains - change (operations/mediawiki-config)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/129675 Change subject: National Library of Scotland to wgCopyUploadsDomains .. National Library of Scotland to wgCopyUploadsDomains So as to allow uploads with the GWToolset tool as part of a Wikipedian-in-Residence project. Bug: 64357 Change-Id: I4ce33672fd1d44180c3b0effb998bff9e32f63af --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/75/129675/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ca1486b..3f43619 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10417,6 +10417,7 @@ '*.wikimedia.ch',// Wikimedia CH 'link.nypl.org', // New York Public Library 'peacepalacelibrary.nl', // Peace Palace Library, The Hague bug 64372 + 'digital.nls.uk',// National Library of Scotland bug 64357 ), ), -- To view, visit https://gerrit.wikimedia.org/r/129675 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ce33672fd1d44180c3b0effb998bff9e32f63af Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder twkozlow...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Partial revert memcached config for labs until twemproxy upd... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Partial revert memcached config for labs until twemproxy update is remerged .. Partial revert memcached config for labs until twemproxy update is remerged Change-Id: Ic4fd92215771eb6155b64a6a35680a42e27f02a8 --- M wmf-config/mc-labs.php M wmf-config/mc.php 2 files changed, 6 insertions(+), 2 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/mc-labs.php b/wmf-config/mc-labs.php index e395c05..08f3210 100644 --- a/wmf-config/mc-labs.php +++ b/wmf-config/mc-labs.php @@ -28,7 +28,11 @@ 0 = '10.68.17.69:11211', # deployment-memc04.eqiad 1 = '10.68.17.71:11211', # deployment-memc05.eqiad ) - : array( '127.0.0.1' ) + // : array( '127.0.0.1' ) // TODO: + : array( + 0 = '10.68.16.14:11211', # deployment-memc02.eqiad + 1 = '10.68.16.15:11211', # deployment-memc03.eqiad + ) ), 'retry_timeout' = 1, ); diff --git a/wmf-config/mc.php b/wmf-config/mc.php index 55e0db5..2b6ac66 100644 --- a/wmf-config/mc.php +++ b/wmf-config/mc.php @@ -43,7 +43,7 @@ '10.64.0.192', # mc1013 '10.64.0.193', # mc1014 '10.64.0.194', # mc1015 - '10.64.0.195', # mc1015 + '10.64.0.195', # mc1016 ) ); ***/ -- To view, visit https://gerrit.wikimedia.org/r/129674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4fd92215771eb6155b64a6a35680a42e27f02a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Partial revert memcached config for labs until twemproxy upd... - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/129674 Change subject: Partial revert memcached config for labs until twemproxy update is remerged .. Partial revert memcached config for labs until twemproxy update is remerged Change-Id: Ic4fd92215771eb6155b64a6a35680a42e27f02a8 --- M wmf-config/mc-labs.php M wmf-config/mc.php 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/129674/1 diff --git a/wmf-config/mc-labs.php b/wmf-config/mc-labs.php index e395c05..08f3210 100644 --- a/wmf-config/mc-labs.php +++ b/wmf-config/mc-labs.php @@ -28,7 +28,11 @@ 0 = '10.68.17.69:11211', # deployment-memc04.eqiad 1 = '10.68.17.71:11211', # deployment-memc05.eqiad ) - : array( '127.0.0.1' ) + // : array( '127.0.0.1' ) // TODO: + : array( + 0 = '10.68.16.14:11211', # deployment-memc02.eqiad + 1 = '10.68.16.15:11211', # deployment-memc03.eqiad + ) ), 'retry_timeout' = 1, ); diff --git a/wmf-config/mc.php b/wmf-config/mc.php index 55e0db5..2b6ac66 100644 --- a/wmf-config/mc.php +++ b/wmf-config/mc.php @@ -43,7 +43,7 @@ '10.64.0.192', # mc1013 '10.64.0.193', # mc1014 '10.64.0.194', # mc1015 - '10.64.0.195', # mc1015 + '10.64.0.195', # mc1016 ) ); ***/ -- To view, visit https://gerrit.wikimedia.org/r/129674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4fd92215771eb6155b64a6a35680a42e27f02a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] turn ircecho into a parameterized class - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129676
Change subject: turn ircecho into a parameterized class
..
turn ircecho into a parameterized class
in I6e5d832c9 I moved the variables for
it out of the node level, so they are not set
in site.pp anymore but instead in a role class.
this was to make it a role that beta can apply
on labs
but as Alex pointed out there it introduced
a regression for puppet3 compat. as suggested,
turn ircecho into a parameterized class instead
Change-Id: Ic3bd7c82635dfd1c4c85ee18827f089527a87975
---
M manifests/role/echoirc.pp
M modules/ircecho/manifests/init.pp
M modules/ircecho/templates/default.erb
3 files changed, 21 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/129676/1
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
index a82e768..5980397 100644
--- a/manifests/role/echoirc.pp
+++ b/manifests/role/echoirc.pp
@@ -19,7 +19,11 @@
}
}
-include ircecho
+class { '::ircecho':
+ircecho_logs= $ircecho_logs,
+ircecho_nick= $ircecho_nick,
+$ircecho_server = $ircecho_server,
+ }
# bug 26784 - IRC bots process need nagios monitoring
nrpe::monitor_service { 'ircecho':
diff --git a/modules/ircecho/manifests/init.pp
b/modules/ircecho/manifests/init.pp
index f9464f5..8e7b032 100644
--- a/modules/ircecho/manifests/init.pp
+++ b/modules/ircecho/manifests/init.pp
@@ -1,16 +1,18 @@
# IRC echo class
-
-class ircecho {
-
-# To use this class, you must define some variables; here's an example
-# (leading hashes on channel names are added for you if missing):
-# $ircecho_logs = {
-#/var/log/nagios/irc.log =
-#[wikimedia-operations,#wikimedia-tech],
-#/var/log/nagios/irc2.log = #irc2,
-# }
-# $ircecho_nick = nagios-wm
-# $ircecho_server = chat.freenode.net
+# To use this class, you must define some parameters; here's an example
+# (leading hashes on channel names are added for you if missing):
+# $ircecho_logs = {
+# /var/log/nagios/irc.log =
+# [wikimedia-operations,#wikimedia-tech],
+# /var/log/nagios/irc2.log = #irc2,
+# }
+# $ircecho_nick = icinga-wm
+# $ircecho_server = chat.freenode.net
+class ircecho (
+$ircecho_logs,
+$ircecho_nick,
+$ircecho_server = 'chat.freenode.net',
+) {
package { 'ircecho':
ensure = present,
diff --git a/modules/ircecho/templates/default.erb
b/modules/ircecho/templates/default.erb
index 4e933da..fbef16d 100644
--- a/modules/ircecho/templates/default.erb
+++ b/modules/ircecho/templates/default.erb
@@ -50,6 +50,6 @@
# This is a POSIX shell fragment
#
INFILE=%= infile(@ircecho_logs) %
-NICK=%= @ircecho_nick %
+NICK=%= scope.lookupvar('ircecho::ircecho_nick') %
CHANS=%= chans(@ircecho_logs) %
-SERVER=%= @ircecho_server %
+SERVER=%= scope.lookupvar('ircecho::ircecho_server') %
--
To view, visit https://gerrit.wikimedia.org/r/129676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3bd7c82635dfd1c4c85ee18827f089527a87975
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove spurious whitespace in the spamblacklist string - change (apps...wikipedia)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/129677 Change subject: Remove spurious whitespace in the spamblacklist string .. Remove spurious whitespace in the spamblacklist string Change-Id: Iafff51e59909313ad44311dcd04b521810b7a637 --- M wikipedia/res/values/strings.xml 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/77/129677/1 diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 1ba9487..9b2d905 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -128,7 +128,5 @@ string name=edit_save_action_ip_descriptionYour edits will be publicly attributed to your IP address, which changes frequently/string string name=preference_title_eventlogging_opt_inSend usage reports/string string name=preference_summary_eventlogging_opt_inAllow Wikimedia to collect information about how you use the app to make the app better/string -string name=editing_error_spamblacklistLinks from blocked domains (%s) detected. Please remove them and try -again. -/string +string name=editing_error_spamblacklistLinks from blocked domains (%s) detected. Please remove them and try again./string /resources -- To view, visit https://gerrit.wikimedia.org/r/129677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iafff51e59909313ad44311dcd04b521810b7a637 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow user-defined path for compiled templates. - change (mediawiki...Widgets)
Yaron Koren has submitted this change and it was merged.
Change subject: Allow user-defined path for compiled templates.
..
Allow user-defined path for compiled templates.
This allows the Widgets plugin to be used in wikifarms and keeps
compatibility with previous versions; solves bug 37678.
Change-Id: I4651f3fc04f09ca442608f58c1b379430f752d57
---
M WidgetRenderer.php
M Widgets.php
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
diff --git a/WidgetRenderer.php b/WidgetRenderer.php
index be5ad33..e5a9647 100644
--- a/WidgetRenderer.php
+++ b/WidgetRenderer.php
@@ -16,12 +16,12 @@
}
public static function renderWidget( $parser, $widgetName ) {
- global $IP;
+ global $IP, $wgWidgetsCompileDir;
$smarty = new Smarty;
$smarty-left_delimiter = '!--{';
$smarty-right_delimiter = '}--';
- $smarty-compile_dir =
$IP/extensions/Widgets/compiled_templates/;
+ $smarty-compile_dir = $wgWidgetsCompileDir;
// registering custom Smarty plugins
$smarty-addPluginsDir(
$IP/extensions/Widgets/smarty_plugins/ );
diff --git a/Widgets.php b/Widgets.php
index 576441c..7a0efd9 100644
--- a/Widgets.php
+++ b/Widgets.php
@@ -47,6 +47,9 @@
// Set this to true to use FlaggedRevs extension's stable version for widget
security
$wgWidgetsUseFlaggedRevs = false;
+// Set a default directory for storage of compiled templates
+$wgWidgetsCompileDir = $IP/extensions/Widgets/compiled_templates/;
+
$dir = dirname( __FILE__ ) . '/';
// Initialize Smarty
--
To view, visit https://gerrit.wikimedia.org/r/129170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4651f3fc04f09ca442608f58c1b379430f752d57
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Widgets
Gerrit-Branch: master
Gerrit-Owner: Ptaff wikimedia.wa...@ptaff.ca
Gerrit-Reviewer: Ptaff wikimedia.wa...@ptaff.ca
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improved experimental highlighter settings - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129678
Change subject: Improved experimental highlighter settings
..
Improved experimental highlighter settings
These settings will improve quality of snippets. The tests will only pass
with the new 0.0.5 release of the highlighter though.
Bug: 64259
Change-Id: If970dea018eb631af13f561e33f11bbf1d2395b2
(cherry picked from commit ab93e0f2984f94d805c51eb04c89b2acd3a6ee1f)
---
M includes/ResultsType.php
M tests/browser/features/highlighting.feature
2 files changed, 19 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/78/129678/1
diff --git a/includes/ResultsType.php b/includes/ResultsType.php
index 7e0b8ff..e8df16e 100644
--- a/includes/ResultsType.php
+++ b/includes/ResultsType.php
@@ -188,20 +188,20 @@
'top_scoring' = true,
'boost_before' = array(
// Note these values are super
arbitrary right now.
- '20' = 8,
- '50' = 7,
- '200' = 4,
- '1000' = 2,
+ '20' = 2,
+ '50' = 1.8,
+ '200' = 1.5,
+ '1000' = 1.2,
),
- // Since the best fragments are
typically at the beginning of the article
- // any way we can relatively safely
stop searching for matches after 50
- // fragments. This should help with
really crazy documents, say 10MB of
- // d d. Without this we'll scan out
all the ds on a search for d.
- // With it, only the first 50.
- 'max_fragments_scored' = 50,
+ // We should set a limit on the number
of fragments we try because if we
+ // don't then we'll hit really crazy
documents, say 10MB of d d. This'll
+ // keep us from scanning more then the
first couple thousand of them.
+ // Setting this too low (like 50) can
bury good snippets if the search
+ // contains common words.
+ 'max_fragments_scored' = 5000,
),
);
- // If there isn't a match just return some of the the
first few sentences .
+ // If there isn't a match just return some of the the
first few characters.
$text = $singleFragment;
$text[ 'no_match_size' ] = 100;
} else {
diff --git a/tests/browser/features/highlighting.feature
b/tests/browser/features/highlighting.feature
index d9c2d15..6b22b98 100644
--- a/tests/browser/features/highlighting.feature
+++ b/tests/browser/features/highlighting.feature
@@ -18,12 +18,9 @@
| template:test pickle | Template:Template *Test* | *pickles*
|
# Verify highlighting the presence of accent squashing
| Africa test| *África* | for *testing*
|
-# Verify highlighting on large pages (Bug 52680).
-# Bug 64259
-# | discuss problems of social and cultural importance | Rashidun
Caliphate | the faithful gathered to *discuss problems of social and cultural
importance*. During the caliphate of |
-# | discuss problems of social and cultural importance~ | Rashidun
Caliphate | the faithful gathered to *discuss problems of social and cultural
importance*. During the caliphate of |
-| discuss problems of social and cultural importance | Rashidun
Caliphate | first Khalifa Rasul Allah (Successor *of* the Messenger *of* God),
*and* embarked on campaigns to propagate |
-| discuss problems of social and cultural importance~ | Rashidun
Caliphate | first Khalifa Rasul Allah (Successor *of* the Messenger *of* God),
*and* embarked on campaigns to propagate |
+# Verify highlighting on large pages.
+| discuss problems of social and cultural importance | Rashidun
Caliphate | gathered to *discuss* *problems* *of* *social* *and* *cultural*
*importance*. During the caliphate *of* Umar as many |
+| discuss problems of social and cultural importance~ | Rashidun
Caliphate | gathered to *discuss*
[MediaWiki-commits] [Gerrit] Add .gitreview file for easier gerrit setup of that repo - change (analytics...config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/129679 Change subject: Add .gitreview file for easier gerrit setup of that repo .. Add .gitreview file for easier gerrit setup of that repo Change-Id: Ic1f5c71426faf68f7a57ddbb6cea35e57541bf53 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia/config refs/changes/79/129679/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..9e37489 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=analytics/multimedia/config.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/129679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1f5c71426faf68f7a57ddbb6cea35e57541bf53 Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia/config Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .gitreview file for easier gerrit setup of that repo - change (analytics/multimedia)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/129680 Change subject: Add .gitreview file for easier gerrit setup of that repo .. Add .gitreview file for easier gerrit setup of that repo Change-Id: I1cd93010f4c1c3209bef6b7e1e5be9a31a18481b --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia refs/changes/80/129680/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..0309ef6 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=analytics/multimedia.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/129680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cd93010f4c1c3209bef6b7e1e5be9a31a18481b Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove unused IRC bot from openstack - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129681
Change subject: remove unused IRC bot from openstack
..
remove unused IRC bot from openstack
this used to be labs-storage-wm,
likely used to check glusterfs,
but we don't use it anymore
and since it included role::echoirc
it would have been broken since
I6e5d832c92
instead of making another role
just delete it
Change-Id: I1c7dd567ecf7e10efde6ef4373121e057a62f86b
---
M manifests/openstack.pp
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/129681/1
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index f5b0121..0bd1f0f 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -150,11 +150,6 @@
}
class openstack::project-storage-service {
-$ircecho_logs = { /var/lib/glustermanager/manage-volumes.log =
wikimedia-labs }
-$ircecho_nick = labs-storage-wm
-$ircecho_server = chat.freenode.net
-
-include role::echoirc
generic::upstart_job{ manage-volumes:
require = Package[glusterfs-server],
--
To view, visit https://gerrit.wikimedia.org/r/129681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c7dd567ecf7e10efde6ef4373121e057a62f86b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore compatibility with older MediaWikis - change (mediawiki...SemanticForms)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129682
Change subject: Restore compatibility with older MediaWikis
..
Restore compatibility with older MediaWikis
Follow-up to Iec9cdb1b8. I didn't notice this was a hook handler,
and recent versions of MediaWiki no longer need a return value
from hooks.
Change-Id: Ia8306dd7e882ea4892c4c424fe38d4b31245a9a4
---
M includes/SF_FormUtils.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/82/129682/1
diff --git a/includes/SF_FormUtils.php b/includes/SF_FormUtils.php
index 78b79e6..51824dd 100644
--- a/includes/SF_FormUtils.php
+++ b/includes/SF_FormUtils.php
@@ -505,12 +505,14 @@
* Deletes the form definition associated with the given wiki page
* from the main cache.
*
+* Hooks: ArticlePurge, ArticleSave
+*
* @param Page $wikipage
-* @return Bool
+* @return bool
*/
public static function purgeCache( Page $wikipage ) {
if ( !$wikipage-getTitle()-inNamespace( SF_NS_FORM ) ) {
- return;
+ return true;
}
$cache = self::getFormCache();
@@ -520,7 +522,7 @@
$listOfFormKeys = $cache-get( $cacheKeyForList );
if ( !is_array( $cacheKeyForList ) ) {
- return;
+ return true;
}
// delete stored datasets
--
To view, visit https://gerrit.wikimedia.org/r/129682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8306dd7e882ea4892c4c424fe38d4b31245a9a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.textSelection: Don't throw errors on empty collections - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129683
Change subject: jquery.textSelection: Don't throw errors on empty collections
..
jquery.textSelection: Don't throw errors on empty collections
All jQuery functions just do nothing or return empty values when
called on an empty collection (e.g. `$()`), the ones defined in this
module should behave in the same way.
This came to light when a change in WikiEditor combined with lousy
on-wiki scripts caused this code path to be called, breaking various
gadgets.
Bug: 64289
Change-Id: Ib97f47ef1d66420682bd429c9c12e66c3392e77d
---
M resources/src/jquery/jquery.textSelection.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/83/129683/1
diff --git a/resources/src/jquery/jquery.textSelection.js
b/resources/src/jquery/jquery.textSelection.js
index 156b314..d877491 100644
--- a/resources/src/jquery/jquery.textSelection.js
+++ b/resources/src/jquery/jquery.textSelection.js
@@ -70,7 +70,7 @@
var retval, range,
el = this.get( 0 );
- if ( $( el ).is( ':hidden' ) ) {
+ if ( !el || $( el ).is( ':hidden' ) ) {
retval = '';
} else if ( document.selection
document.selection.createRange ) {
activateElementOnIE( el );
@@ -279,7 +279,7 @@
// Range containing text after
the selection
postRange;
- if ( document.selection
document.selection.createRange ) {
+ if ( e document.selection
document.selection.createRange ) {
// IE doesn't properly report
non-selected caret position through
// the selection ranges when
textarea isn't focused. This can
// lead to saving a bogus empty
selection, which then screws up
@@ -349,7 +349,7 @@
} while ( ( !preFinished ||
!periFinished || !postFinished ) );
caretPos = rawPreText.replace(
/\r\n/g, '\n' ).length;
endPos = caretPos +
rawPeriText.replace( /\r\n/g, '\n' ).length;
- } else if ( e.selectionStart ||
e.selectionStart === 0 ) {
+ } else if ( e e.selectionStart ||
e.selectionStart === 0 ) {
// Firefox support
caretPos = e.selectionStart;
endPos = e.selectionEnd;
--
To view, visit https://gerrit.wikimedia.org/r/129683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib97f47ef1d66420682bd429c9c12e66c3392e77d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove unused IRC bot from openstack - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: remove unused IRC bot from openstack
..
remove unused IRC bot from openstack
this used to be labs-storage-wm,
likely used to check glusterfs,
but we don't use it anymore
and since it included role::echoirc
it would have been broken since
I6e5d832c92
instead of making another role
just delete it
Change-Id: I1c7dd567ecf7e10efde6ef4373121e057a62f86b
---
M manifests/openstack.pp
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index f5b0121..0bd1f0f 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -150,11 +150,6 @@
}
class openstack::project-storage-service {
-$ircecho_logs = { /var/lib/glustermanager/manage-volumes.log =
wikimedia-labs }
-$ircecho_nick = labs-storage-wm
-$ircecho_server = chat.freenode.net
-
-include role::echoirc
generic::upstart_job{ manage-volumes:
require = Package[glusterfs-server],
--
To view, visit https://gerrit.wikimedia.org/r/129681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c7dd567ecf7e10efde6ef4373121e057a62f86b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore compatibility with older MediaWikis - change (mediawiki...SemanticForms)
jenkins-bot has submitted this change and it was merged.
Change subject: Restore compatibility with older MediaWikis
..
Restore compatibility with older MediaWikis
Follow-up to Iec9cdb1b8. I didn't notice this was a hook handler,
and recent versions of MediaWiki no longer need a return value
from hooks.
Change-Id: Ia8306dd7e882ea4892c4c424fe38d4b31245a9a4
---
M includes/SF_FormUtils.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SF_FormUtils.php b/includes/SF_FormUtils.php
index 78b79e6..51824dd 100644
--- a/includes/SF_FormUtils.php
+++ b/includes/SF_FormUtils.php
@@ -505,12 +505,14 @@
* Deletes the form definition associated with the given wiki page
* from the main cache.
*
+* Hooks: ArticlePurge, ArticleSave
+*
* @param Page $wikipage
-* @return Bool
+* @return bool
*/
public static function purgeCache( Page $wikipage ) {
if ( !$wikipage-getTitle()-inNamespace( SF_NS_FORM ) ) {
- return;
+ return true;
}
$cache = self::getFormCache();
@@ -520,7 +522,7 @@
$listOfFormKeys = $cache-get( $cacheKeyForList );
if ( !is_array( $cacheKeyForList ) ) {
- return;
+ return true;
}
// delete stored datasets
--
To view, visit https://gerrit.wikimedia.org/r/129682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8306dd7e882ea4892c4c424fe38d4b31245a9a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add myself to root on labs instances - change (labs/private)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/129684 Change subject: add myself to root on labs instances .. add myself to root on labs instances in the past i kept adding myself to projects to debug things, using my wikitech admin powers, once i give myself project admin i can sudo -s on any instance but f.e. in cases where there are issues with home dirs / file system, the regular users can't login but roots can, since /root is local and it is just very useful to be able to root into any instance without having to add yourself Change-Id: Ibdb5f01e53f80596f40b3009cbbc6591f4c536a5 --- M files/ssh/root-authorized-keys 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/84/129684/1 diff --git a/files/ssh/root-authorized-keys b/files/ssh/root-authorized-keys index 73b9d16..dba09c9 100644 --- a/files/ssh/root-authorized-keys +++ b/files/ssh/root-authorized-keys @@ -10,3 +10,5 @@ ssh-rsa B3NzaC1yc2EDAQABAAABAQDDcP8oXoJNHBmTowY1DlRWhK7N62sm3/9shxiRRSsdszLQ2erlYnyf+BTlIWsHMdZ07QjFJLGyLpt+KZxiYzS6ySUzRA4Ko/M6oziVM27woq7eOT7M6SvcbTXYoBc1IKz7ALl82duRKTakND8Vg3ZE0McMxopCa2EOx7CJlTjwNYRlu/wsfm6TbtmZ3fCKs+MnhIH+zn8SB0kejdAH1CFu971T7evZyB6AFH1+8n11JSX92VnNh4kV4Y6fHtDiFMivmWh8sI8XIVH6G1RLCwQp1I08VJ+C1kFDS/B1+C2q9akHt4ipcdlFFUX2q36Dw/AM5K5epN4ZUaWaQ4W9mRGR ariel@trouble.localdomain # Alex ssh-rsa B3NzaC1yc2EDAQABAAACAQCVsc7DioQgShGqN7VhJlLbBqCzd+/uzs2q99HVPhx3yFRGeBBiF8Z0Kl2gThd1Hh/GvqfSglNLODNgpXIzAhX4I7uiuS4c757jj6LTtHrGTkmmOlGoRgUVz/njZMEckG/6BHF9LPzSeXwasDLPgq/jQUgA4FjEiwBukCTklna5CzBYZIBHfAg4N+sYNCOlk+/On9uX5/3Whm8RE/g8bI4PuFmYn4B9zm0eqMaq4Uw6ENZqB/H7wPjpSEf32h65J7pKTfhcLwAwKBXNhfy5qx+mszwFynsWr8kX0EtIuM++snalWl1rJ3xk/O/cNrZHRJNFc4fYtACRhnaOwJhjOQ8Cc6peL0Yw9GG+2LMwzG8FHic33ZBnwI0IMWD/6NVamv5R2qowQ3ARd6MVViKHbf+xXxp2GQR6JF5Pca4R9YZQghDLFFxxqSHyKVa1TYtC7ZL/pTEkCSKtgNbxDXrv+7P6NrQYkKf32RZ+5ydxIOUlDUKSnmmdu4GPzAqVA4q2lbo+VCal6TTIcdBLsBggM2ORgHzjKZUdWLLsUo5uoIU59vLUrwcjcjdXc3PN2vwhxwY9UmS7wbmzIiMb1Y38lMnMggGiZknCs1SLf7c3rO9wUuRjAeRO8Heqe5J65GrByI6OWgt+tkeHEPaJ1Wg+5G2E4374oQBDn9/4MhYd1Uvh2Q== akosiaris@labs +# Daniel +ssh-rsa B3NzaC1yc2EDAQABAAACAQDQId1GdtnPZwQhXbqLkkCjdRjfABprpFmnMI6eszhCSF4QjMUh0F9uUMTWyd8zBYm3LcQK05YN/fB1xj35BKb1CIq7b3PiJAG7djIBvw5Fhi1KwEmny8RQYG0+4qYsHyMT2hdyLlskp3kJyYlf9Zs/mxEuTxJ/XUVGXfojb4LvWDWDcpMiV8mHyrL3gqJBSpW5JHWDGe3IjSCehMkjMDebavsRu/JlHJwWZNIJRts+1rmrd6QY4JeBeXcQUakyUQs9UADttTjKCtHbOx/bVAh0gFO9ydkZm1x/0iO+EI7BfBs8L1Kec8jPCYmqrqyPxKtfpVbOFMPDKvC/j1KoXTFD4ykBAnucVLrNUFVA5KAmrE81Am8eTkU1ZyXvOxF6ft9Q61Wml+s18z0euXgPaH/qiyzoTCdOn+wzPhMMXbIq3t18bm3vGvW2uMf17oFqQN22QiaExIlDRaR3sZc9u+QV/kYLIMilQW8xx5/WLTxq8hJg7Fgag+hv0AnzsBrh1PgmM4lvaPbCakcllkGkHXRIKUnihhP8fDc8xJWX9KLTt6wDi1fFWb/OdQzGYwJzt7D095gcqtYI6FQMZSlFl87KovO0b9HASTSLTAh/OLjGtCHHoOsvqIVJ7t8mHGSLjik09kZ5tmF1jK++75sDD04r2AyFbYPdbVKJDw7cai7V/w== mutante@vanguard -- To view, visit https://gerrit.wikimedia.org/r/129684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdb5f01e53f80596f40b3009cbbc6591f4c536a5 Gerrit-PatchSet: 1 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable bayes_auto_learn for iodine to help rebuild the db - change (operations/puppet)
Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129685
Change subject: enable bayes_auto_learn for iodine to help rebuild the db
..
enable bayes_auto_learn for iodine to help rebuild the db
Change-Id: I0f48c7c46ff58a8dde29d7f7ce71acc17c610cc1
---
M manifests/role/otrs.pp
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/129685/1
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index a22efe4..ceb713d 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -8,6 +8,7 @@
include standard-noexim
include webserver::apache
+include nrpe
include network::constants
generic::systemuser { 'otrs':
@@ -75,7 +76,9 @@
class { 'spamassassin':
required_score = '3.5',
use_bayes = '1',
-bayes_auto_learn = '0',
+# 20140425 jgreen enabled bayes_auto_learn to populate the bayes db
+# after a bug(?) corrupted it
+bayes_auto_learn = '1',
short_report_template = 'true',
spamd_user = 'otrs',
spamd_group = 'otrs',
--
To view, visit https://gerrit.wikimedia.org/r/129685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f48c7c46ff58a8dde29d7f7ce71acc17c610cc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add myself to root on labs instances - change (labs/private)
Dzahn has submitted this change and it was merged. Change subject: add myself to root on labs instances .. add myself to root on labs instances in the past i kept adding myself to projects to debug things, using my wikitech admin powers, once i give myself project admin i can sudo -s on any instance but f.e. in cases where there are issues with home dirs / file system, the regular users can't login but roots can, since /root is local and it is just very useful to be able to root into any instance without having to add yourself Change-Id: Ibdb5f01e53f80596f40b3009cbbc6591f4c536a5 --- M files/ssh/root-authorized-keys 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/files/ssh/root-authorized-keys b/files/ssh/root-authorized-keys index 73b9d16..dba09c9 100644 --- a/files/ssh/root-authorized-keys +++ b/files/ssh/root-authorized-keys @@ -10,3 +10,5 @@ ssh-rsa B3NzaC1yc2EDAQABAAABAQDDcP8oXoJNHBmTowY1DlRWhK7N62sm3/9shxiRRSsdszLQ2erlYnyf+BTlIWsHMdZ07QjFJLGyLpt+KZxiYzS6ySUzRA4Ko/M6oziVM27woq7eOT7M6SvcbTXYoBc1IKz7ALl82duRKTakND8Vg3ZE0McMxopCa2EOx7CJlTjwNYRlu/wsfm6TbtmZ3fCKs+MnhIH+zn8SB0kejdAH1CFu971T7evZyB6AFH1+8n11JSX92VnNh4kV4Y6fHtDiFMivmWh8sI8XIVH6G1RLCwQp1I08VJ+C1kFDS/B1+C2q9akHt4ipcdlFFUX2q36Dw/AM5K5epN4ZUaWaQ4W9mRGR ariel@trouble.localdomain # Alex ssh-rsa B3NzaC1yc2EDAQABAAACAQCVsc7DioQgShGqN7VhJlLbBqCzd+/uzs2q99HVPhx3yFRGeBBiF8Z0Kl2gThd1Hh/GvqfSglNLODNgpXIzAhX4I7uiuS4c757jj6LTtHrGTkmmOlGoRgUVz/njZMEckG/6BHF9LPzSeXwasDLPgq/jQUgA4FjEiwBukCTklna5CzBYZIBHfAg4N+sYNCOlk+/On9uX5/3Whm8RE/g8bI4PuFmYn4B9zm0eqMaq4Uw6ENZqB/H7wPjpSEf32h65J7pKTfhcLwAwKBXNhfy5qx+mszwFynsWr8kX0EtIuM++snalWl1rJ3xk/O/cNrZHRJNFc4fYtACRhnaOwJhjOQ8Cc6peL0Yw9GG+2LMwzG8FHic33ZBnwI0IMWD/6NVamv5R2qowQ3ARd6MVViKHbf+xXxp2GQR6JF5Pca4R9YZQghDLFFxxqSHyKVa1TYtC7ZL/pTEkCSKtgNbxDXrv+7P6NrQYkKf32RZ+5ydxIOUlDUKSnmmdu4GPzAqVA4q2lbo+VCal6TTIcdBLsBggM2ORgHzjKZUdWLLsUo5uoIU59vLUrwcjcjdXc3PN2vwhxwY9UmS7wbmzIiMb1Y38lMnMggGiZknCs1SLf7c3rO9wUuRjAeRO8Heqe5J65GrByI6OWgt+tkeHEPaJ1Wg+5G2E4374oQBDn9/4MhYd1Uvh2Q== akosiaris@labs +# Daniel +ssh-rsa B3NzaC1yc2EDAQABAAACAQDQId1GdtnPZwQhXbqLkkCjdRjfABprpFmnMI6eszhCSF4QjMUh0F9uUMTWyd8zBYm3LcQK05YN/fB1xj35BKb1CIq7b3PiJAG7djIBvw5Fhi1KwEmny8RQYG0+4qYsHyMT2hdyLlskp3kJyYlf9Zs/mxEuTxJ/XUVGXfojb4LvWDWDcpMiV8mHyrL3gqJBSpW5JHWDGe3IjSCehMkjMDebavsRu/JlHJwWZNIJRts+1rmrd6QY4JeBeXcQUakyUQs9UADttTjKCtHbOx/bVAh0gFO9ydkZm1x/0iO+EI7BfBs8L1Kec8jPCYmqrqyPxKtfpVbOFMPDKvC/j1KoXTFD4ykBAnucVLrNUFVA5KAmrE81Am8eTkU1ZyXvOxF6ft9Q61Wml+s18z0euXgPaH/qiyzoTCdOn+wzPhMMXbIq3t18bm3vGvW2uMf17oFqQN22QiaExIlDRaR3sZc9u+QV/kYLIMilQW8xx5/WLTxq8hJg7Fgag+hv0AnzsBrh1PgmM4lvaPbCakcllkGkHXRIKUnihhP8fDc8xJWX9KLTt6wDi1fFWb/OdQzGYwJzt7D095gcqtYI6FQMZSlFl87KovO0b9HASTSLTAh/OLjGtCHHoOsvqIVJ7t8mHGSLjik09kZ5tmF1jK++75sDD04r2AyFbYPdbVKJDw7cai7V/w== mutante@vanguard -- To view, visit https://gerrit.wikimedia.org/r/129684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdb5f01e53f80596f40b3009cbbc6591f4c536a5 Gerrit-PatchSet: 1 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable bayes_auto_learn for iodine to help rebuild the db - change (operations/puppet)
Jgreen has submitted this change and it was merged.
Change subject: enable bayes_auto_learn for iodine to help rebuild the db
..
enable bayes_auto_learn for iodine to help rebuild the db
Change-Id: I0f48c7c46ff58a8dde29d7f7ce71acc17c610cc1
---
M manifests/role/otrs.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index a22efe4..934da8b 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -75,7 +75,9 @@
class { 'spamassassin':
required_score = '3.5',
use_bayes = '1',
-bayes_auto_learn = '0',
+# 20140425 jgreen enabled bayes_auto_learn to populate the bayes db
+# after a bug(?) corrupted it
+bayes_auto_learn = '1',
short_report_template = 'true',
spamd_user = 'otrs',
spamd_group = 'otrs',
--
To view, visit https://gerrit.wikimedia.org/r/129685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f48c7c46ff58a8dde29d7f7ce71acc17c610cc1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Redirect metrics.wikimedia.org to Wikimetrics - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Redirect metrics.wikimedia.org to Wikimetrics
..
Redirect metrics.wikimedia.org to Wikimetrics
While the domain has been removed in
59eab3e4b248405d7a08dc3d7e5a35a7fa21d470, search engines and some old
documentation still refer to it. So we redirect any requests to those
domains to the replacement service “Wikimetrics”.
Since the certificate for metrics.wikimedia.org has not been upgraded
since the Heartbleed vulnerability, we cannot reuse the old
certificate, and hence only redirect http traffic for now.
Bug: 64276
Change-Id: I43f978ad3db8076951523a247a12a06a10a3f73e
---
M manifests/misc/statistics.pp
M manifests/role/statistics.pp
A templates/apache/sites/metrics.wikimedia.org.erb
3 files changed, 61 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index ba08915..4dbe66a 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -358,6 +358,38 @@
}
}
+# mertics.wikimedia.org and metrics-api.wikimedia.org
+# They should just redirect to Wikimetrics
+#
+class misc::statistics::sites::metrics {
+require misc::statistics::user
+
+$site_name = metrics.wikimedia.org
+$redirect_target = https://metrics.wmflabs.org/;
+
+include webserver::apache
+webserver::apache::module { alias: }
+
+# Set up the VirtualHost
+file { /etc/apache2/sites-available/$site_name:
+content = template(apache/sites/${site_name}.erb),
+require = [Class[webserver::apache],
Webserver::Apache::Module['alias']],
+notify = Class['webserver::apache::service'],
+}
+file { /etc/apache2/sites-enabled/$site_name:
+ensure = link,
+target = /etc/apache2/sites-available/${site_name},
+require = File[/etc/apache2/sites-available/${site_name}],
+notify = Class['webserver::apache::service'],
+}
+
+# make access and error log for metrics-api readable by wikidev group
+file { [/var/log/apache2/access.metrics.log,
/var/log/apache2/error.metrics.log]:
+group = wikidev,
+require = File[/etc/apache2/sites-enabled/$site_name],
+}
+}
+
# installs MonogDB
class misc::statistics::db::mongo {
include misc::statistics::base
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 6f43742..c127434 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -42,6 +42,8 @@
misc::statistics::sites::stats,
# community-analytics.wikimedia.org
misc::statistics::sites::community_analytics,
+ # metrics.wikimedia,.org and metrics-api.wikimedia.org
+ misc::statistics::sites::metrics,
# reportcard.wikimedia.org
misc::statistics::sites::reportcard,
# rsync public datasets from stat1003 hourly
diff --git a/templates/apache/sites/metrics.wikimedia.org.erb
b/templates/apache/sites/metrics.wikimedia.org.erb
new file mode 100644
index 000..9bac6be
--- /dev/null
+++ b/templates/apache/sites/metrics.wikimedia.org.erb
@@ -0,0 +1,27 @@
+# Note: This file is managed by Puppet.
+%
+# ERb template variables:
+#
+# site_name
+# redirect_target
+#
+-%
+
+VirtualHost *:80
+ # %= @site_name %, and metrics-api.wikimedia.org are
+ # deprecated. The services it provided are now available through
+ # Wikimetrics.
+ #
+ # We keep the domain around only because old documentation and
+ # search engines still refer to it.
+
+ ServerName %= @site_name %
+ ServerAlias metrics-api.wikimedia.org
+ ServerAdmin n...@wikimedia.org
+
+ Redirect permanent / %= @redirect_target %
+
+ ErrorLog /var/log/apache2/error.metrics.log
+ LogLevel warn
+ CustomLog /var/log/apache2/access.metrics.log combined
+/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/129660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43f978ad3db8076951523a247a12a06a10a3f73e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Normalize user/pass for language-browsertests instance - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/129686 Change subject: Normalize user/pass for language-browsertests instance .. Normalize user/pass for language-browsertests instance Get rid of Bttesting in favor of a Selenium_user with the same password being used on the beta cluster. Email address set to Željko one. Change-Id: I10c1e65fc7420b69127175d0b8ca9ce2a9355264 --- M docs/jenkins.md M jobs.yaml 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/86/129686/1 diff --git a/docs/jenkins.md b/docs/jenkins.md index 81fda03..dd5d506 100644 --- a/docs/jenkins.md +++ b/docs/jenkins.md @@ -13,7 +13,6 @@ ## Environment variables - Jenkins Manage Jenkins Configure System Global properties Environment variables List of key-value pairs name - - MEDIAWIKI_PASSWORD_BTTESTING_WMFLABS_ORG - MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET - MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET - MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG diff --git a/jobs.yaml b/jobs.yaml index cfbf635..5835753 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -268,9 +268,9 @@ name: UniversalLanguageSelector-language-browsertests.wmflabs.org browser: firefox folder: tests -mediawiki_password_variable: MEDIAWIKI_PASSWORD_BTTESTING_WMFLABS_ORG +mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: language-browsertests.wmflabs.org -mediawiki_user: Bttesting +mediawiki_user: Selenium_user platform: linux recipients: *emails-ULS repository: mediawiki/extensions/UniversalLanguageSelector -- To view, visit https://gerrit.wikimedia.org/r/129686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10c1e65fc7420b69127175d0b8ca9ce2a9355264 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove spurious whitespace in the spamblacklist string - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Remove spurious whitespace in the spamblacklist string .. Remove spurious whitespace in the spamblacklist string Change-Id: Iafff51e59909313ad44311dcd04b521810b7a637 --- M wikipedia/res/values/strings.xml 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 1ba9487..9b2d905 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -128,7 +128,5 @@ string name=edit_save_action_ip_descriptionYour edits will be publicly attributed to your IP address, which changes frequently/string string name=preference_title_eventlogging_opt_inSend usage reports/string string name=preference_summary_eventlogging_opt_inAllow Wikimedia to collect information about how you use the app to make the app better/string -string name=editing_error_spamblacklistLinks from blocked domains (%s) detected. Please remove them and try -again. -/string +string name=editing_error_spamblacklistLinks from blocked domains (%s) detected. Please remove them and try again./string /resources -- To view, visit https://gerrit.wikimedia.org/r/129677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafff51e59909313ad44311dcd04b521810b7a637 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint/beta: set natfix for the labs shared proxy - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129687
Change subject: contint/beta: set natfix for the labs shared proxy
..
contint/beta: set natfix for the labs shared proxy
To save up public IP on labs, we have a shared proxy which has public IP
208.80.155.156 and private IP 10.68.16.65. We have some browsertests
running on Jenkins labs instance that runs against labs instance
maintained by other teams. So we better have to be able to reach them
directly.
Change-Id: I5886bee1ed3a667cd8492dbfe979519a4026fa82
---
M modules/beta/manifests/natfix.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/129687/1
diff --git a/modules/beta/manifests/natfix.pp b/modules/beta/manifests/natfix.pp
index a0b2fb2..61ddf2f 100644
--- a/modules/beta/manifests/natfix.pp
+++ b/modules/beta/manifests/natfix.pp
@@ -32,6 +32,10 @@
'deployment-cache-mobile03' = {public_ip = '208.80.155.139',
private_ip = '10.68.16.13' },
+# A wide variety of hosts are reachable via a public web proxy.
+'labs_shared_proxy' = {public_ip = '208.80.155.156',
+private_ip = '10.68.16.65'},
+
}
create_resources( 'beta::natdestrewrite', $nat_mappings )
--
To view, visit https://gerrit.wikimedia.org/r/129687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5886bee1ed3a667cd8492dbfe979519a4026fa82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing CreateAccountSuccessResult - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129689
Change subject: Add missing CreateAccountSuccessResult
..
Add missing CreateAccountSuccessResult
Change-Id: Icb3cf4d5ef657c12134f30f93c70efcb830e1516
---
A
wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountSuccessResult.java
1 file changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/89/129689/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountSuccessResult.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountSuccessResult.java
new file mode 100644
index 000..c563fe2
--- /dev/null
+++
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountSuccessResult.java
@@ -0,0 +1,44 @@
+package org.wikipedia.createaccount;
+
+import android.os.*;
+
+public class CreateAccountSuccessResult extends CreateAccountResult implements
Parcelable {
+private final String username;
+
+public CreateAccountSuccessResult(String username) {
+super(Success);
+this.username = username;
+}
+
+public String getUsername() {
+return username;
+}
+
+@Override
+public int describeContents() {
+return 0;
+}
+
+@Override
+public void writeToParcel(Parcel parcel, int i) {
+super.writeToParcel(parcel, i);
+parcel.writeString(username);
+}
+
+protected CreateAccountSuccessResult(Parcel in) {
+super(in);
+username = in.readString();
+}
+
+public static final CreatorCreateAccountSuccessResult CREATOR
+= new CreatorCreateAccountSuccessResult() {
+public CreateAccountSuccessResult createFromParcel(Parcel in) {
+return new CreateAccountSuccessResult(in);
+}
+
+public CreateAccountSuccessResult[] newArray(int size) {
+return new CreateAccountSuccessResult[size];
+}
+};
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/129689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb3cf4d5ef657c12134f30f93c70efcb830e1516
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BlueSpice] Add StateBar module - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [BlueSpice] Add StateBar module .. [BlueSpice] Add StateBar module Change-Id: Ic07a95fbefefdce92e3c95ef5b03a223a46ebb6e --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index b469b33..aedd57a 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -151,6 +151,12 @@ file = BlueSpiceFoundation/i18n/extjs-portal/%CODE%.json id = ext-bs-extjs-portal +Blue Spice - State Bar +id = ext-bs-statebar +descmsg = bs-statebar-desc +file = BlueSpiceExtensions/StateBar/i18n/%CODE%.json +optional = bs-statebar-viewtoggler + Blue Spice - Validator file = BlueSpiceFoundation/i18n/validator/%CODE%.json id = ext-bs-validator -- To view, visit https://gerrit.wikimedia.org/r/129688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic07a95fbefefdce92e3c95ef5b03a223a46ebb6e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BlueSpice] Add StateBar module - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/129688 Change subject: [BlueSpice] Add StateBar module .. [BlueSpice] Add StateBar module Change-Id: Ic07a95fbefefdce92e3c95ef5b03a223a46ebb6e --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/88/129688/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index b469b33..aedd57a 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -151,6 +151,12 @@ file = BlueSpiceFoundation/i18n/extjs-portal/%CODE%.json id = ext-bs-extjs-portal +Blue Spice - State Bar +id = ext-bs-statebar +descmsg = bs-statebar-desc +file = BlueSpiceExtensions/StateBar/i18n/%CODE%.json +optional = bs-statebar-viewtoggler + Blue Spice - Validator file = BlueSpiceFoundation/i18n/validator/%CODE%.json id = ext-bs-validator -- To view, visit https://gerrit.wikimedia.org/r/129688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic07a95fbefefdce92e3c95ef5b03a223a46ebb6e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Normalize user/pass for language-browsertests instance - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Normalize user/pass for language-browsertests instance .. Normalize user/pass for language-browsertests instance Get rid of Bttesting in favor of a Selenium_user with the same password being used on the beta cluster. Email address set to Željko one. Change-Id: I10c1e65fc7420b69127175d0b8ca9ce2a9355264 --- M docs/jenkins.md M jobs.yaml 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/jenkins.md b/docs/jenkins.md index 81fda03..dd5d506 100644 --- a/docs/jenkins.md +++ b/docs/jenkins.md @@ -13,7 +13,6 @@ ## Environment variables - Jenkins Manage Jenkins Configure System Global properties Environment variables List of key-value pairs name - - MEDIAWIKI_PASSWORD_BTTESTING_WMFLABS_ORG - MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET - MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET - MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG diff --git a/jobs.yaml b/jobs.yaml index cfbf635..5835753 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -268,9 +268,9 @@ name: UniversalLanguageSelector-language-browsertests.wmflabs.org browser: firefox folder: tests -mediawiki_password_variable: MEDIAWIKI_PASSWORD_BTTESTING_WMFLABS_ORG +mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: language-browsertests.wmflabs.org -mediawiki_user: Bttesting +mediawiki_user: Selenium_user platform: linux recipients: *emails-ULS repository: mediawiki/extensions/UniversalLanguageSelector -- To view, visit https://gerrit.wikimedia.org/r/129686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I10c1e65fc7420b69127175d0b8ca9ce2a9355264 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add another missing file - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129690
Change subject: Add another missing file
..
Add another missing file
Change-Id: Ie3e1cf5095164defba742b0d01a647d85449ba42
---
A wikipedia/src/main/java/org/wikipedia/editing/SpamBlacklistEditResult.java
1 file changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/90/129690/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/SpamBlacklistEditResult.java
b/wikipedia/src/main/java/org/wikipedia/editing/SpamBlacklistEditResult.java
new file mode 100644
index 000..43e8584
--- /dev/null
+++ b/wikipedia/src/main/java/org/wikipedia/editing/SpamBlacklistEditResult.java
@@ -0,0 +1,37 @@
+package org.wikipedia.editing;
+
+import android.os.*;
+
+public class SpamBlacklistEditResult extends EditingResult {
+private final String domain;
+public SpamBlacklistEditResult(String domain) {
+super(Failure);
+this.domain = domain;
+}
+
+protected SpamBlacklistEditResult(Parcel in) {
+super(in);
+domain = in.readString();
+}
+
+public String getDomain() {
+return domain;
+}
+
+@Override
+public void writeToParcel(Parcel dest, int flags) {
+super.writeToParcel(dest, flags);
+dest.writeString(domain);
+}
+
+public static final Parcelable.CreatorSpamBlacklistEditResult CREATOR
+= new Parcelable.CreatorSpamBlacklistEditResult() {
+public SpamBlacklistEditResult createFromParcel(Parcel in) {
+return new SpamBlacklistEditResult(in);
+}
+
+public SpamBlacklistEditResult[] newArray(int size) {
+return new SpamBlacklistEditResult[size];
+}
+};
+}
--
To view, visit https://gerrit.wikimedia.org/r/129690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3e1cf5095164defba742b0d01a647d85449ba42
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Normalize user/pass for language-stage instance - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/129691 Change subject: Normalize user/pass for language-stage instance .. Normalize user/pass for language-stage instance Get rid of Bttesting in favor of a Selenium_user with the same password being used on the beta cluster. Change-Id: I9c62b439bad036b7c9a4dd546c1c958e28f79c3b --- M docs/jenkins.md M jobs.yaml 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/91/129691/1 diff --git a/docs/jenkins.md b/docs/jenkins.md index dd5d506..fecd366 100644 --- a/docs/jenkins.md +++ b/docs/jenkins.md @@ -15,7 +15,6 @@ - Jenkins Manage Jenkins Configure System Global properties Environment variables List of key-value pairs name - MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET - MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET - - MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG - MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG - MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG - MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG diff --git a/jobs.yaml b/jobs.yaml index 5835753..90ea07b 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -79,9 +79,9 @@ name: ContentTranslation-language-stage.wmflabs.org browser: firefox folder: tests -mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG +mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG mediawiki_url: language-stage.wmflabs.org -mediawiki_user: TranslatorToDa +mediawiki_user: Selenium_user platform: linux recipients: *emails-ULS repository: mediawiki/extensions/ContentTranslation -- To view, visit https://gerrit.wikimedia.org/r/129691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c62b439bad036b7c9a4dd546c1c958e28f79c3b Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BlueSpice] Register ArticleInfo module - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [BlueSpice] Register ArticleInfo module .. [BlueSpice] Register ArticleInfo module Change-Id: I7f8254248c707543d5feba35220534ca36821653 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index aedd57a..9c3719c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -128,6 +128,11 @@ id = ext-bs file = BlueSpiceFoundation/i18n/core/%CODE%.json +Blue Spice - Article Info +id = ext-bs-articleinfo +descmsg = bs-articleinfo-desc +file = BlueSpiceExtensions/ArticleInfo/i18n/%CODE%.json + Blue Spice - Authors id = ext-bs-authors descmsg = bs-authors-desc @@ -161,7 +166,7 @@ file = BlueSpiceFoundation/i18n/validator/%CODE%.json id = ext-bs-validator -Blue Spice - WidgetBar +Blue Spice - Widget Bar id = ext-bs-widgetbar descmsg = bs-widgetbar-desc file = BlueSpiceExtensions/WidgetBar/i18n/%CODE%.json -- To view, visit https://gerrit.wikimedia.org/r/129692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f8254248c707543d5feba35220534ca36821653 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BlueSpice] Register ArticleInfo module - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/129692 Change subject: [BlueSpice] Register ArticleInfo module .. [BlueSpice] Register ArticleInfo module Change-Id: I7f8254248c707543d5feba35220534ca36821653 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/92/129692/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index aedd57a..9c3719c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -128,6 +128,11 @@ id = ext-bs file = BlueSpiceFoundation/i18n/core/%CODE%.json +Blue Spice - Article Info +id = ext-bs-articleinfo +descmsg = bs-articleinfo-desc +file = BlueSpiceExtensions/ArticleInfo/i18n/%CODE%.json + Blue Spice - Authors id = ext-bs-authors descmsg = bs-authors-desc @@ -161,7 +166,7 @@ file = BlueSpiceFoundation/i18n/validator/%CODE%.json id = ext-bs-validator -Blue Spice - WidgetBar +Blue Spice - Widget Bar id = ext-bs-widgetbar descmsg = bs-widgetbar-desc file = BlueSpiceExtensions/WidgetBar/i18n/%CODE%.json -- To view, visit https://gerrit.wikimedia.org/r/129692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f8254248c707543d5feba35220534ca36821653 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: update Ruby gems - change (mediawiki...ContentTranslation)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/129693 Change subject: QA: update Ruby gems .. QA: update Ruby gems Change-Id: Idaa85ff5e9480f50637e99465c50c574cf0d8dcc --- M tests/browser/Gemfile.lock 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/93/129693/1 diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index 0efb1ff..1ef472c 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -2,21 +2,21 @@ remote: https://rubygems.org/ specs: builder (3.2.2) -childprocess (0.5.1) +childprocess (0.5.3) ffi (~ 1.0, = 1.0.11) -cucumber (1.3.11) +cucumber (1.3.14) builder (= 2.1.2) diff-lcs (= 1.1.3) gherkin (~ 2.12) multi_json (= 1.7.5, 2.0) - multi_test (= 0.0.2) + multi_test (= 0.1.1) data_magic (0.18) faker (= 1.1.2) yml_reader (= 0.2) diff-lcs (1.2.5) domain_name (0.5.18) unf (= 0.0.5, 1.0.0) -faker (1.2.0) +faker (1.3.0) i18n (~ 0.5) faraday (0.9.0) multipart-post (= 1.2, 3) @@ -31,10 +31,10 @@ domain_name (~ 0.5) i18n (0.6.9) json (1.8.1) -mediawiki_api (0.1.1) +mediawiki_api (0.1.2) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.2.9) +mediawiki_selenium (0.2.22) cucumber (~ 1.3, = 1.3.10) headless (~ 1.0, = 1.0.1) json (~ 1.8, = 1.8.1) @@ -43,12 +43,12 @@ rest-client (~ 1.6, = 1.6.7) rspec-expectations (~ 2.14, = 2.14.4) syntax (~ 1.2, = 1.2.0) -mime-types (2.1) -multi_json (1.9.0) -multi_test (0.0.3) +mime-types (2.2) +multi_json (1.9.2) +multi_test (0.1.1) multipart-post (2.0.0) net-http-persistent (2.9.4) -page-object (0.9.7) +page-object (0.9.8) page_navigation (= 0.9) selenium-webdriver (= 2.40.0) watir-webdriver (= 0.6.8) @@ -58,8 +58,8 @@ mime-types (= 1.16) rspec-expectations (2.14.5) diff-lcs (= 1.1.3, 2.0) -rubyzip (1.1.0) -selenium-webdriver (2.40.0) +rubyzip (1.1.3) +selenium-webdriver (2.41.0) childprocess (= 0.5.0) multi_json (~ 1.0) rubyzip (~ 1.0) @@ -68,7 +68,7 @@ unf (0.1.4) unf_ext unf_ext (0.0.6) -watir-webdriver (0.6.8) +watir-webdriver (0.6.9) selenium-webdriver (= 2.18.0) websocket (1.0.7) yml_reader (0.2) -- To view, visit https://gerrit.wikimedia.org/r/129693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idaa85ff5e9480f50637e99465c50c574cf0d8dcc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
