date:20151109

[MediaWiki-commits] [Gerrit] Add missing test for EntityTermsView::getEntityTermsForLangu... - change (mediawiki...Wikibase)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add missing test for 
EntityTermsView::getEntityTermsForLanguageListView
..


Add missing test for EntityTermsView::getEntityTermsForLanguageListView

Bug: T116472
Change-Id: I75ab96d8af13000128a3a341658cf974beae90e3
---
M view/tests/phpunit/EntityTermsViewTest.php
1 file changed, 49 insertions(+), 34 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  Jeroen De Dauw: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/view/tests/phpunit/EntityTermsViewTest.php 
b/view/tests/phpunit/EntityTermsViewTest.php
index 7fe714e..d678279 100644
--- a/view/tests/phpunit/EntityTermsViewTest.php
+++ b/view/tests/phpunit/EntityTermsViewTest.php
@@ -36,50 +36,45 @@
) );
}
 
-   private function getEntityTermsView( $languageCode = 'en', $called = 
null ) {
-   $templateFactory = TemplateFactory::getDefaultInstance();
-
-   if ( $called === null ) {
-   $called = $this->any();
-   }
-
+   private function getEntityTermsView(
+   $editSectionCalls = 0,
+   $languageNameCalls = 0,
+   $languageCode = 'en'
+   ) {
$editSectionGenerator = $this->getMock( 
'Wikibase\View\EditSectionGenerator' );
-
-   $editSectionGenerator->expects( $called )
+   $editSectionGenerator->expects( $this->exactly( 
$editSectionCalls ) )
->method( 'getLabelDescriptionAliasesEditSection' )
-   ->will( $this->returnValue( '~EDITSECTION~' ) );
+   ->will( $this->returnValue( '' ) );
+
+   $languageNameLookup = $this->getMock( 
'Wikibase\Lib\LanguageNameLookup' );
+   $languageNameLookup->expects( $this->exactly( 
$languageNameCalls ) )
+   ->method( 'getName' )
+   ->will( $this->returnValue( '' ) );
 
return new EntityTermsView(
-   $templateFactory,
+   TemplateFactory::getDefaultInstance(),
$editSectionGenerator,
-   $this->getMock( 'Wikibase\Lib\LanguageNameLookup' ),
+   $languageNameLookup,
$languageCode
);
}
 
private function getFingerprint( $languageCode = 'en' ) {
$fingerprint = new Fingerprint();
-   $fingerprint->setLabel( $languageCode, 'Example label' );
-   $fingerprint->setDescription( $languageCode, 'This is an 
example description' );
-   $fingerprint->setAliasGroup(
-   $languageCode,
-   array(
-   'sample alias',
-   'specimen alias',
-   )
-   );
+   $fingerprint->setLabel( $languageCode, '' );
+   $fingerprint->setDescription( $languageCode, '' );
+   $fingerprint->setAliasGroup( $languageCode, array( '', 
'' ) );
return $fingerprint;
}
 
public function testGetHtml_containsDescriptionAndAliases() {
-   $entityTermsView = $this->getEntityTermsView();
+   $entityTermsView = $this->getEntityTermsView( 1 );
$fingerprint = $this->getFingerprint();
$html = $entityTermsView->getHtml( $fingerprint, null, '', new 
TextInjector() );
 
-   $this->assertContains( htmlspecialchars( 
$fingerprint->getDescription( 'en' )->getText() ), $html );
-   foreach ( $fingerprint->getAliasGroup( 'en' )->getAliases() as 
$alias ) {
-   $this->assertContains( htmlspecialchars( $alias ), 
$html );
-   }
+   $this->assertContains( 'DESCRIPTION', $html );
+   $this->assertContains( 'ALIAS1', $html );
+   $this->assertContains( 'ALIAS2', $html );
}
 
public function entityFingerprintProvider() {
@@ -96,18 +91,19 @@
 * @dataProvider entityFingerprintProvider
 */
public function testGetHtml_isEditable( Fingerprint $fingerprint, 
ItemId $entityId, $languageCode ) {
-   $entityTermsView = $this->getEntityTermsView( $languageCode, 
$this->once() );
+   $entityTermsView = $this->getEntityTermsView( 1, 0, 
$languageCode );
$html = $entityTermsView->getHtml( $fingerprint, $entityId, '', 
new TextInjector() );
 
-   $this->assertContains( '~EDITSECTION~', $html );
+   $this->assertContains( '', $html );
}
 
public function testGetHtml_valuesAreEscaped() {
-   $entityTermsView = $this->getEntityTermsView();
$fingerprint = new Fingerprint();

[MediaWiki-commits] [Gerrit] Assign salt grains for cp* hosts - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251949

Change subject: Assign salt grains for cp* hosts
..

Assign salt grains for cp* hosts

Change-Id: I9cac6ba19cdd39e3615c427881c32539a1058b89
---
A hieradata/hosts/cp1008.yaml
A hieradata/hosts/cp4018.yaml
A hieradata/role/codfw/cache/mobile.yaml
A hieradata/role/codfw/cache/parsoid.yaml
A hieradata/role/codfw/cache/text.yaml
A hieradata/role/codfw/cache/upload.yaml
A hieradata/role/eqiad/cache/maps.yaml
A hieradata/role/eqiad/cache/misc.yaml
A hieradata/role/eqiad/cache/mobile.yaml
A hieradata/role/eqiad/cache/parsoid.yaml
A hieradata/role/eqiad/cache/text.yaml
A hieradata/role/eqiad/cache/upload.yaml
A hieradata/role/esams/cache/mobile.yaml
A hieradata/role/esams/cache/text.yaml
A hieradata/role/esams/cache/upload.yaml
A hieradata/role/ulsfo/cache/mobile.yaml
A hieradata/role/ulsfo/cache/text.yaml
A hieradata/role/ulsfo/cache/upload.yaml
M modules/debdeploy/templates/debdeploy.erb
19 files changed, 85 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/251949/1

diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml
new file mode 100644
index 000..0898300
--- /dev/null
+++ b/hieradata/hosts/cp1008.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp:
+value: canary
diff --git a/hieradata/hosts/cp4018.yaml b/hieradata/hosts/cp4018.yaml
new file mode 100644
index 000..0898300
--- /dev/null
+++ b/hieradata/hosts/cp4018.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp:
+value: canary
diff --git a/hieradata/role/codfw/cache/mobile.yaml 
b/hieradata/role/codfw/cache/mobile.yaml
new file mode 100644
index 000..32dfd54
--- /dev/null
+++ b/hieradata/role/codfw/cache/mobile.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-mobile:
+value: standard
diff --git a/hieradata/role/codfw/cache/parsoid.yaml 
b/hieradata/role/codfw/cache/parsoid.yaml
new file mode 100644
index 000..e81e00d
--- /dev/null
+++ b/hieradata/role/codfw/cache/parsoid.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-parsoid:
+value: standard
diff --git a/hieradata/role/codfw/cache/text.yaml 
b/hieradata/role/codfw/cache/text.yaml
new file mode 100644
index 000..2baffc3
--- /dev/null
+++ b/hieradata/role/codfw/cache/text.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-text:
+value: standard
diff --git a/hieradata/role/codfw/cache/upload.yaml 
b/hieradata/role/codfw/cache/upload.yaml
new file mode 100644
index 000..6ffc684
--- /dev/null
+++ b/hieradata/role/codfw/cache/upload.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-upload:
+value: standard
diff --git a/hieradata/role/eqiad/cache/maps.yaml 
b/hieradata/role/eqiad/cache/maps.yaml
new file mode 100644
index 000..d2aad56
--- /dev/null
+++ b/hieradata/role/eqiad/cache/maps.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-maps:
+value: standard
diff --git a/hieradata/role/eqiad/cache/misc.yaml 
b/hieradata/role/eqiad/cache/misc.yaml
new file mode 100644
index 000..ff54641
--- /dev/null
+++ b/hieradata/role/eqiad/cache/misc.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-misc:
+value: standard
diff --git a/hieradata/role/eqiad/cache/mobile.yaml 
b/hieradata/role/eqiad/cache/mobile.yaml
new file mode 100644
index 000..aa324fa
--- /dev/null
+++ b/hieradata/role/eqiad/cache/mobile.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-mobile:
+value: standard
diff --git a/hieradata/role/eqiad/cache/parsoid.yaml 
b/hieradata/role/eqiad/cache/parsoid.yaml
new file mode 100644
index 000..19619e2
--- /dev/null
+++ b/hieradata/role/eqiad/cache/parsoid.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-parsoid:
+value: standard
diff --git a/hieradata/role/eqiad/cache/text.yaml 
b/hieradata/role/eqiad/cache/text.yaml
new file mode 100644
index 000..98d4941
--- /dev/null
+++ b/hieradata/role/eqiad/cache/text.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-text:
+value: standard
diff --git a/hieradata/role/eqiad/cache/upload.yaml 
b/hieradata/role/eqiad/cache/upload.yaml
new file mode 100644
index 000..8e6390c
--- /dev/null
+++ b/hieradata/role/eqiad/cache/upload.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-upload:
+value: standard
diff --git a/hieradata/role/esams/cache/mobile.yaml 
b/hieradata/role/esams/cache/mobile.yaml
new file mode 100644
index 000..32450e8
--- /dev/null
+++ b/hieradata/role/esams/cache/mobile.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-esams-mobile:
+value: standard
diff --git a/hieradata/role/esams/cache/text.yaml 
b/hieradata/role/esams/cache/text.yaml
new file mode 100644
index 000..3c9b3c1
--- /dev/null
+++ b/hieradata/role/esams/cache/text.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+

[MediaWiki-commits] [Gerrit] Fixed Style/SpaceInsideHashLiteralBraces RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251959

Change subject: Fixed Style/SpaceInsideHashLiteralBraces RuboCop offense
..

Fixed Style/SpaceInsideHashLiteralBraces RuboCop offense

Bug: T117987
Change-Id: I4dcc5b6a77d6a82ae79673be077493ac6475de0e
---
M .rubocop_todo.yml
M tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
M tests/browser/features/step_definitions/special_translate_steps.rb
M tests/browser/features/step_definitions/translation_stash_steps.rb
M tests/browser/features/support/hooks.rb
5 files changed, 7 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/59/251959/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 52880e5..e2d4b35 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -16,12 +16,6 @@
 Metrics/LineLength:
   Max: 127
 
-# Offense count: 14
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForEmptyBraces, SupportedStyles.
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
 # Offense count: 73
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git 
a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb 
b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
index a2872a4..1aa512e 100644
--- a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
+++ b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
@@ -3,11 +3,11 @@
 end
 
 Given(/^I am on the Translator sandbox management page with no users in the 
sandbox$/) do
-  visit(ManageTranslatorSandboxPage, using_params: {extra: 
"integrationtesting=empty"})
+  visit(ManageTranslatorSandboxPage, using_params: { extra: 
"integrationtesting=empty" })
 end
 
 Given(/^I am on the Translator sandbox management page with users in the 
sandbox$/) do
-  visit(ManageTranslatorSandboxPage, using_params: {extra: 
"integrationtesting=populate"})
+  visit(ManageTranslatorSandboxPage, using_params: { extra: 
"integrationtesting=populate" })
 end
 
 When(/^I search for "(.*)" in the sandboxed users search field$/) do |string|
@@ -53,7 +53,7 @@
 end
 
 When(/^I go to the userpage of user "(.*?)"$/) do |username|
-  visit(UserPage, using_params: {extra: username})
+  visit(UserPage, using_params: { extra: username })
 end
 
 Then(/^I should see a babel box with languages "(.*?)"$/) do |languages|
diff --git a/tests/browser/features/step_definitions/special_translate_steps.rb 
b/tests/browser/features/step_definitions/special_translate_steps.rb
index 04bf7f2..a023a78 100644
--- a/tests/browser/features/step_definitions/special_translate_steps.rb
+++ b/tests/browser/features/step_definitions/special_translate_steps.rb
@@ -1,9 +1,9 @@
 Given(/^I am translating a message group which doesn't have workflow states$/) 
do
-  visit(TranslatePage, using_params: {extra: "language=fi"})
+  visit(TranslatePage, using_params: { extra: "language=fi" })
 end
 
 Given(/^I am translating a message group which has workflow states$/) do
-  visit(TranslatePage, using_params: {extra: 
"language=fi=page-Language+committee"})
+  visit(TranslatePage, using_params: { extra: 
"language=fi=page-Language+committee" })
 end
 
 When(/^I click the workflow state$/) do
diff --git a/tests/browser/features/step_definitions/translation_stash_steps.rb 
b/tests/browser/features/step_definitions/translation_stash_steps.rb
index 95303ef..57abf89 100644
--- a/tests/browser/features/step_definitions/translation_stash_steps.rb
+++ b/tests/browser/features/step_definitions/translation_stash_steps.rb
@@ -3,7 +3,7 @@
 end
 
 Given(/^I am a sandboxed user on the stash page$/) do
-  visit(StashPage, using_params: {extra: "integrationtesting=activatestash"})
+  visit(StashPage, using_params: { extra: "integrationtesting=activatestash" })
 end
 
 Then(/^I should see a language selector$/) do
diff --git a/tests/browser/features/support/hooks.rb 
b/tests/browser/features/support/hooks.rb
index b0a5876..88c9682 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -1,3 +1,3 @@
 After("@stash") do
-  visit(StashPage, using_params: {extra: "integrationtesting=deactivatestash"})
+  visit(StashPage, using_params: { extra: "integrationtesting=deactivatestash" 
})
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/251959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dcc5b6a77d6a82ae79673be077493ac6475de0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Fixed Style/RedundantSelf RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251958

Change subject: Fixed Style/RedundantSelf RuboCop offense
..

Fixed Style/RedundantSelf RuboCop offense

Bug: T117987
Change-Id: Ic8f8ea705550cebed27d6d4a9920f769da158dd2
---
M .rubocop_todo.yml
M tests/browser/features/support/pages/stash_page.rb
2 files changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/58/251958/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 469fde6..52880e5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -16,12 +16,6 @@
 Metrics/LineLength:
   Max: 127
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-- 'tests/browser/features/support/pages/stash_page.rb'
-
 # Offense count: 14
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForEmptyBraces, SupportedStyles.
diff --git a/tests/browser/features/support/pages/stash_page.rb 
b/tests/browser/features/support/pages/stash_page.rb
index 2c04091..f8754c1 100644
--- a/tests/browser/features/support/pages/stash_page.rb
+++ b/tests/browser/features/support/pages/stash_page.rb
@@ -25,9 +25,9 @@
   end
 
   def select_language(language)
-self.language_selector_element.click
+language_selector_element.click
 self.language_filter = language
-self.language_filter_element.send_keys :enter
+language_filter_element.send_keys :enter
   end
 
   def translation_element(index = 0)

-- 
To view, visit https://gerrit.wikimedia.org/r/251958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8f8ea705550cebed27d6d4a9920f769da158dd2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixed Style/PercentLiteralDelimiters RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251957

Change subject: Fixed Style/PercentLiteralDelimiters RuboCop offense
..

Fixed Style/PercentLiteralDelimiters RuboCop offense

Bug: T117987
Change-Id: Idadad4c53876bd36b1cc6c02ca72ffbb3187b00b
---
M .rubocop_todo.yml
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
2 files changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/57/251957/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7adbd59..469fde6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -16,13 +16,6 @@
 Metrics/LineLength:
   Max: 127
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-- 'tests/browser/features/support/pages/manage_translator_sandbox_page.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/RedundantSelf:
diff --git 
a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb 
b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
index d6229aa..3483625 100644
--- a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
+++ b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
@@ -99,7 +99,7 @@
   def requests_are_sorted_by_translation_count_and_date?
 expected_usernames = []
 Array(0..4).each do |num|
-  %w{Pupu Orava}.each do |name|
+  %w(Pupu Orava).each do |name|
 expected_usernames.unshift("#{name}#{num}")
   end
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/251957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idadad4c53876bd36b1cc6c02ca72ffbb3187b00b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixed Style/Not RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251956

Change subject: Fixed Style/Not RuboCop offense
..

Fixed Style/Not RuboCop offense

Bug: T117987
Change-Id: I3c58a2bc0258d75b6d67e5f9c04a44b5a634d5d1
---
M .rubocop_todo.yml
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
2 files changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/56/251956/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e57833c..7adbd59 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -18,12 +18,6 @@
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/Not:
-  Exclude:
-- 'tests/browser/features/support/pages/manage_translator_sandbox_page.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
diff --git 
a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb 
b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
index 2128690..d6229aa 100644
--- a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
+++ b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
@@ -137,7 +137,7 @@
 
   def only_request_with_username_is_selected?(username)
 requests_without_username(username).all? do |element|
-  not element.attribute_value("class").split(" ").include?("selected")
+  !element.attribute_value("class").split(" ").include?("selected")
 end
   end
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/251956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c58a2bc0258d75b6d67e5f9c04a44b5a634d5d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Nova scheduler changes: - change (operations/puppet)

2015-11-09 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Nova scheduler changes:
..


Nova scheduler changes:

- Add labvirt1005 and 1010 to the pool
- Reduce the disk space overcommit level to encourage use of these
  new (mostly empty) hosts

Change-Id: Ia4078a8a6e4ae05172ed2c5694d10345f02aae01
---
M modules/openstack/templates/kilo/nova/nova.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/openstack/templates/kilo/nova/nova.conf.erb 
b/modules/openstack/templates/kilo/nova/nova.conf.erb
index 1ba6083..37d8ba5 100644
--- a/modules/openstack/templates/kilo/nova/nova.conf.erb
+++ b/modules/openstack/templates/kilo/nova/nova.conf.erb
@@ -9,7 +9,7 @@
 instance_name_template=i-%08x
 daemonize=1
 scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
-wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009
+wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1005,labvirt1006,labvirt1007,labvirt1008,labvirt1009,labvirt1010
 
scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,SchedulerPoolFilter,DiskFilter
 
 # Don't allow duplicate instance names
@@ -101,7 +101,7 @@
 ram_allocation_ratio=1.3
 
 # Since our images are copy-on-write we can support some overcommitting here.
-disk_allocation_ratio=2.1
+disk_allocation_ratio=1.8
 
 
 # Deprecated, remove in Kilo:

-- 
To view, visit https://gerrit.wikimedia.org/r/251954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4078a8a6e4ae05172ed2c5694d10345f02aae01
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add missing DataValueFactoryTest - change (mediawiki...Wikibase)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add missing DataValueFactoryTest
..


Add missing DataValueFactoryTest

Change-Id: I128f06aebd3e1ab2837dd8096bee80ff1cf34498
---
A lib/tests/phpunit/DataValueFactoryTest.php
1 file changed, 109 insertions(+), 0 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/tests/phpunit/DataValueFactoryTest.php 
b/lib/tests/phpunit/DataValueFactoryTest.php
new file mode 100644
index 000..bfc2fe8
--- /dev/null
+++ b/lib/tests/phpunit/DataValueFactoryTest.php
@@ -0,0 +1,109 @@
+getMock( 'Deserializers\Deserializer' );
+   $deserializer->expects( $this->any() )
+   ->method( 'deserialize' )
+   ->will( $this->returnCallback( function( array $data ) {
+   if ( $data['type'] === 'string' ) {
+   return 'success';
+   }
+   throw new DeserializationException();
+   } ) );
+
+   return new DataValueFactory( $deserializer );
+   }
+
+   public function testGivenUnknownType_newDataValueFails() {
+   $this->setExpectedException( 'InvalidArgumentException' );
+   $this->newInstance()->newDataValue( 'unknown', '' );
+   }
+
+   public function testGivenKnownType_newDataValueSucceeds() {
+   $value = $this->newInstance()->newDataValue( 'string', '' );
+   $this->assertSame( 'success', $value );
+   }
+
+   public function testGivenUnknownType_tryNewDataValueFails() {
+   $this->setExpectedException( 'InvalidArgumentException' );
+   $this->newInstance()->tryNewDataValue( 'unknown', '' );
+   }
+
+   public function testGivenValidArguments_tryNewDataValueSucceeds() {
+   $value = $this->newInstance()->tryNewDataValue( 'string', '' );
+   $this->assertSame( 'success', $value );
+   }
+
+   public function testGivenNoType_newFromArrayFails() {
+   $this->setExpectedException( 'DataValues\IllegalValueException' 
);
+   $this->newInstance()->newFromArray( array() );
+   }
+
+   public function testGivenNoValue_newFromArrayFails() {
+   $this->setExpectedException( 'DataValues\IllegalValueException' 
);
+   $this->newInstance()->newFromArray( array( 'type' => 'unknown' 
) );
+   }
+
+   public function testGivenUnknownType_newFromArrayFails() {
+   $this->setExpectedException( 'InvalidArgumentException' );
+   $this->newInstance()->newFromArray( array(
+   'type' => 'unknown',
+   'value' => '',
+   ) );
+   }
+
+   public function testGivenKnownType_newFromArraySucceeds() {
+   $value = $this->newInstance()->newFromArray( array(
+   'type' => 'string',
+   'value' => '',
+   ) );
+   $this->assertSame( 'success', $value );
+   }
+
+   public function testGivenNoType_tryNewFromArrayReturnsWithError() {
+   $value = $this->newInstance()->tryNewFromArray( array() );
+   $expected = new UnDeserializableValue( null, null, 'No type 
specified' );
+   $this->assertEquals( $expected, $value );
+   }
+
+   public function testGivenNoValue_tryNewFromArrayReturnsWithError() {
+   $value = $this->newInstance()->tryNewFromArray( array( 'type' 
=> 'unknown' ) );
+   $expected = new UnDeserializableValue( null, 'unknown', 'No 
value data' );
+   $this->assertEquals( $expected, $value );
+   }
+
+   public function testGivenUnknownType_tryNewFromArrayFails() {
+   $this->setExpectedException( 'InvalidArgumentException' );
+   $this->newInstance()->tryNewFromArray( array(
+   'type' => 'unknown',
+   'value' => '',
+   ) );
+   }
+
+   public function testGivenKnownType_tryNewFromArraySucceeds() {
+   $value = $this->newInstance()->tryNewFromArray( array(
+   'type' => 'string',
+   'value' => '',
+   ) );
+   $this->assertSame( 'success', $value );
+   }
+
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/251519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I128f06aebd3e1ab2837dd8096bee80ff1cf34498
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] point to new location of localized resources - change (translatewiki)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: point to new location of localized resources
..


point to new location of localized resources

Now under the "Wikipedia/Localizations" folder.

Bug: T95733
Change-Id: If8cdd5a1c1b7f87f47b84ece4a65a2da6cbf0cac
---
M groups/Wikimedia/WikimediaMobile-ios.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/groups/Wikimedia/WikimediaMobile-ios.yaml 
b/groups/Wikimedia/WikimediaMobile-ios.yaml
index 95a8057..b787035 100644
--- a/groups/Wikimedia/WikimediaMobile-ios.yaml
+++ b/groups/Wikimedia/WikimediaMobile-ios.yaml
@@ -21,7 +21,7 @@
 
 FILES:
   class: AppleFFS
-  sourcePattern: 
"%GROUPROOT%/wikipedia-ios/Wikipedia/%CODE%.lproj/Localizable.strings"
+  sourcePattern: 
"%GROUPROOT%/wikipedia-ios/Wikipedia/Localizations/%CODE%.lproj/Localizable.strings"
 
 ---
 BASIC:
@@ -34,7 +34,7 @@
 
 FILES:
   class: AppleFFS
-  sourcePattern: 
"%GROUPROOT%/wikipedia-ios/Wikipedia/%CODE%.lproj/InfoPlist.strings"
+  sourcePattern: 
"%GROUPROOT%/wikipedia-ios/Wikipedia/Localizations/%CODE%.lproj/InfoPlist.strings"
 
 ---
 BASIC:

-- 
To view, visit https://gerrit.wikimedia.org/r/250979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If8cdd5a1c1b7f87f47b84ece4a65a2da6cbf0cac
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Bgerstle 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] SF_UploadWindow: Fixed hook parameter - change (mediawiki...SemanticForms)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: SF_UploadWindow: Fixed hook parameter
..


SF_UploadWindow: Fixed hook parameter

Added reference operator to hook call to be compatible with
'UploadFormInitDescriptor' signature from

 includes/specials/SpecialUpload.php

Change-Id: I4a6bfc4506a32234df84261706ee06e0629af685
---
M specials/SF_UploadWindow.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/specials/SF_UploadWindow.php b/specials/SF_UploadWindow.php
index a5944f3..3b9d8a1 100644
--- a/specials/SF_UploadWindow.php
+++ b/specials/SF_UploadWindow.php
@@ -710,7 +710,7 @@
+ $this->getDescriptionSection()
+ $this->getOptionsSection();
 
-   Hooks::run( 'UploadFormInitDescriptor', array( $descriptor ) );
+   Hooks::run( 'UploadFormInitDescriptor', array( &$descriptor ) );
parent::__construct( $descriptor, 'upload' );
 
# Set some form properties

-- 
To view, visit https://gerrit.wikimedia.org/r/251476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a6bfc4506a32234df84261706ee06e0629af685
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Reorg server groups for debdeploy - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Reorg server groups for debdeploy
..


Reorg server groups for debdeploy

Fold the canary hosts into the superordinate server groups (for cases where
an update is straightforward and the canaries won't be used)

Preparatory patch, to be merged once a related fix in debdeploy has landed.

Change-Id: Ibbf2593506bcb7fb6f389c38417d9d9bb1392794
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 25 insertions(+), 25 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 66ba0e5..c1775b0 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -14,49 +14,49 @@
 misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, 
debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, 
debdeploy-irc:standard, debdeploy-phabricator:standard, 
debdeploy-gerrit:standard, debdeploy-archiva:standard
 misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, 
debdeploy-installserver:standard, debdeploy-librenms:standard
 deployment-servers = debdeploy-deployment:standard
-hadoop-worker = debdeploy-hadoop-worker:standard
+hadoop-worker = debdeploy-hadoop-worker:standard, 
debdeploy-hadoop-worker:canary
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard
 hadoop-standby = debdeploy-hadoop-standby:standard
-hadoop = debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard, 
debdeploy-hadoop-standby:standard
+hadoop = debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard, 
debdeploy-hadoop-standby:standard, debdeploy-hadoop-worker:canary
 aqs = debdeploy-aqs:standard
 restbase-canary = debdeploy-restbase:canary
 restbase-eqiad = debdeploy-restbase-eqiad:standard
 restbase-codfw = debdeploy-restbase-codfw:standard
-restbase = debdeploy-restbase-codfw:standard, debdeploy-restbase-eqiad:standard
+restbase = debdeploy-restbase-codfw:standard, 
debdeploy-restbase-eqiad:standard, debdeploy-restbase:canary
 etcd = debdeploy-etcd:standard
 mx = debdeploy-mx:standard
 ocg = debdeploy-ocg:standard
-sca = debdeploy-sca:standard
+sca = debdeploy-sca:standard, debdeploy-sca:canary
 sca-canary = debdeploy-sca:canary
-scb = debdeploy-scb:standard
+scb = debdeploy-scb:standard, debdeploy-scb:canary
 scb-canary = debdeploy-scb:canary
-videoscaler = debdeploy-videoscaler:standard
+videoscaler = debdeploy-videoscaler:standard, debdeploy-videoscaler:canary
 videoscaler-canary = debdeploy-videoscaler:canary
 dumps = debdeploy-dumps:standard
 eventlogging = debdeploy-eventlogging:standard
-ganeti = debdeploy-ganeti:standard
+ganeti = debdeploy-ganeti:standard, debdeploy-ganeti:canary
 ganeti-canary = debdeploy-ganeti:canary
-bastion = debdeploy-bastion:standard
+bastion = debdeploy-bastion:standard, debdeploy-bastion:canary
 bastion-canary = debdeploy-bastion:canary
-dns-auth = debdeploy-authdns:standard
+dns-auth = debdeploy-authdns:standard, debdeploy-authdns:canary
 dns-auth-canary = debdeploy-authdns:canary
-dns-rec = debdeploy-recursor:standard
+dns-rec = debdeploy-recursor:standard, debdeploy-recursor:canary
 dns-rec-canary = debdeploy-recursor:canary
-stat = debdeploy-stat:standard
+stat = debdeploy-stat:standard, debdeploy-kafka:canary
 kafka-canary = debdeploy-kafka:canary
 kafka = debdeploy-kafka:standard
 elastic-canary = debdeploy-elastic:canary
 elastic-eqiad = debdeploy-elastic-eqiad:standard
 elastic-codfw = debdeploy-elastic-codfw:standard
-elastic = debdeploy-elastic-eqiad:standard, debdeploy-elastic-codfw:standard
+elastic = debdeploy-elastic-eqiad:standard, debdeploy-elastic-codfw:standard, 
debdeploy-elastic:canary
 logging = debdeploy-logging:standard
 logstash-canary = debdeploy-logstash:canary
-logstash = debdeploy-logstash:standard
+logstash = debdeploy-logstash:standard, debdeploy-logstash:canary
 memcached-canary = debdeploy-memcached:canary
 memcached-eqiad = debdeploy-memcached-eqiad:standard
 memcached-codfw = debdeploy-memcached-codfw:standard
-memcached = debdeploy-memcached-codfw:standard, 
debdeploy-memcached-eqiad:standard
+memcached = debdeploy-memcached-codfw:standard, 
debdeploy-memcached-eqiad:standard, debdeploy-memcached:canary
 db-parsercache = debdeploy-parsercache:standard
 db-labsdb = debdeploy-labsdb:standard
 db-misc-servers = debdeploy-db-analytics:standard, 
debdeploy-db-sanitarium:standard
@@ -67,53 +67,53 @@
 lvs-codfw = debdeploy-lvs-codfw:standard
 lvs-esams = debdeploy-lvs-esams:standard
 lvs-ulsfo = debdeploy-lvs-ulsfo:standard
-lvs = debdeploy-lvs-eqiad:standard, debdeploy-lvs-codfw:standard, 
debdeploy-lvs-esams:standard, debdeploy-lvs-ulsfo:standard
+lvs =

[MediaWiki-commits] [Gerrit] Renamed SFUtils::addJavascriptAndCSS() to addFormRLModules() - change (mediawiki...SemanticForms)

2015-11-09 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251965

Change subject: Renamed SFUtils::addJavascriptAndCSS() to addFormRLModules()
..

Renamed SFUtils::addJavascriptAndCSS() to addFormRLModules()

Hook 'sfAddJavascriptFiles' also replaced with 'sfAddResourceLoaderModules'

Change-Id: I8448471416f0dddaa8f355a00991cdb703b72622
---
M includes/SF_Utils.php
M specials/SF_FormEdit.php
M specials/SF_RunQuery.php
3 files changed, 24 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/65/251965/1

diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 467e721..0ad8edd 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -331,33 +331,12 @@
}
 
/**
-* Javascript files to be added outside of the ResourceLoader -
-* by default, there are none.
-*/
-   public static function addJavascriptFiles( $parser ) {
-   global $wgOut, $wgJsMimeType;
-
-   $scripts = array();
-
-   Hooks::run( 'sfAddJavascriptFiles', array( &$scripts ) );
-
-   foreach ( $scripts as $js ) {
-   if ( $parser ) {
-   $script = "\n";
-   $parser->getOutput()->addHeadItem( $script );
-   } else {
-   $wgOut->addScriptFile( $js );
-   }
-   }
-   }
-
-   /**
-* Includes the necessary Javascript and CSS files for the form
+* Includes the necessary ResourceLoader modules for the form
 * to display and work correctly.
 *
 * Accepts an optional Parser instance, or uses $wgOut if omitted.
 */
-   public static function addJavascriptAndCSS( $parser = null ) {
+   public static function addFormRLModules( $parser = null ) {
global $wgOut;
 
// Handling depends on whether or not this form is embedded
@@ -369,18 +348,26 @@
$output = $parser->getOutput();
}
 
-   $output->addModules( 'ext.semanticforms.main' );
-   $output->addModules( 'ext.semanticforms.fancybox' );
-   $output->addModules( 'ext.semanticforms.dynatree' );
-   $output->addModules( 'ext.semanticforms.imagepreview' );
-   $output->addModules( 'ext.semanticforms.autogrow' );
-   $output->addModules( 'ext.semanticforms.submit' );
-   $output->addModules( 'ext.semanticforms.checkboxes' );
-   $output->addModules( 'ext.semanticforms.select2' );
-   $output->addModules( 'ext.smw.tooltips' );
-   $output->addModules( 'ext.smw.sorttable' );
+   $mainModules = array(
+   'ext.semanticforms.main',
+   'ext.semanticforms.fancybox',
+   'ext.semanticforms.dynatree',
+   'ext.semanticforms.imagepreview',
+   'ext.semanticforms.autogrow',
+   'ext.semanticforms.submit',
+   'ext.semanticforms.checkboxes',
+   'ext.semanticforms.select2',
+   'ext.smw.tooltips',
+   'ext.smw.sorttable'
+   );
 
-   self::addJavascriptFiles( $parser );
+   $output->addModules( $mainModules );
+
+   $otherModules = array();
+   Hooks::run( 'sfAddResourceLoaderModules', array( &$otherModules 
) );
+   foreach ( $otherModules as $rlModule ) {
+   $output->addModules( $rlModule );
+   }
}
 
/**
@@ -1097,7 +1084,7 @@
$wgOut->addParserOutputNoText( $parserOutput );
}
 
-   SFUtils::addJavascriptAndCSS();
+   SFUtils::addFormRLModules();
$editpage->previewTextAfterContent .=
'' . $form_text . 
"";
 
diff --git a/specials/SF_FormEdit.php b/specials/SF_FormEdit.php
index 3ee13d9..49b6ad8 100644
--- a/specials/SF_FormEdit.php
+++ b/specials/SF_FormEdit.php
@@ -174,7 +174,7 @@
$text .= $result[ 'formHTML' ];
}
 
-   SFUtils::addJavascriptAndCSS();
+   SFUtils::addFormRLModules();
 
if ( isset( $result[ 'formJS' ] ) ) {
$out->addScript( '  ' . "\n$result[formJS]\n" . '' . "\n" );
diff --git a/specials/SF_RunQuery.php b/specials/SF_RunQuery.php
index 6ae890a..84476d8 100644
--- a/specials/SF_RunQuery.php
+++ b/specials/SF_RunQuery.php
@@ -149,7 +149,7 @@
 
// Now write everything to the screen.
$wgOut->addHTML( $text );
-   SFUtils::addJavascriptAndCSS( $embedded

[MediaWiki-commits] [Gerrit] install_server: cassandra multi instance in eqiad/codfw - change (operations/puppet)

2015-11-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: install_server: cassandra multi instance in eqiad/codfw
..


install_server: cassandra multi instance in eqiad/codfw

Change-Id: I43cf9e41b378f28a832c4ef6dcc2532bb6f8382b
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg
2 files changed, 73 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index e801b8e..411d78a 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -111,10 +111,13 @@
pc100[1-3]) echo partman/mw.cfg ;; \
pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-4]) echo partman/mw.cfg ;; \
-   restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
+   restbase100[12]) echo partman/cassandrahosts-3ssd-srv.cfg ;; \
+   restbase100[3-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
restbase200[1-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
+   restbase200[12]) echo partman/cassandrahosts-4ssd-srv.cfg ;; \
+   restbase200[3-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \
snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg 
b/modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg
new file mode 100644
index 000..b034a59
--- /dev/null
+++ 
b/modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg
@@ -0,0 +1,69 @@
+# Automatic software RAID partitioning
+#
+# * 4 SSD, sda, sdb, sdc, sdd
+# * LVM
+# * layout:
+#   - /:   ext4, RAID1
+#   - swap:   RAID1, 1GB
+#   - /srv: RAID0, on ssd
+
+d-ipartman-auto/method string  raid
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman/alignment   select  optimal
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
+d-ipartman-auto/choose_recipe select raid1-root
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   raid1-root ::   \
+   3   1   3   raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10002   1000raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10  3   -1  raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10   4  -1  ext4\
+   $lvmok{ }   \
+   $defaultignore{ }   \
+   lv_name{ srv }  \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ /srv }  \
+   .
+
+# Parameters are:
+#  \
+#   
+d-ipartman-auto-raid/recipestring  \
+   1   4   2   ext4/   \
+   /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1 \
+   .   \
+   1   4   0   swap-   \
+   /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
+   .   \
+   0   4   0   lvm -   \
+   /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3 \
+   .
+
+d-ipartman-md/confirm  boolean true
+d-ipartman-md/confirm_nooverwrite  boolean true
+d-i

[MediaWiki-commits] [Gerrit] Fix grain name - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251946

Change subject: Fix grain name
..

Fix grain name

Change-Id: Ieb324eb896db62bbd77c808e5b1532db3e075524
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/251946/1

diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 84ab466..722ad6b 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -41,8 +41,8 @@
 bastion-canary = debdeploy-bastion:canary
 dns-auth = debdeploy-authdns:standard, debdeploy-authdns:canary
 dns-auth-canary = debdeploy-authdns:canary
-dns-rec = debdeploy-recursor:standard, debdeploy-recursor:canary
-dns-rec-canary = debdeploy-recursor:canary
+dns-rec = debdeploy-dnsrecursor:standard, debdeploy-dnsrecursor:canary
+dns-rec-canary = debdeploy-dnsrecursor:canary
 stat = debdeploy-stat:standard, debdeploy-kafka:canary
 kafka-canary = debdeploy-kafka:canary
 kafka = debdeploy-kafka:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/251946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb324eb896db62bbd77c808e5b1532db3e075524
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] dbtree: move to its own directory - change (operations/puppet)

2015-11-09 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251950

Change subject: dbtree: move to its own directory
..

dbtree: move to its own directory

Right now it was under /srv/org/wikimedia like peopleweb, no reason for
that given this is not our standard for standalone software.

Change-Id: I188fcc30070302fc31255c925e7db31ebe705985
---
M modules/noc/manifests/init.pp
M modules/noc/templates/dbtree.wikimedia.org.erb
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/251950/1

diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index c80b036..971bdf3 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -31,21 +31,21 @@
 
 
 
-file { ['/srv/org/wikimedia/dbtree', '/srv/org/wikimedia', '/srv/org']:
+file { ['/srv/dbtree']:
 ensure => 'directory',
 owner  => 'mwdeploy',
 group  => 'mwdeploy',
 }
 
 git::clone { 'operations/software/dbtree':
-directory => '/srv/org/wikimedia/dbtree',
+directory => '/srv/dbtree',
 branch=> 'master',
 owner => 'mwdeploy',
 group => 'mwdeploy',
-require   => File['/srv/org/wikimedia/dbtree'],
+require   => File['/srv/dbtree'],
 }
 
-file { '/srv/org/wikimedia/dbtree/inc/config.php':
+file { '/srv/dbtree/inc/config.php':
 ensure  => 'present',
 owner   => 'mwdeploy',
 group   => 'mwdeploy',
diff --git a/modules/noc/templates/dbtree.wikimedia.org.erb 
b/modules/noc/templates/dbtree.wikimedia.org.erb
index 971f9f2..7809540 100644
--- a/modules/noc/templates/dbtree.wikimedia.org.erb
+++ b/modules/noc/templates/dbtree.wikimedia.org.erb
@@ -9,7 +9,7 @@
 
 ServerName dbtree.wikimedia.org
 
-DocumentRoot /srv/org/wikimedia/dbtree
+DocumentRoot /srv/dbtree
 
 ErrorLog /var/log/apache2/error.log
 
@@ -36,7 +36,7 @@
 
 
 
-
+
 = 2.4>
 Require all denied
 

-- 
To view, visit https://gerrit.wikimedia.org/r/251950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I188fcc30070302fc31255c925e7db31ebe705985
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixed Style/WordArray RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251961

Change subject: Fixed Style/WordArray RuboCop offense
..

Fixed Style/WordArray RuboCop offense

Bug: T117987
Change-Id: I7f16c6c0c84dd7dc9b30aacd7128677fe8ff0054
---
M .rubocop_todo.yml
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
2 files changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/61/251961/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index df8f7ee..609d272 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -15,9 +15,3 @@
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 127
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-Style/WordArray:
-  MinSize: 5
diff --git 
a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb 
b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
index 9e9ca20..919fad6 100644
--- a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
+++ b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
@@ -114,7 +114,7 @@
   end
 
   def translations_languages_are_sorted?
-expected_langs = ['bn', 'fi', 'he', 'nl', 'uk']
+expected_langs = %w(bn fi he nl uk)
 langs = translations_autonyms.collect { |element| 
element.attribute_value('lang') }
 
 expected_langs == langs

-- 
To view, visit https://gerrit.wikimedia.org/r/251961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f16c6c0c84dd7dc9b30aacd7128677fe8ff0054
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251960

Change subject: Fixed Style/StringLiterals RuboCop offense
..

Fixed Style/StringLiterals RuboCop offense

Bug: T117987
Change-Id: I4ee283e5822779fae17f9fbb37c2365f872e1bb8
---
M .rubocop_todo.yml
M Gemfile
M tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
M tests/browser/features/step_definitions/special_translate_steps.rb
M tests/browser/features/step_definitions/translation_stash_steps.rb
M tests/browser/features/support/hooks.rb
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
M tests/browser/features/support/pages/stash_page.rb
M tests/browser/features/support/pages/translate_page.rb
M tests/browser/features/support/pages/user_page.rb
10 files changed, 64 insertions(+), 70 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/60/251960/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e2d4b35..df8f7ee 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -16,12 +16,6 @@
 Metrics/LineLength:
   Max: 127
 
-# Offense count: 73
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: WordRegex.
diff --git a/Gemfile b/Gemfile
index 5d557af..db5597d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "https://rubygems.org;
+source 'https://rubygems.org'
 
-gem "mediawiki_selenium", "~> 1.6.2"
+gem 'mediawiki_selenium', '~> 1.6.2'
 gem 'rubocop', '~> 0.34.2', require: false
diff --git 
a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb 
b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
index 1aa512e..0b3b2af 100644
--- a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
+++ b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
@@ -1,13 +1,13 @@
 Given(/^I am logged in as a translation administrator$/) do
-  step "I am logged in"
+  step 'I am logged in'
 end
 
 Given(/^I am on the Translator sandbox management page with no users in the 
sandbox$/) do
-  visit(ManageTranslatorSandboxPage, using_params: { extra: 
"integrationtesting=empty" })
+  visit(ManageTranslatorSandboxPage, using_params: { extra: 
'integrationtesting=empty' })
 end
 
 Given(/^I am on the Translator sandbox management page with users in the 
sandbox$/) do
-  visit(ManageTranslatorSandboxPage, using_params: { extra: 
"integrationtesting=populate" })
+  visit(ManageTranslatorSandboxPage, using_params: { extra: 
'integrationtesting=populate' })
 end
 
 When(/^I search for "(.*)" in the sandboxed users search field$/) do |string|
@@ -102,15 +102,15 @@
 end
 
 Then(/^I should see that no reminders have been sent to the user$/) do
-  on(ManageTranslatorSandboxPage).reminder_status.should == ""
+  on(ManageTranslatorSandboxPage).reminder_status.should == ''
 end
 
 Then(/^the direction of the users language filter button is "(.+)"$/) do 
|dir_value|
-  
on(ManageTranslatorSandboxPage).language_selector_button_element.attribute("dir").should
 == dir_value
+  
on(ManageTranslatorSandboxPage).language_selector_button_element.attribute('dir').should
 == dir_value
 end
 
 Then(/^the language code of the users language filter button is "(.+)"$/) do 
|lang_value|
-  
on(ManageTranslatorSandboxPage).language_selector_button_element.attribute("lang").should
 == lang_value
+  
on(ManageTranslatorSandboxPage).language_selector_button_element.attribute('lang').should
 == lang_value
 end
 
 Then(/^usernames are visible in the first column$/) do
diff --git a/tests/browser/features/step_definitions/special_translate_steps.rb 
b/tests/browser/features/step_definitions/special_translate_steps.rb
index a023a78..9716581 100644
--- a/tests/browser/features/step_definitions/special_translate_steps.rb
+++ b/tests/browser/features/step_definitions/special_translate_steps.rb
@@ -1,9 +1,9 @@
 Given(/^I am translating a message group which doesn't have workflow states$/) 
do
-  visit(TranslatePage, using_params: { extra: "language=fi" })
+  visit(TranslatePage, using_params: { extra: 'language=fi' })
 end
 
 Given(/^I am translating a message group which has workflow states$/) do
-  visit(TranslatePage, using_params: { extra: 
"language=fi=page-Language+committee" })
+  visit(TranslatePage, using_params: { extra: 
'language=fi=page-Language+committee' })
 end
 
 When(/^I click the workflow state$/) do
diff --git a/tests/browser/features/step_definitions/translation_stash_steps.rb 
b/tests/browser/features/step_definitions/translation_stash_steps.rb
index 57abf89..9aa4ed5 100644
--- a/tests/browser/features/step_definitions/translation_stash_steps.rb
+++ b/tests/browser/features/step_definitions/translation_stash_steps.rb
@@ -3,7 +3,7 @@

[MediaWiki-commits] [Gerrit] cassandra: add restbase[12]00[12] to seeds - change (operations/puppet)

2015-11-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251945

Change subject: cassandra: add restbase[12]00[12] to seeds
..

cassandra: add restbase[12]00[12] to seeds

Change-Id: Ic4e36a688d374541ee454e8c3e081d7600de2a9b
---
M hieradata/role/codfw/restbase.yaml
M hieradata/role/common/cassandra.yaml
M hieradata/role/eqiad/restbase.yaml
3 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/251945/1

diff --git a/hieradata/role/codfw/restbase.yaml 
b/hieradata/role/codfw/restbase.yaml
index 74d14a2..004d0d5 100644
--- a/hieradata/role/codfw/restbase.yaml
+++ b/hieradata/role/codfw/restbase.yaml
@@ -1,6 +1,12 @@
 restbase::seeds:
 - restbase2001.codfw.wmnet
+- restbase2001-a.codfw.wmnet
+- restbase2001-b.codfw.wmnet
+- restbase2001-c.codfw.wmnet
 - restbase2002.codfw.wmnet
+- restbase2002-a.codfw.wmnet
+- restbase2002-b.codfw.wmnet
+- restbase2002-c.codfw.wmnet
 - restbase2003.codfw.wmnet
 - restbase2004.codfw.wmnet
 - restbase2005.codfw.wmnet
diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 9d6c956..61657e5 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -6,7 +6,13 @@
 
 cassandra::seeds:
 - restbase1001.eqiad.wmnet
+- restbase1001-a.eqiad.wmnet
+- restbase1001-b.eqiad.wmnet
+- restbase1001-c.eqiad.wmnet
 - restbase1002.eqiad.wmnet
+- restbase1002-a.eqiad.wmnet
+- restbase1002-b.eqiad.wmnet
+- restbase1002-c.eqiad.wmnet
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet
@@ -15,7 +21,13 @@
 - restbase1008.eqiad.wmnet
 - restbase1009.eqiad.wmnet
 - restbase2001.codfw.wmnet
+- restbase2001-a.codfw.wmnet
+- restbase2001-b.codfw.wmnet
+- restbase2001-c.codfw.wmnet
 - restbase2002.codfw.wmnet
+- restbase2002-a.codfw.wmnet
+- restbase2002-b.codfw.wmnet
+- restbase2002-c.codfw.wmnet
 - restbase2003.codfw.wmnet
 - restbase2004.codfw.wmnet
 - restbase2005.codfw.wmnet
diff --git a/hieradata/role/eqiad/restbase.yaml 
b/hieradata/role/eqiad/restbase.yaml
index 0c17515..d0a9b7f 100644
--- a/hieradata/role/eqiad/restbase.yaml
+++ b/hieradata/role/eqiad/restbase.yaml
@@ -1,6 +1,12 @@
 restbase::seeds:
 - restbase1001.eqiad.wmnet
+- restbase1001-a.eqiad.wmnet
+- restbase1001-b.eqiad.wmnet
+- restbase1001-c.eqiad.wmnet
 - restbase1002.eqiad.wmnet
+- restbase1002-a.eqiad.wmnet
+- restbase1002-b.eqiad.wmnet
+- restbase1002-c.eqiad.wmnet
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet

-- 
To view, visit https://gerrit.wikimedia.org/r/251945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4e36a688d374541ee454e8c3e081d7600de2a9b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] install_server: cassandra multi instance in eqiad/codfw - change (operations/puppet)

2015-11-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251944

Change subject: install_server: cassandra multi instance in eqiad/codfw
..

install_server: cassandra multi instance in eqiad/codfw

Change-Id: I43cf9e41b378f28a832c4ef6dcc2532bb6f8382b
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg
2 files changed, 73 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/251944/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index e801b8e..411d78a 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -111,10 +111,13 @@
pc100[1-3]) echo partman/mw.cfg ;; \
pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-4]) echo partman/mw.cfg ;; \
-   restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
+   restbase100[12]) echo partman/cassandrahosts-3ssd-srv.cfg ;; \
+   restbase100[3-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
restbase200[1-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
+   restbase200[12]) echo partman/cassandrahosts-4ssd-srv.cfg ;; \
+   restbase200[3-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \
snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg 
b/modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg
new file mode 100644
index 000..b034a59
--- /dev/null
+++ 
b/modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-srv.cfg
@@ -0,0 +1,69 @@
+# Automatic software RAID partitioning
+#
+# * 4 SSD, sda, sdb, sdc, sdd
+# * LVM
+# * layout:
+#   - /:   ext4, RAID1
+#   - swap:   RAID1, 1GB
+#   - /srv: RAID0, on ssd
+
+d-ipartman-auto/method string  raid
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman/alignment   select  optimal
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
+d-ipartman-auto/choose_recipe select raid1-root
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   raid1-root ::   \
+   3   1   3   raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10002   1000raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10  3   -1  raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10   4  -1  ext4\
+   $lvmok{ }   \
+   $defaultignore{ }   \
+   lv_name{ srv }  \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ /srv }  \
+   .
+
+# Parameters are:
+#  \
+#   
+d-ipartman-auto-raid/recipestring  \
+   1   4   2   ext4/   \
+   /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1 \
+   .   \
+   1   4   0   swap-   \
+   /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
+   .   \
+   0   4   0   lvm -   \
+   /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3 \
+   .
+
+d-ipartman-md/confirm  boolean true
+d-i

[MediaWiki-commits] [Gerrit] Small bug fixes - change (wikidata...rdf)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Small bug fixes
..


Small bug fixes

Change-Id: I2dacf12b3884c6fdc3e222f11e7b696c55003925
---
M gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
M gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
2 files changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js 
b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
index d16e7fe..eeb357e 100755
--- a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
+++ b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
@@ -39,11 +39,6 @@
}
};
 
-   CodeMirror.hint.sparql.async = true;
-   CodeMirror.defaults.hintOptions = {};
-   CodeMirror.defaults.hintOptions.closeCharacters = /[]/;
-   CodeMirror.defaults.hintOptions.completeSingle = false;
-
function getSPARQLHints( term ){
var list = [];
 
@@ -60,7 +55,7 @@
var variables = [];
 
$.each(text.split(' '), function( key, word ){
-   if( word.indexOf('?') === 0){
+   if( word.match(/^\?\w+$/)){
variables.push(word);
}
});
diff --git a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js 
b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
index 254bc09..f729ad8 100644
--- a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
+++ b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
@@ -50,7 +50,6 @@
var posX = e.clientX, posY = (e.clientY +  
$(window).scrollTop());
 
var token = 
this.editor.getTokenAt(this.editor.coordsChar({left: posX, top: posY})).string;
-   console.log(token);
 
if(!token.match(/.+\:(Q|P)[0-9]*/)){
return;

-- 
To view, visit https://gerrit.wikimedia.org/r/251937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2dacf12b3884c6fdc3e222f11e7b696c55003925
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Minor clean-ups in EntityTermsView and related - change (mediawiki...Wikibase)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Minor clean-ups in EntityTermsView and related
..


Minor clean-ups in EntityTermsView and related

More specific type hints and splitting not so well readable code.

Change-Id: I376aaf29b183b612667ffcb1e84c7f6768c9766c
---
M view/src/EditSectionGenerator.php
M view/src/EntityTermsView.php
M view/src/TextInjector.php
3 files changed, 24 insertions(+), 26 deletions(-)

Approvals:
  Jonas Kress (WMDE): Verified
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/view/src/EditSectionGenerator.php 
b/view/src/EditSectionGenerator.php
index 83b2603..fa068f3 100644
--- a/view/src/EditSectionGenerator.php
+++ b/view/src/EditSectionGenerator.php
@@ -22,7 +22,7 @@
 * @since 0.5
 *
 * @param EntityId|null $entityId
-* @return string
+* @return string HTML
 */
public function getSiteLinksEditSection( EntityId $entityId = null );
 
@@ -33,7 +33,7 @@
 *
 * @param string $languageCode
 * @param EntityId|null $entityId
-* @return string
+* @return string HTML
 */
public function getLabelDescriptionAliasesEditSection( $languageCode, 
EntityId $entityId = null );
 
@@ -43,7 +43,7 @@
 * @since 0.5
 *
 * @param Statement $statement
-* @return string
+* @return string HTML
 */
public function getStatementEditSection( Statement $statement );
 
@@ -54,7 +54,7 @@
 *
 * @param PropertyId $propertyId The property of the statement group
 * @param EntityId|null $entityId The id of the entity on which to add 
a statement
-* @return string
+* @return string HTML
 */
public function getAddStatementToGroupSection( PropertyId $propertyId, 
EntityId $entityId = null );
 
diff --git a/view/src/EntityTermsView.php b/view/src/EntityTermsView.php
index 6bb7e6b..5344bc9 100644
--- a/view/src/EntityTermsView.php
+++ b/view/src/EntityTermsView.php
@@ -68,7 +68,7 @@
 * @param string $termBoxHtml
 * @param TextInjector $textInjector
 *
-* @return string
+* @return string HTML
 */
public function getHtml(
Fingerprint $fingerprint,
@@ -78,6 +78,9 @@
) {
$descriptions = $fingerprint->getDescriptions();
$aliasGroups = $fingerprint->getAliasGroups();
+   $marker = $textInjector->newMarker(
+   
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class'
+   );
 
return $this->templateFactory->render( 
'wikibase-entitytermsview',
$descriptions->hasTermForLanguage( $this->languageCode 
) ? '' : 'wb-empty',
@@ -85,9 +88,7 @@
$aliasGroups->hasGroupForLanguage( $this->languageCode 
) ? '' : 'wb-empty',
$this->getHtmlForAliases( $aliasGroups ),
$termBoxHtml,
-   $textInjector->newMarker(
-   
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class'
-   ),
+   $marker,
$this->getHtmlForLabelDescriptionAliasesEditSection( 
$entityId )
);
}
@@ -96,7 +97,7 @@
 * @param Fingerprint $fingerprint
 * @param EntityId $entityId
 *
-* @return string
+* @return string HTML
 */
public function getTitleHtml(
Fingerprint $fingerprint,
@@ -128,7 +129,7 @@
/**
 * @param TermList $descriptions the list of descriptions to render
 *
-* @return string
+* @return string HTML
 */
private function getDescriptionText( TermList $descriptions ) {
if ( $descriptions->hasTermForLanguage( $this->languageCode ) ) 
{
@@ -142,7 +143,7 @@
/**
 * @param AliasGroupList $aliasGroups the list of alias groups to render
 *
-* @return string
+* @return string HTML
 */
private function getHtmlForAliases( AliasGroupList $aliasGroups ) {
if ( $aliasGroups->hasGroupForLanguage( $this->languageCode ) ) 
{
@@ -168,7 +169,7 @@
 * @param string[] $languageCodes The languages the user requested to 
be shown
 * @param Title|null $title
 *
-* @return string
+* @return string HTML
 */
public function getEntityTermsForLanguageListView(
Fingerprint $fingerprint,
@@ -199,17 +200,16 @@
 * @param string $languageCode
 * @param Title|null $title
 *
-* @return string
+* @return string HTML
 */
private function getEntityTermsForLanguageView(

[MediaWiki-commits] [Gerrit] Enable ferm on kafka1014 - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Enable ferm on kafka1014
..


Enable ferm on kafka1014

Port 9092 is allowed via a ferm::service, ports  and 2021 are
intentionally disallowed remotely.

In addition there's about 150 jmxtrans-all.jar processes, which
apparently don't need to be exposed as well.

Change-Id: I6a58faa217a119fbe8526ad0bc9bf4aece19f3b4
---
M manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Ottomata: Looks good to me, but someone else must approve
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 86ab063..fda8f54 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1154,6 +1154,10 @@
 role analytics::kafka::server
 include role::analytics
 include standard
+
+if $::hostname == 'kafka1014' {
+include base::firewall
+}
 }
 
 # virtual machine for misc. PHP apps

-- 
To view, visit https://gerrit.wikimedia.org/r/251936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a58faa217a119fbe8526ad0bc9bf4aece19f3b4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Assign IPs for public labtest hosts. - change (operations/dns)

2015-11-09 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Assign IPs for public labtest hosts.
..


Assign IPs for public labtest hosts.

Change-Id: I4fe10bb58bf9d7ead4f7c149de5f79446c04376a
---
M templates/153.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Rush: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index f9c1026..9dd2859 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -47,6 +47,8 @@
 44  1H  IN PTR  nembus.wikimedia.org.
 45  1H  IN PTR  mx2001.wikimedia.org.
 46  1H  IN PTR  wiki-mail-codfw.wikimedia.org.
+47  1H  IN PTR  labtestcontrol2001.wikimedia.org.
+48  1H  IN PTR  labtestservices2001.wikimedia.org.
 
 ; 208.80.153.64/27 (public1-c-codfw)
 65  1H  IN PTR  vrrp-gw-2003.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index c5e5776..2a943db 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -133,6 +133,8 @@
 labcontrol1002  1H  IN A208.80.154.95
 labcontrol2001  1H  IN A208.80.153.14
 labservices1001 1H  IN A208.80.155.117
+labtestcontrol2001  1H  IN A208.80.153.47
+labtestservices2001  1H  IN A208.80.153.48
 lead1H  IN A208.80.154.89
 1H  IN  2620:0:861:3:208:80:154:89
 lvs1001 1H  IN A208.80.154.55
@@ -444,6 +446,7 @@
 
 labs-puppetmaster-eqiad 300 IN CNAME  labcontrol1001.wikimedia.org.
 labs-puppetmaster-codfw 300 IN CNAME  labcontrol2001.wikimedia.org.
+labtest-puppetmaster-codfw 300 IN CNAME  labtestcontrol2001.wikimedia.org.
 
 
 ; don't want this for anything but wikimedia.org domain

-- 
To view, visit https://gerrit.wikimedia.org/r/251655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fe10bb58bf9d7ead4f7c149de5f79446c04376a
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Rush 
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 restbase to 061fe8d - change (mediawiki...deploy)

2015-11-09 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251942

Change subject: Update restbase to 061fe8d
..

Update restbase to 061fe8d

List of changes:
8e678f0 Page revisions: Bug fix: Check array length difference correctly
420ce2e Cleanup: Remove backwards-compatibility to old action module config 
style
b6c2fa1 Clarify 404 errors and make room for bigger ints
0fc8d1a Use string instead of long
660d39b Use long instead of string, improve tests
24b59ae Remove test that only works locally
9dfb87f Remove outdated comment
8254710 Parsoid: Bug fix, sections request returns full content if no-cache is 
provided and render unchanged
a88beaf Nitting
ca743a6 Pageviews: Use DTCS for the article flat column family
xxx Update node module dependencies

Change-Id: Ic87e4f0fe5ba6e1452bccdf43e0fea1b4fd8221d
---
M node_modules/ajv/lib/compile/resolve.js
M node_modules/ajv/package.json
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
R node_modules/core-js/library/modules/$.add-to-unscopables.js
M node_modules/core-js/library/modules/$.array-fill.js
M node_modules/core-js/library/modules/$.array-methods.js
A node_modules/core-js/library/modules/$.array-species-create.js
M node_modules/core-js/library/modules/$.buffer.js
M node_modules/core-js/library/modules/$.collection-strong.js
M node_modules/core-js/library/modules/$.collection-weak.js
M node_modules/core-js/library/modules/$.collection.js
M node_modules/core-js/library/modules/$.core.js
D node_modules/core-js/library/modules/$.def.js
R node_modules/core-js/library/modules/$.descriptors.js
A node_modules/core-js/library/modules/$.export.js
M node_modules/core-js/library/modules/$.fix-re-wks.js
M node_modules/core-js/library/modules/$.flags.js
M node_modules/core-js/library/modules/$.get-names.js
M node_modules/core-js/library/modules/$.hide.js
M node_modules/core-js/library/modules/$.is-array-iter.js
M node_modules/core-js/library/modules/$.iter-create.js
M node_modules/core-js/library/modules/$.iter-define.js
M node_modules/core-js/library/modules/$.iter-detect.js
R node_modules/core-js/library/modules/$.math-expm1.js
R node_modules/core-js/library/modules/$.math-log1p.js
R node_modules/core-js/library/modules/$.math-sign.js
M node_modules/core-js/library/modules/$.microtask.js
D node_modules/core-js/library/modules/$.mix.js
R node_modules/core-js/library/modules/$.object-assign.js
M node_modules/core-js/library/modules/$.object-sap.js
A node_modules/core-js/library/modules/$.redefine-all.js
R node_modules/core-js/library/modules/$.redefine.js
R node_modules/core-js/library/modules/$.same-value.js
A node_modules/core-js/library/modules/$.set-species.js
R node_modules/core-js/library/modules/$.set-to-string-tag.js
M node_modules/core-js/library/modules/$.species-constructor.js
D node_modules/core-js/library/modules/$.species.js
M node_modules/core-js/library/modules/$.string-at.js
M node_modules/core-js/library/modules/$.string-trim.js
M node_modules/core-js/library/modules/$.task.js
A node_modules/core-js/library/modules/$.to-primitive.js
M node_modules/core-js/library/modules/$.typed-array.js
A node_modules/core-js/library/modules/$.typed.js
M node_modules/core-js/library/modules/core.delay.js
M node_modules/core-js/library/modules/core.dict.js
M node_modules/core-js/library/modules/core.function.part.js
M node_modules/core-js/library/modules/core.is-iterable.js
M node_modules/core-js/library/modules/core.log.js
M node_modules/core-js/library/modules/core.object.classof.js
M node_modules/core-js/library/modules/core.object.define.js
M node_modules/core-js/library/modules/core.object.is-object.js
M node_modules/core-js/library/modules/core.object.make.js
M node_modules/core-js/library/modules/core.string.escape-html.js
M node_modules/core-js/library/modules/core.string.unescape-html.js
M node_modules/core-js/library/modules/es5.js
M node_modules/core-js/library/modules/es6.array.copy-within.js
M node_modules/core-js/library/modules/es6.array.fill.js
M node_modules/core-js/library/modules/es6.array.find-index.js
M node_modules/core-js/library/modules/es6.array.find.js
M node_modules/core-js/library/modules/es6.array.from.js
M node_modules/core-js/library/modules/es6.array.iterator.js
M node_modules/core-js/library/modules/es6.array.of.js
M node_modules/core-js/library/modules/es6.array.species.js
A node_modules/core-js/library/modules/es6.date.to-string.js
M node_modules/core-js/library/modules/es6.math.acosh.js
M

[MediaWiki-commits] [Gerrit] base: further clarify service_unit ensure - change (operations/puppet)

2015-11-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: base: further clarify service_unit ensure
..


base: further clarify service_unit ensure

validate_ensure barfs on values other than present/absent

Change-Id: I7edb34e931808e968e7d16daad9df961bb606dae
---
M modules/base/manifests/service_unit.pp
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/base/manifests/service_unit.pp 
b/modules/base/manifests/service_unit.pp
index 40d9272..6b7df8e 100644
--- a/modules/base/manifests/service_unit.pp
+++ b/modules/base/manifests/service_unit.pp
@@ -9,10 +9,11 @@
 # === Parameters ===
 #
 # [*ensure*]
-#  Is the usual metaparameter, defaults to present.
+#  Is the usual metaparameter, defaults to present. Valid values are 'present'
+#  and 'absent'.
 #  Note that the underlying service is also controlled by this metaparameter
-#  (unless $declare_service is false), in other words a truthy value here will
-#  ensure => running and conversely a falsey value will ensure => stopped.
+#  (unless $declare_service is false), in other words 'present' will
+#  ensure => running and conversely 'absent' will ensure => stopped.
 #
 # [*template_name*]
 #  String, default $name.  Init file template pathnames are formed

-- 
To view, visit https://gerrit.wikimedia.org/r/251933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7edb34e931808e968e7d16daad9df961bb606dae
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Jenkins: sync cli-shutdown.groovy from upstream - change (operations/puppet)

2015-11-09 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Jenkins: sync cli-shutdown.groovy from upstream
..


Jenkins: sync cli-shutdown.groovy from upstream

Update the script that shutdowns Jenkins CLI on Jenkins startup. It
received a few updates:

  $ git shortlog --no-merges 66c6cdb..3fdaf1f61
  Kohsuke Kawaguchi (2):
  Fixing a race condition
  Defining a method make it sensitive to the name of the file

  R. Tyler Croy (1):
  Add some comments and a license
  $

References:
https://github.com/jenkinsci-cert/SECURITY-218
https://jenkins-ci.org/content/mitigating-unauthenticated-remote-code-execution-0-day-jenkins-cli

Bug: T118064
Change-Id: I3ce9b8d6af93e865cdd64bd2365dc839e2ab9a61
---
M modules/jenkins/files/cli-shutdown.groovy
1 file changed, 33 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/jenkins/files/cli-shutdown.groovy 
b/modules/jenkins/files/cli-shutdown.groovy
index b92b4e7..8e17937 100644
--- a/modules/jenkins/files/cli-shutdown.groovy
+++ b/modules/jenkins/files/cli-shutdown.groovy
@@ -1,11 +1,42 @@
-// 
https://github.com/jenkinsci-cert/SECURITY-218/blob/66c6cdb/cli-shutdown.groovy
+// 
https://github.com/jenkinsci-cert/SECURITY-218/blob/3fdaf1f61/cli-shutdown.groovy
+/*
+The MIT License
+
+Copyright (c) 2015, Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
 import jenkins.*;
 import jenkins.model.*;
+import hudson.model.*;
 
+// disabled CLI access over TCP listener (separate port)
 def p = AgentProtocol.all()
 p.each { x ->
   if (x.name.contains("CLI")) p.remove(x)
 }
 
+// disable CLI access over /cli URL
+def removal = { lst ->
+  lst.each { x -> if (x.getClass().name.contains("CLIAction")) lst.remove(x) }
+}
 def j = Jenkins.instance;
-j.actions.each { x -> if (x.getClass().name.contains("CLIAction")) 
j.actions.remove(x) }
+removal(j.getExtensionList(RootAction.class))
+removal(j.actions)

-- 
To view, visit https://gerrit.wikimedia.org/r/251935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ce9b8d6af93e865cdd64bd2365dc839e2ab9a61
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "Enable ferm on kafka1014" - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251962

Change subject: Revert "Enable ferm on kafka1014"
..

Revert "Enable ferm on kafka1014"

This reverts commit d5a6a3353d3eca3bd4beb48fdf6f579cb9821e7f.

Change-Id: Iae5a926250a9c1050625e8c6244e9cf455cd01b3
---
M manifests/site.pp
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/251962/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2b608a7..69c2dd3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1154,10 +1154,6 @@
 role analytics::kafka::server
 include role::analytics
 include standard
-
-if $::hostname == 'kafka1014' {
-include base::firewall
-}
 }
 
 # virtual machine for misc. PHP apps

-- 
To view, visit https://gerrit.wikimedia.org/r/251962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae5a926250a9c1050625e8c6244e9cf455cd01b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixed Lint/UselessAssignment RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251963

Change subject: Fixed Lint/UselessAssignment RuboCop offense
..

Fixed Lint/UselessAssignment RuboCop offense

Bug: T117987
Change-Id: I00b651f44eafdf7b784814882984542b854e2009
---
M .rubocop_todo.yml
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
2 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/63/251963/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 609d272..821f13b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,11 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-- 'tests/browser/features/support/pages/manage_translator_sandbox_page.rb'
-
 # Offense count: 48
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
diff --git 
a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb 
b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
index 919fad6..a37171f 100644
--- a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
+++ b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
@@ -125,8 +125,6 @@
   end
 
   def click_button(label)
-initial_header_text = details_header.text
-
 details_button(label).click
 
 # It takes a few moments until Accept and Reject buttons

-- 
To view, visit https://gerrit.wikimedia.org/r/251963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00b651f44eafdf7b784814882984542b854e2009
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] More tweaks for server groups - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: More tweaks for server groups
..


More tweaks for server groups

Change-Id: I2a3e9c12e26ab56d195737075e0f00d4a21d72f4
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index c1775b0..84ab466 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -60,6 +60,8 @@
 db-parsercache = debdeploy-parsercache:standard
 db-labsdb = debdeploy-labsdb:standard
 db-misc-servers = debdeploy-db-analytics:standard, 
debdeploy-db-sanitarium:standard
+db-dbstore = debdeploy-db-dbstore:standard
+all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard
@@ -94,6 +96,7 @@
 labvirt-canary = debdeploy-nova-compute:canary
 wdqs = debdeploy-wdqs:standard
 spark = debdeploy-spark-worker:standard
+poolcounter = debdeploy-poolcounter-eqiad:standard, 
debdeploy-poolcounter-codfw:standard
 poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard
 poolcounter-codfw = debdeploy-poolcounter-codfw:standard
 imagescaler = debdeploy-imagescaler-eqiad:standard, 
debdeploy-imagescaler-codfw:standard, debdeploy-imagescaler-eqiad:canary, 
debdeploy-imagescaler-codfw:canary
@@ -116,4 +119,3 @@
 mw-canary-single = debdeploy-appserver:single_canary
 openldap-corp = debdeploy-openldap-corp:standard, 
debdeploy-openldap-corp:canary
 openldap-corp-canary = debdeploy-openldap-corp:canary
-debdeploy-db-dbstore = debdeploy-db-dbstore:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/251943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a3e9c12e26ab56d195737075e0f00d4a21d72f4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] cassandra: add restbase[12]00[12] to seeds - change (operations/puppet)

2015-11-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: add restbase[12]00[12] to seeds
..


cassandra: add restbase[12]00[12] to seeds

Change-Id: Ic4e36a688d374541ee454e8c3e081d7600de2a9b
---
M hieradata/role/codfw/restbase.yaml
M hieradata/role/common/cassandra.yaml
M hieradata/role/eqiad/restbase.yaml
3 files changed, 24 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/hieradata/role/codfw/restbase.yaml 
b/hieradata/role/codfw/restbase.yaml
index 74d14a2..004d0d5 100644
--- a/hieradata/role/codfw/restbase.yaml
+++ b/hieradata/role/codfw/restbase.yaml
@@ -1,6 +1,12 @@
 restbase::seeds:
 - restbase2001.codfw.wmnet
+- restbase2001-a.codfw.wmnet
+- restbase2001-b.codfw.wmnet
+- restbase2001-c.codfw.wmnet
 - restbase2002.codfw.wmnet
+- restbase2002-a.codfw.wmnet
+- restbase2002-b.codfw.wmnet
+- restbase2002-c.codfw.wmnet
 - restbase2003.codfw.wmnet
 - restbase2004.codfw.wmnet
 - restbase2005.codfw.wmnet
diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 9d6c956..61657e5 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -6,7 +6,13 @@
 
 cassandra::seeds:
 - restbase1001.eqiad.wmnet
+- restbase1001-a.eqiad.wmnet
+- restbase1001-b.eqiad.wmnet
+- restbase1001-c.eqiad.wmnet
 - restbase1002.eqiad.wmnet
+- restbase1002-a.eqiad.wmnet
+- restbase1002-b.eqiad.wmnet
+- restbase1002-c.eqiad.wmnet
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet
@@ -15,7 +21,13 @@
 - restbase1008.eqiad.wmnet
 - restbase1009.eqiad.wmnet
 - restbase2001.codfw.wmnet
+- restbase2001-a.codfw.wmnet
+- restbase2001-b.codfw.wmnet
+- restbase2001-c.codfw.wmnet
 - restbase2002.codfw.wmnet
+- restbase2002-a.codfw.wmnet
+- restbase2002-b.codfw.wmnet
+- restbase2002-c.codfw.wmnet
 - restbase2003.codfw.wmnet
 - restbase2004.codfw.wmnet
 - restbase2005.codfw.wmnet
diff --git a/hieradata/role/eqiad/restbase.yaml 
b/hieradata/role/eqiad/restbase.yaml
index 0c17515..d0a9b7f 100644
--- a/hieradata/role/eqiad/restbase.yaml
+++ b/hieradata/role/eqiad/restbase.yaml
@@ -1,6 +1,12 @@
 restbase::seeds:
 - restbase1001.eqiad.wmnet
+- restbase1001-a.eqiad.wmnet
+- restbase1001-b.eqiad.wmnet
+- restbase1001-c.eqiad.wmnet
 - restbase1002.eqiad.wmnet
+- restbase1002-a.eqiad.wmnet
+- restbase1002-b.eqiad.wmnet
+- restbase1002-c.eqiad.wmnet
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet

-- 
To view, visit https://gerrit.wikimedia.org/r/251945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4e36a688d374541ee454e8c3e081d7600de2a9b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] RL: Fixed tooltips and minor RL tweaks - change (mediawiki...BlueSpiceFoundation)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: RL: Fixed tooltips and minor RL tweaks
..


RL: Fixed tooltips and minor RL tweaks

* Fixed a coding error where mw.using was called instead of
  mw.loader.using
* Removed RL module 'adds' of non existing modules
* Did little refactoring with file names to unify strucutre

PatchSet 2:
* Implemented comments by mglaser

Change-Id: I345bf35a189df1e7f7287e89c14db20f8aa82935
---
M includes/CoreHooks.php
M resources/Resources.php
A resources/bluespice/bluespice.tooltip.js
D resources/bluespice/bs.tools.js
4 files changed, 36 insertions(+), 26 deletions(-)

Approvals:
  Mglaser: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 43f4e2e..929987f 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -76,9 +76,8 @@

[MediaWiki-commits] [Gerrit] terbium: do not include noc - change (operations/puppet)

2015-11-09 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251952

Change subject: terbium: do not include noc
..

terbium: do not include noc

Also, fix a chain of dependencies in module noc

Change-Id: I47abcd234d7e15de1ac395c40b57993a1050a90f
---
M manifests/site.pp
M modules/noc/manifests/init.pp
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/251952/1

diff --git a/manifests/site.pp b/manifests/site.pp
index fda8f54..2b608a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2402,7 +2402,7 @@
 
 # https://wikitech.wikimedia.org/wiki/Terbium
 node 'terbium.eqiad.wmnet' {
-role db::maintenance, peopleweb, noc, mediawiki::maintenance, backup::host
+role db::maintenance, peopleweb, mediawiki::maintenance, backup::host
 
 include ldap::role::client::labs
 
diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 971bdf3..3bd2046 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -50,6 +50,7 @@
 owner   => 'mwdeploy',
 group   => 'mwdeploy',
 content => template('noc/dbtree.config.php.erb'),
+require => Git::Clone['operations/software/dbtree']
 }
 
 # Monitoring

-- 
To view, visit https://gerrit.wikimedia.org/r/251952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47abcd234d7e15de1ac395c40b57993a1050a90f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] cassandra: additional instances for eqiad/codfw production - change (operations/dns)

2015-11-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: additional instances for eqiad/codfw production
..


cassandra: additional instances for eqiad/codfw production

add 3x instances for machines in the same row in eqiad and codfw

Bug: T95250
Change-Id: Ic3c62bbfed0b4476d189a39293851c69d90e693d
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 24 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 689e56c..cb1512f 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -376,6 +376,12 @@
 221 1H IN PTR   restbase1002.eqiad.wmnet.
 222 1H IN PTR   oxygen.eqiad.wmnet.
 223 1H IN PTR   restbase1007.eqiad.wmnet.
+224 1H IN PTR   restbase1001-a.eqiad.wmnet.
+225 1H IN PTR   restbase1001-b.eqiad.wmnet.
+226 1H IN PTR   restbase1001-c.eqiad.wmnet.
+227 1H IN PTR   restbase1002-a.eqiad.wmnet.
+228 1H IN PTR   restbase1002-b.eqiad.wmnet.
+229 1H IN PTR   restbase1002-c.eqiad.wmnet.
 
 $ORIGIN 1.64.{{ zonename }}.
 
@@ -2853,6 +2859,12 @@
 159 1H IN PTR   restbase-test2003-b.codfw.wmnet.
 160 1H IN PTR   ms-be2018.codfw.wmnet.
 161 1H IN PTR   ms-be2019.codfw.wmnet.
+162 1H IN PTR   restbase2001-a.codfw.wmnet.
+163 1H IN PTR   restbase2001-b.codfw.wmnet.
+164 1H IN PTR   restbase2001-c.codfw.wmnet.
+165 1H IN PTR   restbase2002-a.codfw.wmnet.
+166 1H IN PTR   restbase2002-b.codfw.wmnet.
+167 1H IN PTR   restbase2002-c.codfw.wmnet.
 
 $ORIGIN 17.192.{{ zonename }}.
 1   1H IN PTR   vl2018-eth1.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 6d5baff..b2b185f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -727,7 +727,13 @@
 rdb1007 1H  IN A10.64.32.18
 rdb1008 1H  IN A10.64.32.19
 restbase10011H  IN A10.64.0.220
+restbase1001-a  1H  IN A10.64.0.224 ; cassandra instance
+restbase1001-b  1H  IN A10.64.0.225 ; cassandra instance
+restbase1001-c  1H  IN A10.64.0.226 ; cassandra instance
 restbase10021H  IN A10.64.0.221
+restbase1002-a  1H  IN A10.64.0.227 ; cassandra instance
+restbase1002-b  1H  IN A10.64.0.228 ; cassandra instance
+restbase1002-c  1H  IN A10.64.0.229 ; cassandra instance
 restbase10031H  IN A10.64.32.159
 restbase10041H  IN A10.64.32.160
 restbase10051H  IN A10.64.48.99
@@ -2641,7 +2647,13 @@
 restbase-test2003-a 1H  IN A10.192.16.158 ; cassandra instance
 restbase-test2003-b 1H  IN A10.192.16.159 ; cassandra instance
 restbase20011H  IN A10.192.16.152
+restbase2001-a  1H  IN A10.192.16.162 ; cassandra instance
+restbase2001-b  1H  IN A10.192.16.163 ; cassandra instance
+restbase2001-c  1H  IN A10.192.16.164 ; cassandra instance
 restbase20021H  IN A10.192.16.153
+restbase2002-a  1H  IN A10.192.16.165 ; cassandra instance
+restbase2002-b  1H  IN A10.192.16.166 ; cassandra instance
+restbase2002-c  1H  IN A10.192.16.167 ; cassandra instance
 restbase20031H  IN A10.192.32.124
 restbase20041H  IN A10.192.32.125
 restbase20051H  IN A10.192.48.37

-- 
To view, visit https://gerrit.wikimedia.org/r/251941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3c62bbfed0b4476d189a39293851c69d90e693d
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Filippo Giunchedi 
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 restbase to 061fe8d - change (mediawiki...deploy)

2015-11-09 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged.

Change subject: Update restbase to 061fe8d
..


Update restbase to 061fe8d

List of changes:
8e678f0 Page revisions: Bug fix: Check array length difference correctly
420ce2e Cleanup: Remove backwards-compatibility to old action module config 
style
b6c2fa1 Clarify 404 errors and make room for bigger ints
0fc8d1a Use string instead of long
660d39b Use long instead of string, improve tests
24b59ae Remove test that only works locally
9dfb87f Remove outdated comment
8254710 Parsoid: Bug fix, sections request returns full content if no-cache is 
provided and render unchanged
a88beaf Nitting
ca743a6 Pageviews: Use DTCS for the article flat column family
xxx Update node module dependencies

Change-Id: Ic87e4f0fe5ba6e1452bccdf43e0fea1b4fd8221d
---
M node_modules/ajv/lib/compile/resolve.js
M node_modules/ajv/package.json
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
R node_modules/core-js/library/modules/$.add-to-unscopables.js
M node_modules/core-js/library/modules/$.array-fill.js
M node_modules/core-js/library/modules/$.array-methods.js
A node_modules/core-js/library/modules/$.array-species-create.js
M node_modules/core-js/library/modules/$.buffer.js
M node_modules/core-js/library/modules/$.collection-strong.js
M node_modules/core-js/library/modules/$.collection-weak.js
M node_modules/core-js/library/modules/$.collection.js
M node_modules/core-js/library/modules/$.core.js
D node_modules/core-js/library/modules/$.def.js
R node_modules/core-js/library/modules/$.descriptors.js
A node_modules/core-js/library/modules/$.export.js
M node_modules/core-js/library/modules/$.fix-re-wks.js
M node_modules/core-js/library/modules/$.flags.js
M node_modules/core-js/library/modules/$.get-names.js
M node_modules/core-js/library/modules/$.hide.js
M node_modules/core-js/library/modules/$.is-array-iter.js
M node_modules/core-js/library/modules/$.iter-create.js
M node_modules/core-js/library/modules/$.iter-define.js
M node_modules/core-js/library/modules/$.iter-detect.js
R node_modules/core-js/library/modules/$.math-expm1.js
R node_modules/core-js/library/modules/$.math-log1p.js
R node_modules/core-js/library/modules/$.math-sign.js
M node_modules/core-js/library/modules/$.microtask.js
D node_modules/core-js/library/modules/$.mix.js
R node_modules/core-js/library/modules/$.object-assign.js
M node_modules/core-js/library/modules/$.object-sap.js
A node_modules/core-js/library/modules/$.redefine-all.js
R node_modules/core-js/library/modules/$.redefine.js
R node_modules/core-js/library/modules/$.same-value.js
A node_modules/core-js/library/modules/$.set-species.js
R node_modules/core-js/library/modules/$.set-to-string-tag.js
M node_modules/core-js/library/modules/$.species-constructor.js
D node_modules/core-js/library/modules/$.species.js
M node_modules/core-js/library/modules/$.string-at.js
M node_modules/core-js/library/modules/$.string-trim.js
M node_modules/core-js/library/modules/$.task.js
A node_modules/core-js/library/modules/$.to-primitive.js
M node_modules/core-js/library/modules/$.typed-array.js
A node_modules/core-js/library/modules/$.typed.js
M node_modules/core-js/library/modules/core.delay.js
M node_modules/core-js/library/modules/core.dict.js
M node_modules/core-js/library/modules/core.function.part.js
M node_modules/core-js/library/modules/core.is-iterable.js
M node_modules/core-js/library/modules/core.log.js
M node_modules/core-js/library/modules/core.object.classof.js
M node_modules/core-js/library/modules/core.object.define.js
M node_modules/core-js/library/modules/core.object.is-object.js
M node_modules/core-js/library/modules/core.object.make.js
M node_modules/core-js/library/modules/core.string.escape-html.js
M node_modules/core-js/library/modules/core.string.unescape-html.js
M node_modules/core-js/library/modules/es5.js
M node_modules/core-js/library/modules/es6.array.copy-within.js
M node_modules/core-js/library/modules/es6.array.fill.js
M node_modules/core-js/library/modules/es6.array.find-index.js
M node_modules/core-js/library/modules/es6.array.find.js
M node_modules/core-js/library/modules/es6.array.from.js
M node_modules/core-js/library/modules/es6.array.iterator.js
M node_modules/core-js/library/modules/es6.array.of.js
M node_modules/core-js/library/modules/es6.array.species.js
A node_modules/core-js/library/modules/es6.date.to-string.js
M node_modules/core-js/library/modules/es6.math.acosh.js
M

[MediaWiki-commits] [Gerrit] exim: Add and use $::other_site to provide LDAP fallback - change (operations/puppet)

2015-11-09 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: exim: Add and use $::other_site to provide LDAP fallback
..


exim: Add and use $::other_site to provide LDAP fallback

exim supports a list as an argument to the ldap_default_servers
argument. We use this to provide a fallback for when the DC-local corp
LDAP mirror fails. For this to work, we need a mapping though of DCs to
their fallbacks. Introduce the $other_site variable to provide this
functionality

Bug: T82662
Change-Id: I68d77bf4bf17dbf782a36aad382f13f601c7d50f
---
M manifests/realm.pp
M templates/exim/exim4.conf.mx.erb
2 files changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/realm.pp b/manifests/realm.pp
index 6cfbddf..dd5ae18 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -36,6 +36,16 @@
 default   => '(undefined)'
 }
 
+# This is used to define the fallback site and is to be used by applications 
that
+# are capable of automatically detecting a failed service and falling back to
+# another one. Only the 2 sites that make sense to really be here are added for
+# now
+$other_site = $site ? {
+'codfw' => 'eqiad',
+'eqiad' => 'codfw',
+default => '(undefined)'
+}
+
 $site_tier = $::realm ? {
 production => $::site ? {
 'eqiad' => 'one',
diff --git a/templates/exim/exim4.conf.mx.erb b/templates/exim/exim4.conf.mx.erb
index 4fc0618..34197e5 100644
--- a/templates/exim/exim4.conf.mx.erb
+++ b/templates/exim/exim4.conf.mx.erb
@@ -21,7 +21,8 @@
 hide mysql_servers =  m2-master.eqiad.wmnet/otrs/exim/<%= @otrs_mysql_password 
%> : m2-slave.eqiad.wmnet/otrs/exim/<%= @otrs_mysql_password %>
 
 # LDAP lookups (Office)
-ldap_default_servers = ldap-mirror.wikimedia.org
+# NOTE: temporarily keeping ldap-mirror.wikimedia.org until migration is 
complete to ldap-corp.$::site
+ldap_default_servers = ldap-mirror.wikimedia.org : ldap-corp.<%= @site 
%>.wikimedia.org : ldap-corp.<%= @other_site %>.wikimedia.org
 LDAPPASSWORD=<%= @smtp_ldap_password %>
 
 domainlist system_domains = @

-- 
To view, visit https://gerrit.wikimedia.org/r/249868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I68d77bf4bf17dbf782a36aad382f13f601c7d50f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] More tweaks for server groups - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251943

Change subject: More tweaks for server groups
..

More tweaks for server groups

Change-Id: I2a3e9c12e26ab56d195737075e0f00d4a21d72f4
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/251943/1

diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index c1775b0..84ab466 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -60,6 +60,8 @@
 db-parsercache = debdeploy-parsercache:standard
 db-labsdb = debdeploy-labsdb:standard
 db-misc-servers = debdeploy-db-analytics:standard, 
debdeploy-db-sanitarium:standard
+db-dbstore = debdeploy-db-dbstore:standard
+all-db = debdeploy-parsercache:standard, debdeploy-labsdb:standard, 
debdeploy-db-analytics:standard, debdeploy-db-sanitarium:standard, 
debdeploy-db-dbstore:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard
@@ -94,6 +96,7 @@
 labvirt-canary = debdeploy-nova-compute:canary
 wdqs = debdeploy-wdqs:standard
 spark = debdeploy-spark-worker:standard
+poolcounter = debdeploy-poolcounter-eqiad:standard, 
debdeploy-poolcounter-codfw:standard
 poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard
 poolcounter-codfw = debdeploy-poolcounter-codfw:standard
 imagescaler = debdeploy-imagescaler-eqiad:standard, 
debdeploy-imagescaler-codfw:standard, debdeploy-imagescaler-eqiad:canary, 
debdeploy-imagescaler-codfw:canary
@@ -116,4 +119,3 @@
 mw-canary-single = debdeploy-appserver:single_canary
 openldap-corp = debdeploy-openldap-corp:standard, 
debdeploy-openldap-corp:canary
 openldap-corp-canary = debdeploy-openldap-corp:canary
-debdeploy-db-dbstore = debdeploy-db-dbstore:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/251943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a3e9c12e26ab56d195737075e0f00d4a21d72f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix grain name - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Fix grain name
..


Fix grain name

Change-Id: Ieb324eb896db62bbd77c808e5b1532db3e075524
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 84ab466..722ad6b 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -41,8 +41,8 @@
 bastion-canary = debdeploy-bastion:canary
 dns-auth = debdeploy-authdns:standard, debdeploy-authdns:canary
 dns-auth-canary = debdeploy-authdns:canary
-dns-rec = debdeploy-recursor:standard, debdeploy-recursor:canary
-dns-rec-canary = debdeploy-recursor:canary
+dns-rec = debdeploy-dnsrecursor:standard, debdeploy-dnsrecursor:canary
+dns-rec-canary = debdeploy-dnsrecursor:canary
 stat = debdeploy-stat:standard, debdeploy-kafka:canary
 kafka-canary = debdeploy-kafka:canary
 kafka = debdeploy-kafka:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/251946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb324eb896db62bbd77c808e5b1532db3e075524
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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 button on references snak removes only the snak - change (mediawiki...Wikibase)

2015-11-09 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251947

Change subject: Remove button on references snak removes only the snak
..

Remove button on references snak removes only the snak

Bug: T118161
Change-Id: I8772ece230700ffc9ceea30898ece1df9e925a80
---
M 
view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/47/251947/1

diff --git 
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
 
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
index 3875a53..d0b0041 100644
--- 
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
+++ 
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
@@ -36,7 +36,9 @@
}
$referenceview.removetoolbar( options )
.on( 'removetoolbarremove.removetoolbar', function( 
event ) {
-   removeFromListView();
+   if ( event.target === $referenceview[0] ) {
+   removeFromListView();
+   }
} );
 
}

-- 
To view, visit https://gerrit.wikimedia.org/r/251947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8772ece230700ffc9ceea30898ece1df9e925a80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Kill CirrusSearch-slow-queries alert - change (operations/puppet)

2015-11-09 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251948

Change subject: Kill CirrusSearch-slow-queries alert
..

Kill CirrusSearch-slow-queries alert

It has been broken for a year and a half by now. It has been on the list
for the search team to fix since at least June but this hasn't happened
and is not likely to happen soon. The check has been firing off alerts
often, but noone seems to care about them, which makes the check
probably useless in the first place.

Kill it for now, maybe at some point someone will reintroduce it with a
working one.

Bug: T84163
Change-Id: I1862bf2e7a4d643fc9bac9871a51a8cce8390ea8
---
M manifests/role/logging.pp
1 file changed, 0 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/251948/1

diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 739f5dd..7c50160 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -97,34 +97,6 @@
 source => 'puppet:///files/misc/scripts/fatalmonitor',
 }
 
-$cirrussearch_slow_log_check_interval = 5
-# Send CirrusSearch-slow.log entry rate to ganglia.
-logster::job { 'CirrusSearch-slow.log':
-parser  => 'LineCountLogster',
-logfile => "${log_directory}/CirrusSearchSlowRequests.log",
-logster_options => '--output ganglia --metric-prefix 
CirrusSearch-slow.log',
-minute  => "*/${cirrussearch_slow_log_check_interval}"
-}
-# The logster job runs every $cirrussearch_slow_log_check_interval
-# minutes.  We set retries to
-# 60 minutes / cirrussearch_slow_log_check_interval minutes)
-# This should keep icinga from alerting us unless the alert thresholds are
-# exceeded for more than an hour.
-monitoring::ganglia { 'CirrusSearch-slow-queries':
-description   => 'Slow CirrusSearch query rate',
-# this metric is output to ganglia by logster
-metric=> 'CirrusSearch-slow.log_line_rate',
-# warning  ->  36 queries/h
-# critical -> 360 queries/h
-warning   => '0.01',
-critical  => '0.1',
-normal_check_interval => $cirrussearch_slow_log_check_interval,
-retry_check_interval  => $cirrussearch_slow_log_check_interval,
-retries   => (60/$cirrussearch_slow_log_check_interval),
-require   => Logster::Job['CirrusSearch-slow.log'],
-}
-
-
 }
 
 # == Class role::logging::mediawiki::errors

-- 
To view, visit https://gerrit.wikimedia.org/r/251948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1862bf2e7a4d643fc9bac9871a51a8cce8390ea8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Kill CirrusSearch-slow-queries alert - change (operations/puppet)

2015-11-09 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: Kill CirrusSearch-slow-queries alert
..


Kill CirrusSearch-slow-queries alert

It has been broken for a year and a half by now. It has been on the list
for the search team to fix since at least June but this hasn't happened
and is not likely to happen soon. The check has been firing off alerts
often, but noone seems to care about them, which makes the check
probably useless in the first place.

Kill it for now, maybe at some point someone will reintroduce it with a
working one.

Bug: T84163
Change-Id: I1862bf2e7a4d643fc9bac9871a51a8cce8390ea8
---
M manifests/role/logging.pp
1 file changed, 0 insertions(+), 28 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 739f5dd..7c50160 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -97,34 +97,6 @@
 source => 'puppet:///files/misc/scripts/fatalmonitor',
 }
 
-$cirrussearch_slow_log_check_interval = 5
-# Send CirrusSearch-slow.log entry rate to ganglia.
-logster::job { 'CirrusSearch-slow.log':
-parser  => 'LineCountLogster',
-logfile => "${log_directory}/CirrusSearchSlowRequests.log",
-logster_options => '--output ganglia --metric-prefix 
CirrusSearch-slow.log',
-minute  => "*/${cirrussearch_slow_log_check_interval}"
-}
-# The logster job runs every $cirrussearch_slow_log_check_interval
-# minutes.  We set retries to
-# 60 minutes / cirrussearch_slow_log_check_interval minutes)
-# This should keep icinga from alerting us unless the alert thresholds are
-# exceeded for more than an hour.
-monitoring::ganglia { 'CirrusSearch-slow-queries':
-description   => 'Slow CirrusSearch query rate',
-# this metric is output to ganglia by logster
-metric=> 'CirrusSearch-slow.log_line_rate',
-# warning  ->  36 queries/h
-# critical -> 360 queries/h
-warning   => '0.01',
-critical  => '0.1',
-normal_check_interval => $cirrussearch_slow_log_check_interval,
-retry_check_interval  => $cirrussearch_slow_log_check_interval,
-retries   => (60/$cirrussearch_slow_log_check_interval),
-require   => Logster::Job['CirrusSearch-slow.log'],
-}
-
-
 }
 
 # == Class role::logging::mediawiki::errors

-- 
To view, visit https://gerrit.wikimedia.org/r/251948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1862bf2e7a4d643fc9bac9871a51a8cce8390ea8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
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 "Enable ferm on kafka1014" - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Revert "Enable ferm on kafka1014"
..


Revert "Enable ferm on kafka1014"

This reverts commit d5a6a3353d3eca3bd4beb48fdf6f579cb9821e7f.

Change-Id: Iae5a926250a9c1050625e8c6244e9cf455cd01b3
---
M manifests/site.pp
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 2b608a7..69c2dd3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1154,10 +1154,6 @@
 role analytics::kafka::server
 include role::analytics
 include standard
-
-if $::hostname == 'kafka1014' {
-include base::firewall
-}
 }
 
 # virtual machine for misc. PHP apps

-- 
To view, visit https://gerrit.wikimedia.org/r/251962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae5a926250a9c1050625e8c6244e9cf455cd01b3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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 regression in I24d9b16 - change (mediawiki/core)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix regression in I24d9b16
..


Fix regression in I24d9b16

I accidently lost this a CSS block in the transition, and the first
page was missing the prefsection class.

Bug: T115692
Change-Id: I712824cf33bf842e42ca9c6e6660a4cbbf9e6d8e
---
M resources/src/mediawiki.special/mediawiki.special.preferences.js
M resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.js 
b/resources/src/mediawiki.special/mediawiki.special.preferences.js
index f799eaf..dd6c2ed 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.js
@@ -20,8 +20,8 @@
.attr( {
role: 'tabpanel',
'aria-labelledby': labelFunc
-   } )
-   .not( '#mw-prefsection-personal' )
+   } );
+   $fieldsets.not( '#mw-prefsection-personal' )
.hide()
.attr( 'aria-hidden', 'true' );
 
diff --git 
a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css 
b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
index e6785b4..5b76712 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
@@ -33,6 +33,11 @@
zoom: 1;
 }
 
+/* When JS is enabled, .mw-preferences-messageboxes are replaced with 
mw.notifications */
+.client-js .mw-preferences-messagebox {
+   display: none;
+}
+
 .client-nojs #preftoc {
display: none;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/251848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I712824cf33bf842e42ca9c6e6660a4cbbf9e6d8e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] cassandra: additional instances for eqiad/codfw production - change (operations/dns)

2015-11-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251941

Change subject: cassandra: additional instances for eqiad/codfw production
..

cassandra: additional instances for eqiad/codfw production

add 3x instances for machines in the same row in eqiad and codfw

Bug: T95250
Change-Id: Ic3c62bbfed0b4476d189a39293851c69d90e693d
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/41/251941/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index f0d067c..db5c4cf 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -374,6 +374,12 @@
 221 1H IN PTR   restbase1002.eqiad.wmnet.
 222 1H IN PTR   oxygen.eqiad.wmnet.
 223 1H IN PTR   restbase1007.eqiad.wmnet.
+224 1H IN PTR   restbase1001-a.eqiad.wmnet.
+225 1H IN PTR   restbase1001-b.eqiad.wmnet.
+226 1H IN PTR   restbase1001-c.eqiad.wmnet.
+227 1H IN PTR   restbase1002-a.eqiad.wmnet.
+228 1H IN PTR   restbase1002-b.eqiad.wmnet.
+229 1H IN PTR   restbase1002-c.eqiad.wmnet.
 
 $ORIGIN 1.64.{{ zonename }}.
 
@@ -2846,6 +2852,12 @@
 159 1H IN PTR   restbase-test2003-b.codfw.wmnet.
 160 1H IN PTR   ms-be2018.codfw.wmnet.
 161 1H IN PTR   ms-be2019.codfw.wmnet.
+162 1H IN PTR   restbase2001-a.codfw.wmnet.
+163 1H IN PTR   restbase2001-b.codfw.wmnet.
+164 1H IN PTR   restbase2001-c.codfw.wmnet.
+165 1H IN PTR   restbase2002-a.codfw.wmnet.
+166 1H IN PTR   restbase2002-b.codfw.wmnet.
+167 1H IN PTR   restbase2002-c.codfw.wmnet.
 
 $ORIGIN 17.192.{{ zonename }}.
 1   1H IN PTR   vl2018-eth1.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index a5eef4d..8f72c45 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -723,7 +723,13 @@
 rdb1003 1H  IN A10.64.0.201
 rdb1004 1H  IN A10.64.16.183
 restbase10011H  IN A10.64.0.220
+restbase1001-a  1H  IN A10.64.0.224 ; cassandra instance
+restbase1001-b  1H  IN A10.64.0.225 ; cassandra instance
+restbase1001-c  1H  IN A10.64.0.226 ; cassandra instance
 restbase10021H  IN A10.64.0.221
+restbase1002-a  1H  IN A10.64.0.227 ; cassandra instance
+restbase1002-b  1H  IN A10.64.0.228 ; cassandra instance
+restbase1002-c  1H  IN A10.64.0.229 ; cassandra instance
 restbase10031H  IN A10.64.32.159
 restbase10041H  IN A10.64.32.160
 restbase10051H  IN A10.64.48.99
@@ -2635,7 +2641,13 @@
 restbase-test2003-a 1H  IN A10.192.16.158 ; cassandra instance
 restbase-test2003-b 1H  IN A10.192.16.159 ; cassandra instance
 restbase20011H  IN A10.192.16.152
+restbase2001-a  1H  IN A10.192.16.162 ; cassandra instance
+restbase2001-b  1H  IN A10.192.16.163 ; cassandra instance
+restbase2001-c  1H  IN A10.192.16.164 ; cassandra instance
 restbase20021H  IN A10.192.16.153
+restbase2002-a  1H  IN A10.192.16.165 ; cassandra instance
+restbase2002-b  1H  IN A10.192.16.166 ; cassandra instance
+restbase2002-c  1H  IN A10.192.16.167 ; cassandra instance
 restbase20031H  IN A10.192.32.124
 restbase20041H  IN A10.192.32.125
 restbase20051H  IN A10.192.48.37

-- 
To view, visit https://gerrit.wikimedia.org/r/251941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3c62bbfed0b4476d189a39293851c69d90e693d
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Recurse into sub folders for jshint and jscs - change (mediawiki...Echo)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Recurse into sub folders for jshint and jscs
..


Recurse into sub folders for jshint and jscs

Change-Id: I3799151bc4cf30f7bcb4bea2f860da9310959444
---
M .jshintignore
M Gruntfile.js
2 files changed, 13 insertions(+), 6 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.jshintignore b/.jshintignore
index f1f4c6a..2698b38 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,2 +1,4 @@
 tests/externals/
 modules/hooks.txt
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
index 4d28c5e..3466614 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,16 +10,21 @@
grunt.initConfig( {
jshint: {
options: {
-   jshintrc: true
+   jshintrc: true,
+   ignores: [
+   'tests/externals/**'
+   ]
},
all: [
-   '*.js',
-   'modules/**/*.js',
-   'tests/qunit/**/*.js'
+   '**/*.js',
+   '!node_modules/**'
]
},
jscs: {
-   src: '<%= jshint.all %>'
+   src: [
+   '<%= jshint.all %>',
+   '!tests/externals/**'
+   ]
},
csslint: {
options: {
@@ -46,7 +51,7 @@
}
} );
 
-   grunt.registerTask( 'lint', [ 'jscs', 'jshint', 'csslint', 'jsonlint', 
'banana' ] );
+   grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint', 
'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/250186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3799151bc4cf30f7bcb4bea2f860da9310959444
Gerrit-PatchSet: 15
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] zookeeper: Don't expose the JMX port in ferm rules - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251951

Change subject: zookeeper: Don't expose the JMX port in ferm rules
..

zookeeper: Don't expose the JMX port in ferm rules

Change-Id: Ie029f9d9a495c291410d002cf8361009bd8eebb3
---
M manifests/role/zookeeper.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/251951/1

diff --git a/manifests/role/zookeeper.pp b/manifests/role/zookeeper.pp
index 60f85ca..cc818fe 100644
--- a/manifests/role/zookeeper.pp
+++ b/manifests/role/zookeeper.pp
@@ -53,8 +53,8 @@
 
 ferm::service { 'zookeeper':
 proto  => 'tcp',
-# Zookeeper client, protocol, and jmx listen ports.
-port   => "(2181 2182 2183 ${$::zookeeper::server::jmx_port})",
+# Zookeeper client, protocol ports
+port   => "(2181 2182 2183)",
 srange => '($INTERNAL)',
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/251951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie029f9d9a495c291410d002cf8361009bd8eebb3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] dbtree: move to its own directory - change (operations/puppet)

2015-11-09 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: dbtree: move to its own directory
..


dbtree: move to its own directory

Right now it was under /srv/org/wikimedia like peopleweb, no reason for
that given this is not our standard for standalone software.

Change-Id: I188fcc30070302fc31255c925e7db31ebe705985
---
M modules/noc/manifests/init.pp
M modules/noc/templates/dbtree.wikimedia.org.erb
2 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index c80b036..971bdf3 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -31,21 +31,21 @@
 
 
 
-file { ['/srv/org/wikimedia/dbtree', '/srv/org/wikimedia', '/srv/org']:
+file { ['/srv/dbtree']:
 ensure => 'directory',
 owner  => 'mwdeploy',
 group  => 'mwdeploy',
 }
 
 git::clone { 'operations/software/dbtree':
-directory => '/srv/org/wikimedia/dbtree',
+directory => '/srv/dbtree',
 branch=> 'master',
 owner => 'mwdeploy',
 group => 'mwdeploy',
-require   => File['/srv/org/wikimedia/dbtree'],
+require   => File['/srv/dbtree'],
 }
 
-file { '/srv/org/wikimedia/dbtree/inc/config.php':
+file { '/srv/dbtree/inc/config.php':
 ensure  => 'present',
 owner   => 'mwdeploy',
 group   => 'mwdeploy',
diff --git a/modules/noc/templates/dbtree.wikimedia.org.erb 
b/modules/noc/templates/dbtree.wikimedia.org.erb
index 971f9f2..7809540 100644
--- a/modules/noc/templates/dbtree.wikimedia.org.erb
+++ b/modules/noc/templates/dbtree.wikimedia.org.erb
@@ -9,7 +9,7 @@
 
 ServerName dbtree.wikimedia.org
 
-DocumentRoot /srv/org/wikimedia/dbtree
+DocumentRoot /srv/dbtree
 
 ErrorLog /var/log/apache2/error.log
 
@@ -36,7 +36,7 @@
 
 
 
-
+
 = 2.4>
 Require all denied
 

-- 
To view, visit https://gerrit.wikimedia.org/r/251950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I188fcc30070302fc31255c925e7db31ebe705985
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixed Style/Tab RuboCop offense - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251953

Change subject: Fixed Style/Tab RuboCop offense
..

Fixed Style/Tab RuboCop offense

Bug: T117987
Change-Id: I71e95abbb285bab0b260eee7a481b6d5fa59ff3f
---
M .rubocop_todo.yml
M tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
M tests/browser/features/step_definitions/special_translate_steps.rb
M tests/browser/features/step_definitions/translation_stash_steps.rb
M tests/browser/features/support/hooks.rb
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
M tests/browser/features/support/pages/stash_page.rb
M tests/browser/features/support/pages/translate_page.rb
M tests/browser/features/support/pages/user_page.rb
9 files changed, 246 insertions(+), 259 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/53/251953/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c28774b..b080ce0 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -61,19 +61,6 @@
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 246
-# Cop supports --auto-correct.
-Style/Tab:
-  Exclude:
-- 
'tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb'
-- 'tests/browser/features/step_definitions/special_translate_steps.rb'
-- 'tests/browser/features/step_definitions/translation_stash_steps.rb'
-- 'tests/browser/features/support/hooks.rb'
-- 'tests/browser/features/support/pages/manage_translator_sandbox_page.rb'
-- 'tests/browser/features/support/pages/stash_page.rb'
-- 'tests/browser/features/support/pages/translate_page.rb'
-- 'tests/browser/features/support/pages/user_page.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: WordRegex.
diff --git 
a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb 
b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
index 8f0624b..a2872a4 100644
--- a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
+++ b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
@@ -1,214 +1,214 @@
 Given(/^I am logged in as a translation administrator$/) do
-   step "I am logged in"
+  step "I am logged in"
 end
 
 Given(/^I am on the Translator sandbox management page with no users in the 
sandbox$/) do
-   visit(ManageTranslatorSandboxPage, using_params: {extra: 
"integrationtesting=empty"})
+  visit(ManageTranslatorSandboxPage, using_params: {extra: 
"integrationtesting=empty"})
 end
 
 Given(/^I am on the Translator sandbox management page with users in the 
sandbox$/) do
-   visit(ManageTranslatorSandboxPage, using_params: {extra: 
"integrationtesting=populate"})
+  visit(ManageTranslatorSandboxPage, using_params: {extra: 
"integrationtesting=populate"})
 end
 
 When(/^I search for "(.*)" in the sandboxed users search field$/) do |string|
-   on(ManageTranslatorSandboxPage) do |page|
-   page.search = string
-   page.search_element.send_keys :enter
-   end
+  on(ManageTranslatorSandboxPage) do |page|
+page.search = string
+page.search_element.send_keys :enter
+  end
 end
 
 When(/^I click the sandboxed users language filter button$/) do
-   on(ManageTranslatorSandboxPage).language_selector_button
+  on(ManageTranslatorSandboxPage).language_selector_button
 end
 
 When(/^I type "(.+)" in the language filter$/) do |text|
-   on(ManageTranslatorSandboxPage) do |page|
-   page.language_filter = text
-   page.language_filter_element.send_keys [:enter, "\n"]
-   end
+  on(ManageTranslatorSandboxPage) do |page|
+page.language_filter = text
+page.language_filter_element.send_keys [:enter, "\n"]
+  end
 end
 
 When(/^I click the button that clears language selection$/) do
-   on(ManageTranslatorSandboxPage).clear_language_selector_element.click
+  on(ManageTranslatorSandboxPage).clear_language_selector_element.click
 end
 
 When(/^I click the checkbox to select all users$/) do
-   on(ManageTranslatorSandboxPage).select_all_checkbox_element.click
+  on(ManageTranslatorSandboxPage).select_all_checkbox_element.click
 end
 
 When(/^I click the "(.+)" button$/) do |label|
-   on(ManageTranslatorSandboxPage).click_button(label)
+  on(ManageTranslatorSandboxPage).click_button(label)
 end
 
 When(/^I click on "(.+)" in the first column$/) do |username|
-   on(ManageTranslatorSandboxPage).request_with_username(username).click
+  on(ManageTranslatorSandboxPage).request_with_username(username).click
 end
 
 When(/^I click on the checkbox near "(.+)" in the first column$/) do |username|
-   
on(ManageTranslatorSandboxPage).checkbox_for_request_with_username(username).click
+  
on(ManageTranslatorSandboxPage).checkbox_for_request_with_username(username).click
 end

[MediaWiki-commits] [Gerrit] Nova scheduler changes: - change (operations/puppet)

2015-11-09 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251954

Change subject: Nova scheduler changes:
..

Nova scheduler changes:

- Add labvirt1005 and 1010 to the pool
- Reduce the disk space overcommit level to encourage use of these
  new (mostly empty) hosts

Change-Id: Ia4078a8a6e4ae05172ed2c5694d10345f02aae01
---
M modules/openstack/templates/kilo/nova/nova.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/251954/1

diff --git a/modules/openstack/templates/kilo/nova/nova.conf.erb 
b/modules/openstack/templates/kilo/nova/nova.conf.erb
index 1ba6083..37d8ba5 100644
--- a/modules/openstack/templates/kilo/nova/nova.conf.erb
+++ b/modules/openstack/templates/kilo/nova/nova.conf.erb
@@ -9,7 +9,7 @@
 instance_name_template=i-%08x
 daemonize=1
 scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
-wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009
+wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1005,labvirt1006,labvirt1007,labvirt1008,labvirt1009,labvirt1010
 
scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,SchedulerPoolFilter,DiskFilter
 
 # Don't allow duplicate instance names
@@ -101,7 +101,7 @@
 ram_allocation_ratio=1.3
 
 # Since our images are copy-on-write we can support some overcommitting here.
-disk_allocation_ratio=2.1
+disk_allocation_ratio=1.8
 
 
 # Deprecated, remove in Kilo:

-- 
To view, visit https://gerrit.wikimedia.org/r/251954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4078a8a6e4ae05172ed2c5694d10345f02aae01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove subnet for ulsfo-eqiad Giglinx link - change (operations/dns)

2015-11-09 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251955

Change subject: Remove subnet for ulsfo-eqiad Giglinx link
..

Remove subnet for ulsfo-eqiad Giglinx link

Bug: T118170
Change-Id: I44548f86b34a1c1d4452e7b07321aa4fcbd760d5
---
M templates/155.80.208.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
2 files changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/55/251955/1

diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index d3362c8..f72fafc 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -42,10 +42,6 @@
 36  1H IN PTR   xe-5-2-2.cr2-eqiad.wikimedia.org.
 37  1H IN PTR   xe-0-0-3.cr1-ulsfo.wikimedia.org.
 
-;208.80.155.38/31 cr2-ulsfo <-> cr1-eqiad
-
-38  1H IN PTR   xe-4-2-1.cr1-eqiad.wikimedia.org.
-39  1H IN PTR   xe-1-2-0.cr2-ulsfo.wikimedia.org.
 
 ;208.80.155.64/28 sandbox1-b-eqiad subnet
 65  1H IN PTR   vrrp-gw-1202.wikimedia.org.
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7653021..1b17356 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -95,11 +95,9 @@
 
 $ORIGIN 3.0.e.f.{{ zonename }}.
 
-; cr2-ulsfo <--> cr1-eqiad (2620:0:863:fe04::/64)
+; unallocated (2620:0:863:fe04::/64)
 
 $ORIGIN 4.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-4-2-1.cr1-eqiad.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-1-2-0.cr2-ulsfo.wikimedia.org.
 
 ; cr1-ulsfo <--> mr1-ulsfo (2620:0:863:fe05::/64)
 

-- 
To view, visit https://gerrit.wikimedia.org/r/251955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44548f86b34a1c1d4452e7b07321aa4fcbd760d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] terbium: do not include noc - change (operations/puppet)

2015-11-09 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: terbium: do not include noc
..


terbium: do not include noc

Also, fix a chain of dependencies in module noc

Change-Id: I47abcd234d7e15de1ac395c40b57993a1050a90f
---
M manifests/site.pp
M modules/noc/manifests/init.pp
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index fda8f54..2b608a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2402,7 +2402,7 @@
 
 # https://wikitech.wikimedia.org/wiki/Terbium
 node 'terbium.eqiad.wmnet' {
-role db::maintenance, peopleweb, noc, mediawiki::maintenance, backup::host
+role db::maintenance, peopleweb, mediawiki::maintenance, backup::host
 
 include ldap::role::client::labs
 
diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 971bdf3..3bd2046 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -50,6 +50,7 @@
 owner   => 'mwdeploy',
 group   => 'mwdeploy',
 content => template('noc/dbtree.config.php.erb'),
+require => Git::Clone['operations/software/dbtree']
 }
 
 # Monitoring

-- 
To view, visit https://gerrit.wikimedia.org/r/251952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I47abcd234d7e15de1ac395c40b57993a1050a90f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Assign salt grains for labs::db::slave and labs::db::master ... - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252112

Change subject: Assign salt grains for labs::db::slave and labs::db::master 
roles
..

Assign salt grains for labs::db::slave and labs::db::master roles

Change-Id: I218603dded84671df0a0c74bb442fe3779229074
---
A hieradata/role/common/labs/db/master.yaml
A hieradata/role/common/labs/db/slave.yaml
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/252112/1

diff --git a/hieradata/role/common/labs/db/master.yaml 
b/hieradata/role/common/labs/db/master.yaml
new file mode 100644
index 000..47802e8
--- /dev/null
+++ b/hieradata/role/common/labs/db/master.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-labsdb:
+value: standard
diff --git a/hieradata/role/common/labs/db/slave.yaml 
b/hieradata/role/common/labs/db/slave.yaml
new file mode 100644
index 000..47802e8
--- /dev/null
+++ b/hieradata/role/common/labs/db/slave.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-labsdb:
+value: standard

-- 
To view, visit https://gerrit.wikimedia.org/r/252112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I218603dded84671df0a0c74bb442fe3779229074
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update mobileapps to 6c63984 - change (mediawiki...deploy)

2015-11-09 Thread BearND (Code Review)

BearND has submitted this change and it was merged.

Change subject: Update mobileapps to 6c63984
..


Update mobileapps to 6c63984

List of changes:
6667042 Use Parsoid for new mobile-html-section routes
32be312 Offload client DOM transformations
6c63984 Use mobileview for main pages
xxx Update node module dependencies

Change-Id: I58e59950306b2fb243d86d963057544527307bf8
---
D node_modules/ansi-regex/package.json
R node_modules/body-parser/node_modules/bytes/index.js
A node_modules/body-parser/node_modules/bytes/package.json
C node_modules/body-parser/node_modules/content-type/LICENSE
C node_modules/body-parser/node_modules/content-type/index.js
A node_modules/body-parser/node_modules/content-type/package.json
C node_modules/body-parser/node_modules/debug/.jshintrc
C node_modules/body-parser/node_modules/debug/.npmignore
C node_modules/body-parser/node_modules/debug/Makefile
C node_modules/body-parser/node_modules/debug/bower.json
C node_modules/body-parser/node_modules/debug/browser.js
C node_modules/body-parser/node_modules/debug/component.json
C node_modules/body-parser/node_modules/debug/debug.js
C node_modules/body-parser/node_modules/debug/node.js
C node_modules/body-parser/node_modules/debug/node_modules/ms/.npmignore
C node_modules/body-parser/node_modules/debug/node_modules/ms/LICENSE
C node_modules/body-parser/node_modules/debug/node_modules/ms/index.js
A node_modules/body-parser/node_modules/debug/node_modules/ms/package.json
A node_modules/body-parser/node_modules/debug/package.json
R node_modules/body-parser/node_modules/http-errors/LICENSE
R node_modules/body-parser/node_modules/http-errors/index.js
C 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits.js
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits_browser.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/test.js
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
A node_modules/body-parser/node_modules/http-errors/package.json
C node_modules/body-parser/node_modules/on-finished/LICENSE
C node_modules/body-parser/node_modules/on-finished/index.js
C 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/LICENSE
C 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/index.js
A 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/package.json
A node_modules/body-parser/node_modules/on-finished/package.json
R node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/LICENSE
R node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/index.js
A 
node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/package.json
C node_modules/body-parser/node_modules/type-is/LICENSE
C node_modules/body-parser/node_modules/type-is/index.js
C node_modules/body-parser/node_modules/type-is/node_modules/media-typer/LICENSE
C 
node_modules/body-parser/node_modules/type-is/node_modules/media-typer/index.js
A 
node_modules/body-parser/node_modules/type-is/node_modules/media-typer/package.json
C node_modules/body-parser/node_modules/type-is/node_modules/mime-types/LICENSE
C node_modules/body-parser/node_modules/type-is/node_modules/mime-types/index.js
C 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/LICENSE
C 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/db.json
C 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/index.js
A 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/package.json
A 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/package.json
A node_modules/body-parser/node_modules/type-is/package.json
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/LICENSE
C

[MediaWiki-commits] [Gerrit] setting neodymium production dns entries - change (operations/dns)

2015-11-09 Thread RobH (Code Review)

RobH has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252117

Change subject: setting neodymium production dns entries
..

setting neodymium production dns entries

setting up neodymium as salt-master in eqiad

T118210

Change-Id: I703dd8c68d94065231f9b6a1b2e016e16ed19732
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/17/252117/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 4158d24..7728b49 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -689,7 +689,7 @@
 17  1H IN PTR   rutherfordium.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 18  1H IN PTR   rdb1007.eqiad.wmnet.
 19  1H IN PTR   rdb1008.eqiad.wmnet.
-
+20  1H IN PTR   neodymium.eqiad.wmnet.
 21  1H IN PTR   db1051.eqiad.wmnet.
 22  1H IN PTR   db1052.eqiad.wmnet.
 23  1H IN PTR   db1053.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 0f3c4f6..1a9854d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -691,6 +691,7 @@
 mw1258  1H  IN A10.64.48.93
 mw1259  1H  IN A10.64.0.197
 mw1260  1H  IN A10.64.16.146
+neodymium   1H  IN A10.64.32.20
 nobelium1H  IN A10.64.37.14
 ocg1001 1H  IN A10.64.32.151
 ocg1002 1H  IN A10.64.48.42

-- 
To view, visit https://gerrit.wikimedia.org/r/252117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I703dd8c68d94065231f9b6a1b2e016e16ed19732
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] setting install params for neodymium - change (operations/puppet)

2015-11-09 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: setting install params for neodymium
..


setting install params for neodymium

neodymium to become eqiad salt master

T118210

Change-Id: I1e9993e9f66b43e3288a8a2cb632f6f07e312747
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 8 insertions(+), 1 deletion(-)

Approvals:
  RobH: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 411d78a..49f02e0 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -80,7 +80,7 @@
hydrogen) echo partman/raid1-1partition.cfg ;; \
iodine) echo partman/raid1-1partition.cfg ;; \
kafka1013|kafka1014|kafka1020) echo partman/raid1-30G.cfg ;; \
-   labcontrol100[1-2]|labnodepool1001|mira|rdb200[1-4]) echo 
partman/raid1-lvm-ext4-srv.cfg ;; \
+   labcontrol100[1-2]|labnodepool1001|mira|neodymium|rdb200[1-4]) 
echo partman/raid1-lvm-ext4-srv.cfg ;; \
labmon1001) echo partman/raid1-lvm.cfg ;; \
labnet100[1-2]) echo partman/lvm.cfg ;; \
labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 88ba725..0aded74 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5895,6 +5895,13 @@
fixed-address nembus.wikimedia.org;
 }
 
+host neodymium {
+   hardware ethernet 90:B1:1C:2D:79:8C;
+   fixed-address neodymium.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host neon {
hardware ethernet 78:2b:cb:08:a4:2f;
fixed-address neon.wikimedia.org;

-- 
To view, visit https://gerrit.wikimedia.org/r/252119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9993e9f66b43e3288a8a2cb632f6f07e312747
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
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 perf-roots to webperf role (as part of I583d9a571) - change (operations/puppet)

2015-11-09 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252114

Change subject: Add perf-roots to webperf role (as part of I583d9a571)
..

Add perf-roots to webperf role (as part of I583d9a571)

hafnium runs the webperf role, which consists of various stats-gathering
daemons that send data to statsd/graphite.

Change-Id: I44ad5e0815483d628a85c446e7448c08be79a64e
---
A hieradata/role/common/webperf.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/252114/1

diff --git a/hieradata/role/common/webperf.yaml 
b/hieradata/role/common/webperf.yaml
new file mode 100644
index 000..11b4f92
--- /dev/null
+++ b/hieradata/role/common/webperf.yaml
@@ -0,0 +1,2 @@
+admin::groups:
+  - perf-roots

-- 
To view, visit https://gerrit.wikimedia.org/r/252114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44ad5e0815483d628a85c446e7448c08be79a64e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] setting neodymium production dns entries - change (operations/dns)

2015-11-09 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: setting neodymium production dns entries
..


setting neodymium production dns entries

setting up neodymium as salt-master in eqiad

T118210

Change-Id: I703dd8c68d94065231f9b6a1b2e016e16ed19732
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  RobH: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 4158d24..7728b49 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -689,7 +689,7 @@
 17  1H IN PTR   rutherfordium.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 18  1H IN PTR   rdb1007.eqiad.wmnet.
 19  1H IN PTR   rdb1008.eqiad.wmnet.
-
+20  1H IN PTR   neodymium.eqiad.wmnet.
 21  1H IN PTR   db1051.eqiad.wmnet.
 22  1H IN PTR   db1052.eqiad.wmnet.
 23  1H IN PTR   db1053.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 0f3c4f6..1a9854d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -691,6 +691,7 @@
 mw1258  1H  IN A10.64.48.93
 mw1259  1H  IN A10.64.0.197
 mw1260  1H  IN A10.64.16.146
+neodymium   1H  IN A10.64.32.20
 nobelium1H  IN A10.64.37.14
 ocg1001 1H  IN A10.64.32.151
 ocg1002 1H  IN A10.64.48.42

-- 
To view, visit https://gerrit.wikimedia.org/r/252117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I703dd8c68d94065231f9b6a1b2e016e16ed19732
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
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 mobileapps to 6c63984 - change (mediawiki...deploy)

2015-11-09 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252113

Change subject: Update mobileapps to 6c63984
..

Update mobileapps to 6c63984

List of changes:
6667042 Use Parsoid for new mobile-html-section routes
32be312 Offload client DOM transformations
6c63984 Use mobileview for main pages
xxx Update node module dependencies

Change-Id: I58e59950306b2fb243d86d963057544527307bf8
---
D node_modules/ansi-regex/package.json
R node_modules/body-parser/node_modules/bytes/index.js
A node_modules/body-parser/node_modules/bytes/package.json
C node_modules/body-parser/node_modules/content-type/LICENSE
C node_modules/body-parser/node_modules/content-type/index.js
A node_modules/body-parser/node_modules/content-type/package.json
C node_modules/body-parser/node_modules/debug/.jshintrc
C node_modules/body-parser/node_modules/debug/.npmignore
C node_modules/body-parser/node_modules/debug/Makefile
C node_modules/body-parser/node_modules/debug/bower.json
C node_modules/body-parser/node_modules/debug/browser.js
C node_modules/body-parser/node_modules/debug/component.json
C node_modules/body-parser/node_modules/debug/debug.js
C node_modules/body-parser/node_modules/debug/node.js
C node_modules/body-parser/node_modules/debug/node_modules/ms/.npmignore
C node_modules/body-parser/node_modules/debug/node_modules/ms/LICENSE
C node_modules/body-parser/node_modules/debug/node_modules/ms/index.js
A node_modules/body-parser/node_modules/debug/node_modules/ms/package.json
A node_modules/body-parser/node_modules/debug/package.json
R node_modules/body-parser/node_modules/http-errors/LICENSE
R node_modules/body-parser/node_modules/http-errors/index.js
C 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits.js
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits_browser.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/test.js
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
A node_modules/body-parser/node_modules/http-errors/package.json
C node_modules/body-parser/node_modules/on-finished/LICENSE
C node_modules/body-parser/node_modules/on-finished/index.js
C 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/LICENSE
C 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/index.js
A 
node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/package.json
A node_modules/body-parser/node_modules/on-finished/package.json
R node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/LICENSE
R node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/index.js
A 
node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/package.json
C node_modules/body-parser/node_modules/type-is/LICENSE
C node_modules/body-parser/node_modules/type-is/index.js
C node_modules/body-parser/node_modules/type-is/node_modules/media-typer/LICENSE
C 
node_modules/body-parser/node_modules/type-is/node_modules/media-typer/index.js
A 
node_modules/body-parser/node_modules/type-is/node_modules/media-typer/package.json
C node_modules/body-parser/node_modules/type-is/node_modules/mime-types/LICENSE
C node_modules/body-parser/node_modules/type-is/node_modules/mime-types/index.js
C 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/LICENSE
C 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/db.json
C 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/index.js
A 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/package.json
A 
node_modules/body-parser/node_modules/type-is/node_modules/mime-types/package.json
A node_modules/body-parser/node_modules/type-is/package.json
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js
R 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/LICENSE
C

[MediaWiki-commits] [Gerrit] Use str_replace instead of preg_replace with fixed strings - change (mediawiki...SemanticForms)

2015-11-09 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Use str_replace instead of preg_replace with fixed strings
..


Use str_replace instead of preg_replace with fixed strings

Fixes usage of emded in field with templates containing slash

Change-Id: I7ab958495178f9cc8067798c465054dd55e8028b
---
M includes/SF_FormPrinter.php
1 file changed, 8 insertions(+), 10 deletions(-)

Approvals:
  Yaron Koren: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index fe1eb1e..b5b9cde 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1786,10 +1786,7 @@
// keeping a track array (e.g., 
/@replace_(.*)@/)
$reptmp = 
self::makePlaceholderInWikiText( $curPlaceholder );
if ( $curPlaceholder != null && 
$data_text && strpos( $data_text, $reptmp, 0 ) !== false ) {
-   // Escape $template_text, 
because values like $1 cause problems
-   // for preg_replace().
-   $escaped_template_text = 
str_replace( '$', '\$', $template_text );
-   $data_text = preg_replace( '/' 
. $reptmp . '/', $escaped_template_text . $reptmp, $data_text );
+   $data_text = str_replace( 
$reptmp, $template_text . $reptmp, $data_text );
} else {
$data_text .= $template_text . 
"\n";
}
@@ -1832,9 +1829,9 @@
$multipleTemplateString .= 
"\n";
unset ( $template_label );
}
-   $escapedMultipleTemplateString = 
str_replace( '$', '\$', $multipleTemplateString );
-   $form_text = preg_replace( '/' . 
self::makePlaceholderInFormHTML( $curPlaceholder ) . '/',
-   $escapedMultipleTemplateString, 
$form_text );
+
+
+   $form_text = str_replace( 
self::makePlaceholderInFormHTML( $curPlaceholder ), $multipleTemplateString, 
$form_text );
}
if ( ! $all_instances_printed ) {
// This will cause the section to be
@@ -1853,11 +1850,12 @@
// tags in the HTML and wiki-text.
 
foreach ( $placeholderFields as $stringToReplace ) {
+
// remove the @@ tags from the data that 
is submitted
-   $data_text = preg_replace( '/' . 
self::makePlaceholderInWikiText( $stringToReplace ) . '/', '', $data_text );
+   $data_text = str_replace( 
self::makePlaceholderInWikiText( $stringToReplace ), '', $data_text );
 
// remove the @@ tags from the generated 
HTML form
-   $form_text = preg_replace( '/' . 
self::makePlaceholderInFormHTML( $stringToReplace ) . '/', '', $form_text );
+   $form_text = str_replace( 
self::makePlaceholderInFormHTML( $stringToReplace ), '', $form_text );
}
 
// if it wasn't included in the form definition, add the
@@ -1879,7 +1877,7 @@
$existing_page_content = preg_replace( array( 
'/�\{/m', '/\}�/m' ),
array( '{{', '}}' ),
$existing_page_content );
-   $existing_page_content = preg_replace( 
'/\{\{\{insertionpoint\}\}\}/', '', $existing_page_content );
+   $existing_page_content = str_replace( 
'{{{insertionpoint}}}', '', $existing_page_content );
}
$form_text .= Html::hidden( 'partial', 1 );
} elseif ( $source_is_page ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/251823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ab958495178f9cc8067798c465054dd55e8028b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Foxtrott 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add IDs to more inputs, remove duplicate - change (mediawiki...DonationInterface)

2015-11-09 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252109

Change subject: Add IDs to more inputs, remove duplicate
..

Add IDs to more inputs, remove duplicate

Make things easier to target. Remove duplicate 'gateway' input and
unused 'PaypalRedirect' input.

Bug: T117827
Change-Id: Ie7ebc7418545c9d5bd73a4fb0789e882e902f118
---
M gateway_forms/mustache/index.html.mustache
1 file changed, 11 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/09/252109/1

diff --git a/gateway_forms/mustache/index.html.mustache 
b/gateway_forms/mustache/index.html.mustache
index 8157e1c..539b418 100644
--- a/gateway_forms/mustache/index.html.mustache
+++ b/gateway_forms/mustache/index.html.mustache
@@ -31,22 +31,20 @@



-   

-   

-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   

-   
+   


{{{ l10n 
"donate_interface-informationsharing" "url" }}}

-- 
To view, visit https://gerrit.wikimedia.org/r/252109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7ebc7418545c9d5bd73a4fb0789e882e902f118
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Amazon: check CSRF token, preserve data after expiry - change (mediawiki...DonationInterface)

2015-11-09 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252111

Change subject: Amazon: check CSRF token, preserve data after expiry
..

Amazon: check CSRF token, preserve data after expiry

Ensure api.php posts have a valid token, and reload the page with
all the hidden fields on the URL if it expires.  Reload the same
way when there's an issue with the Amazon widgets.

Re-using the expired token message from the Worldpay CC token patch,
which is worded for an alert box.

Bug: T117827
Change-Id: I6c4f95348067b9af203b81b86e2b8c240b9be69a
---
M amazon_gateway/amazon.api.php
M amazon_gateway/amazon.js
2 files changed, 20 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/11/252111/1

diff --git a/amazon_gateway/amazon.api.php b/amazon_gateway/amazon.api.php
index f0eb4aa..b0162cd 100644
--- a/amazon_gateway/amazon.api.php
+++ b/amazon_gateway/amazon.api.php
@@ -13,12 +13,14 @@
public function execute() {
$output = $this->getResult();
$recurring = $this->getParameter( 'recurring');
+   $token = $this->getParameter( 'token' );
$adapterParams = array(
'api_request' => true,
'external_data' => array(
'amount' => $this->getParameter( 'amount' ),
'currency_code' => $this->getParameter( 
'currency_code' ),
-   'recurring' => $this->getParameter( 'recurring' 
),
+   'recurring' => $recurring,
+   'token' => $token,
),
);
 
@@ -30,7 +32,7 @@
'errors',
$adapter->getValidationErrors()
);
-   } else if ( $adapter->checkTokens() ) {
+   } else if ( $token && $adapter->checkTokens() ) {
if ( $recurring ) {
$adapter->addRequestData( array(
'subscr_id' => $this->getParameter( 
'billingAgreementId' ),
@@ -65,7 +67,7 @@
$output->addValue(
null,
'errors',
-   array( 'token-mismatch' => $this->msg( 
'donate_interface-token-mismatch' )->text() )
+   array( 'token-mismatch' => $this->msg( 
'donate_interface-cc-token-expired' )->text() )
);
}
}
diff --git a/amazon_gateway/amazon.js b/amazon_gateway/amazon.js
index 435ea45..5735f13 100644
--- a/amazon_gateway/amazon.js
+++ b/amazon_gateway/amazon.js
@@ -64,6 +64,11 @@
);
}
 
+   function reloadPage() {
+   var qsParams = $( '#payment-form' ).serializeArray();
+   document.location.replace( mw.util.getUrl( 
'Special:AmazonGateway', qsParams ) );
+   }
+
function showErrorAndLoginButton( message ) {
if ( message ) {
addErrorMessage( message );
@@ -75,7 +80,7 @@
type: 'PwA',
color: 'Gold',
size: 'large',
-   authorization: redirectToLogin
+   authorization: reloadPage
}
);
}
@@ -229,6 +234,12 @@
if ( !errors.hasOwnProperty( code ) ) {
continue;
}
+   if ( code === 'token-mismatch' ) {
+   // Session has expired, we need to reload the 
whole page.
+   // FIXME: something nicer than an alert box
+   alert( errors[code] );
+   reloadPage();
+   }
addErrorMessage( errors[code] );
if ( code === 'InvalidPaymentMethod' ) {
// Card declined, but they can try another
@@ -271,9 +282,10 @@
var postdata = {
action: 'di_amazon_bill',
format: 'json',
-   amount: $( '#amount' ).val(),
recurring: isRecurring,
-   currency_code: $( '#currency_code' ).val()
+   amount: $( '#amount' ).val(),
+   currency_code: $( '#currency_code' ).val(),
+   token: $( '#token' ).val()
};
 
if ( isRecurring ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/252111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

[MediaWiki-commits] [Gerrit] Make Amazon use standard handleDonationRequest - change (mediawiki...DonationInterface)

2015-11-09 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252110

Change subject: Make Amazon use standard handleDonationRequest
..

Make Amazon use standard handleDonationRequest

Need to set the edit token, and there's less code this way.

Bug: T117827
Change-Id: I33e282ade252164dccdf2c9bc9bbd6fe2b94d128
---
M amazon_gateway/amazon_gateway.body.php
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/10/252110/1

diff --git a/amazon_gateway/amazon_gateway.body.php 
b/amazon_gateway/amazon_gateway.body.php
index 87dbcf8..41f13d1 100644
--- a/amazon_gateway/amazon_gateway.body.php
+++ b/amazon_gateway/amazon_gateway.body.php
@@ -30,13 +30,9 @@
 */
protected function handleRequest() {
Hooks::register( 'MakeGlobalVariablesScript', array( 
$this->adapter, 'setClientVariables' ) );
-   $this->getOutput()->allowClickjacking();
-
-   $this->setHeaders();
$this->getOutput()->addModules( 
'ext.donationinterface.amazon.styles' );
$this->getOutput()->addModules( 
'ext.donationinterface.amazon.scripts' );
 
-   $this->validateForm();
-   $this->displayForm();
+   $this->handleDonationRequest();
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/252110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33e282ade252164dccdf2c9bc9bbd6fe2b94d128
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add perf-roots to Graphite role - change (operations/puppet)

2015-11-09 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: Add perf-roots to Graphite role
..


Add perf-roots to Graphite role

The performance team does a lot of metric grooming work, which frequently
requires deleting metrics which have been renamed or which contain junk data.
Adding perf-roots would allow Timo to do some of that work.

Task: T117256
Change-Id: I583d9a571560e157a7ec85bfb832757545cb6a23
---
M hieradata/role/common/graphite/production.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Gilles: Looks good to me, but someone else must approve
  RobH: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/graphite/production.yaml 
b/hieradata/role/common/graphite/production.yaml
index f80f424..b01eeba 100644
--- a/hieradata/role/common/graphite/production.yaml
+++ b/hieradata/role/common/graphite/production.yaml
@@ -1,3 +1,5 @@
+admin::groups:
+  - perf-roots
 debdeploy::grains:
   debdeploy-graphite:
 value: standard

-- 
To view, visit https://gerrit.wikimedia.org/r/249966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I583d9a571560e157a7ec85bfb832757545cb6a23
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Assign salt grains for db::redis role - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252116

Change subject: Assign salt grains for db::redis role
..

Assign salt grains for db::redis role

Change-Id: I83ff026e7d646fbe1ef6c3dfa428894c15423fec
---
A hieradata/hosts/rdb1001.yaml
M hieradata/role/codfw/db/redis.yaml
A hieradata/role/eqiad/db/redis.yaml
M modules/debdeploy/templates/debdeploy.erb
4 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/252116/1

diff --git a/hieradata/hosts/rdb1001.yaml b/hieradata/hosts/rdb1001.yaml
new file mode 100644
index 000..a9bcbe4
--- /dev/null
+++ b/hieradata/hosts/rdb1001.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-redis-eqiad:
+value: canary
+
diff --git a/hieradata/role/codfw/db/redis.yaml 
b/hieradata/role/codfw/db/redis.yaml
index 7ece305..72c3e20 100644
--- a/hieradata/role/codfw/db/redis.yaml
+++ b/hieradata/role/codfw/db/redis.yaml
@@ -2,4 +2,7 @@
   rdb2003: rdb2001
   rdb2004: rdb2002
 role::db::redis::dir: "/srv/redis"
+debdeploy::grains:
+  debdeploy-redis-codfw:
+value: standard
 
diff --git a/hieradata/role/eqiad/db/redis.yaml 
b/hieradata/role/eqiad/db/redis.yaml
new file mode 100644
index 000..84e5cdc
--- /dev/null
+++ b/hieradata/role/eqiad/db/redis.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-redis-eqiad:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index a40561c..e4c988c 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -131,3 +131,7 @@
 cp-upload = debdeploy-cp-eqiad-upload:standard, 
debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-upload:standard
 cp = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard, 
debdeploy-cp-eqiad-mobile:standard, debdeploy-cp-eqiad-parsoid:standard 
,debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard, 
debdeploy-cp-codfw-mobile:standard, debdeploy-cp-codfw-parsoid:standard, 
debdeploy-cp-codfw-text:standard, debdeploy-cp-codfw-upload:standard, 
debdeploy-cp-esams-mobile:standard, debdeploy-cp-esams-text:standard, 
debdeploy-cp-esams-upload:standard, debdeploy-cp-ulsfo-mobile:standard, 
debdeploy-cp-ulsfo-text:standard, debdeploy-cp-ulsfo-upload:standard
 cp-canary = debdeploy-cp:canary
+redis-eqiad = debdeploy-redis-eqiad:standard
+redis-codfw = debdeploy-redis-codfw:standard
+redis-canary = debdeploy-redis-eqiad:canary
+redis = debdeploy-redis-eqiad:standard, debdeploy-redis-codfw:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/252116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83ff026e7d646fbe1ef6c3dfa428894c15423fec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Assign salt grains for db::redis role - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for db::redis role
..


Assign salt grains for db::redis role

Change-Id: I83ff026e7d646fbe1ef6c3dfa428894c15423fec
---
A hieradata/hosts/rdb1001.yaml
M hieradata/role/codfw/db/redis.yaml
A hieradata/role/eqiad/db/redis.yaml
M modules/debdeploy/templates/debdeploy.erb
4 files changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/hosts/rdb1001.yaml b/hieradata/hosts/rdb1001.yaml
new file mode 100644
index 000..a9bcbe4
--- /dev/null
+++ b/hieradata/hosts/rdb1001.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-redis-eqiad:
+value: canary
+
diff --git a/hieradata/role/codfw/db/redis.yaml 
b/hieradata/role/codfw/db/redis.yaml
index 7ece305..72c3e20 100644
--- a/hieradata/role/codfw/db/redis.yaml
+++ b/hieradata/role/codfw/db/redis.yaml
@@ -2,4 +2,7 @@
   rdb2003: rdb2001
   rdb2004: rdb2002
 role::db::redis::dir: "/srv/redis"
+debdeploy::grains:
+  debdeploy-redis-codfw:
+value: standard
 
diff --git a/hieradata/role/eqiad/db/redis.yaml 
b/hieradata/role/eqiad/db/redis.yaml
new file mode 100644
index 000..84e5cdc
--- /dev/null
+++ b/hieradata/role/eqiad/db/redis.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-redis-eqiad:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index a40561c..e4c988c 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -131,3 +131,7 @@
 cp-upload = debdeploy-cp-eqiad-upload:standard, 
debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-upload:standard
 cp = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard, 
debdeploy-cp-eqiad-mobile:standard, debdeploy-cp-eqiad-parsoid:standard 
,debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard, 
debdeploy-cp-codfw-mobile:standard, debdeploy-cp-codfw-parsoid:standard, 
debdeploy-cp-codfw-text:standard, debdeploy-cp-codfw-upload:standard, 
debdeploy-cp-esams-mobile:standard, debdeploy-cp-esams-text:standard, 
debdeploy-cp-esams-upload:standard, debdeploy-cp-ulsfo-mobile:standard, 
debdeploy-cp-ulsfo-text:standard, debdeploy-cp-ulsfo-upload:standard
 cp-canary = debdeploy-cp:canary
+redis-eqiad = debdeploy-redis-eqiad:standard
+redis-codfw = debdeploy-redis-codfw:standard
+redis-canary = debdeploy-redis-eqiad:canary
+redis = debdeploy-redis-eqiad:standard, debdeploy-redis-codfw:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/252116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I83ff026e7d646fbe1ef6c3dfa428894c15423fec
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] impressionDiet: don't restart cycle when restartCycleDelay is 0 - change (mediawiki...CentralNotice)

2015-11-09 Thread AndyRussG (Code Review)

AndyRussG has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252118

Change subject: impressionDiet: don't restart cycle when restartCycleDelay is 0
..

impressionDiet: don't restart cycle when restartCycleDelay is 0

Change-Id: Icaa5918b957d7ed0457a0a5b308222bd85c5f63e
---
M resources/subscribing/ext.centralNotice.impressionDiet.js
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/18/252118/1

diff --git a/resources/subscribing/ext.centralNotice.impressionDiet.js 
b/resources/subscribing/ext.centralNotice.impressionDiet.js
index 49bd3d7..42c3c42 100644
--- a/resources/subscribing/ext.centralNotice.impressionDiet.js
+++ b/resources/subscribing/ext.centralNotice.impressionDiet.js
@@ -92,13 +92,22 @@
counts.waitSeenCount += 1;
counts.seenCount += 1;
 
-   if ( counts.waitSeenCount >= mixinParams.maximumSeen ) {
-   // We just completed a cycle.  Wait to restart.
+   // For restartCycleDelay, 0 is a magic number that 
means, never
+   // restart
+   if ( ( mixinParams.restartCycleDelay !== 0) &&
+   ( counts.waitSeenCount >= 
mixinParams.maximumSeen ) )   {
+
+   // We just completed a cycle. Wait to restart.
counts.waitCount = 0;
counts.waitSeenCount = 0;
counts.waitUntil = new Date().getTime() +
( mixinParams.restartCycleDelay * 1000 
);
}
+
+   } else if ( ( mixinParams.restartCycleDelay === 0 ) &&
+   ( pastDate && !waitForHideImps && !waitForShowImps ) ) {
+
+   hide = 'waitnorestart';
}
 
if ( hide === null ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/252118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaa5918b957d7ed0457a0a5b308222bd85c5f63e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Script to import dumps from dumps.wikimedia.org - change (wikimedia...relevancylab)

2015-11-09 Thread Smalyshev (Code Review)

Smalyshev has submitted this change and it was merged.

Change subject: Script to import dumps from dumps.wikimedia.org
..


Script to import dumps from dumps.wikimedia.org

This expects to be run on  a machine relatively local to the destination.
This will download potentially many GB from dumps.wikimedia.org, then
decompress and send 10x as many GB from the host to the provided
elasticsearch instance

Change-Id: I89c007f67dc95d4d5ef22757e8f71c1ee3743113
---
A importindices.py
1 file changed, 83 insertions(+), 0 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Tjones: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/importindices.py b/importindices.py
new file mode 100755
index 000..a9f5ad9
--- /dev/null
+++ b/importindices.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+
+# Downloads elasticsearch indices from wikimedia dumps and imports them
+# to an elasticsearch cluster. This should generally be run within the
+# same network as the elasticsearch server. This will download from
+# dumps.wikimedia.org and write to the local disk. For the largest
+# indices more than 30GB of disk space on the import runner will be
+# required.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# http://www.gnu.org/copyleft/gpl.html
+
+import argparse
+import datetime
+import os
+import sys
+import tempfile
+import urllib2
+
+
+def last_dump():
+today = datetime.date.today()
+# dumps are on Monday, but run through most of Tuesday. Only take this 
weeks dumps
+# if it is at least Wednesday. TODO: is this UTC? dumps run from around 
16:00 UTC
+# on Monday to 7:00 UTC Wednesday
+if today.weekday() < 3:
+last_dump_delta = datetime.timedelta(days=7+today.weekday())
+else:
+last_dump_delta = datetime.timedelta(days=today.weekday())
+last_dump = today - last_dump_delta
+return last_dump.strftime("%Y%m%d")
+
+
+def check_index_exists(dest_host, wiki, index_type):
+url = "http://%s:9200/%s_%s; % (dest_host, wiki, index_type)
+print("Check existence:", url)
+request = urllib2.Request(url)
+request.get_method = lambda: 'HEAD'
+# This will throw an error on 404 if the index doesn't exist
+urllib2.urlopen(request)
+
+
+def main():
+parser = argparse.ArgumentParser(description='import wikimedia 
elasticsearch dumps',
+ prog=sys.argv[0])
+parser.add_argument('--dest', dest="dest", default='estest1001',
+help='server to import indices into')
+parser.add_argument('--type', dest='type', default='content',
+help='type of index to import, either content or 
general')
+parser.add_argument('--date', dest='date', default=last_dump(),
+help='date to load dump from')
+parser.add_argument('--temp-dir', dest='temp_dir', default=None,
+help='directory to download index into')
+parser.add_argument('wikis', nargs='+', help='list of wikis to import')
+args = parser.parse_args()
+
+for wiki in args.wikis:
+src_url = 
'http://dumps.wikimedia.org/other/cirrussearch/%s/%s-%s-cirrussearch-%s.json.gz'
 % \
+(args.date, wiki, args.date, args.type)
+fd, temp_path = tempfile.mkstemp(dir=args.temp_dir)
+print("Downloading ", src_url, " to ", temp_path)
+os.system("curl -o %s %s" % (temp_path, src_url))
+check_index_exists(args.dest, wiki, args.type)
+dest_url = "http://%s:9200/%s_%s/_bulk; % (args.dest, wiki, args.type)
+cmd = 'curl -s %s --data-binary @- > /dev/null' % (dest_url)
+os.system("pv %s | zcat | parallel --pipe -L 100 -j3 '%s'" % 
(temp_path, cmd))
+os.close(fd)
+os.remove(temp_path)
+
+if __name__ == "__main__":
+main()

-- 
To view, visit https://gerrit.wikimedia.org/r/251452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I89c007f67dc95d4d5ef22757e8f71c1ee3743113
Gerrit-PatchSet: 6
Gerrit-Project: wikimedia/discovery/relevancylab
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones

[MediaWiki-commits] [Gerrit] Various JobQueue test tweaks - change (mediawiki/core)

2015-11-09 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252160

Change subject: Various JobQueue test tweaks
..

Various JobQueue test tweaks

* Remove some getAcquiredCount() assertions when claimTTL=0
  as this is not well defined enough (queues may take a few
  minutes to garbage collect the failed jobs).
* Added some tests to make sure push() only de-duplicates
  among unclaimed jobs.

Change-Id: Ie0a5e539095c245dfcc8c160417e12824eb7ab83
---
M tests/phpunit/includes/jobqueue/JobQueueTest.php
1 file changed, 23 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/252160/1

diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php 
b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index ea1a4f6..9808a55 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -128,8 +128,6 @@
$queue->flushCaches();
if ( $recycles ) {
$this->assertEquals( 1, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
-   } else {
-   $this->assertEquals( 0, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
}
 
$job2 = $queue->pop();
@@ -139,8 +137,6 @@
$queue->flushCaches();
if ( $recycles ) {
$this->assertEquals( 2, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
-   } else {
-   $this->assertEquals( 0, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
}
 
$queue->ack( $job1 );
@@ -148,8 +144,6 @@
$queue->flushCaches();
if ( $recycles ) {
$this->assertEquals( 1, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
-   } else {
-   $this->assertEquals( 0, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
}
 
$queue->ack( $job2 );
@@ -215,8 +209,6 @@
$this->assertEquals( 0, $queue->getSize(), "Queue is empty 
($desc)" );
if ( $recycles ) {
$this->assertEquals( 1, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
-   } else {
-   $this->assertEquals( 0, $queue->getAcquiredCount(), 
"Active job count ($desc)" );
}
 
$queue->ack( $job1 );
@@ -229,6 +221,29 @@
 * @dataProvider provider_queueLists
 * @covers JobQueue
 */
+   public function testDeduplicationWhileClaimed( $queue, $recycles, $desc 
) {
+   $queue = $this->$queue;
+   if ( !$queue ) {
+   $this->markTestSkipped( $desc );
+   }
+
+   $job = $this->newDedupedJob();
+   $queue->push( $job );
+
+   // De-duplication does not apply to already-claimed jobs
+   $j = $queue->pop();
+   $queue->push( $job );
+   $queue->ack( $j );
+
+   $j = $queue->pop();
+   // Make sure ack() of the twin did not delete the sibling data
+   $this->assertType( 'NullJob', $j );
+   }
+
+   /**
+* @dataProvider provider_queueLists
+* @covers JobQueue
+*/
public function testRootDeduplication( $queue, $recycles, $desc ) {
$queue = $this->$queue;
if ( !$queue ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/252160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0a5e539095c245dfcc8c160417e12824eb7ab83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Do not explore statement URIs - change (wikidata...rdf)

2015-11-09 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252151

Change subject: Do not explore statement URIs
..

Do not explore statement URIs

Bug: T116735
Change-Id: I833077bb6308d69eb7be986db165fa9c3ed1ff22
---
M gui/gui.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/51/252151/1

diff --git a/gui/gui.js b/gui/gui.js
index f941b8d..d02b85c 100644
--- a/gui/gui.js
+++ b/gui/gui.js
@@ -4,7 +4,7 @@
 ( function ( $, mw ) {
var SERVICE = '/bigdata/namespace/wdq/sparql',
SHORTURL = 'http://tinyurl.com/create.php?url=',
-   EXPLORE_URL = 'http://www.wikidata.org/entity/',
+   EXPLORE_URL = 'http://www.wikidata.org/entity/Q',
NAMESPACE_SHORTCUTS = {
'Wikidata': {
'wikibase': 'http://wikiba.se/ontology#',

-- 
To view, visit https://gerrit.wikimedia.org/r/252151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I833077bb6308d69eb7be986db165fa9c3ed1ff22
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove old logging - change (mediawiki...EducationProgram)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove old logging
..


Remove old logging

Bug: T48577
Change-Id: I5ae45cbd968a6d913a14bb59cddd0abbd2fb00bd
---
M includes/pagers/ArticleTable.php
1 file changed, 0 insertions(+), 10 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/pagers/ArticleTable.php b/includes/pagers/ArticleTable.php
index 0fe3fc6..c612ddc 100644
--- a/includes/pagers/ArticleTable.php
+++ b/includes/pagers/ArticleTable.php
@@ -390,16 +390,6 @@
$html
);
}
-   else {
-   wfDebugLog(
-   'bug46577',
-   json_encode( array(
-   'title' => $article->getPageTitle(),
-   'pageid' => $article->getPageId(),
-   'id' => $article->getId(),
-   ) )
-   );
-   }
 
$attr = array(
'href' => '#',

-- 
To view, visit https://gerrit.wikimedia.org/r/251741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ae45cbd968a6d913a14bb59cddd0abbd2fb00bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Sync parserTests with core
..


Sync parserTests with core

Change-Id: I27b7fd70c8cf06b9ed39c005ba5bdea52fab1440
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
M tools/sync-parserTests.js
4 files changed, 31 insertions(+), 15 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 30c9a80..afe39e9 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -579,8 +579,8 @@
 add("html2html", "Fuzz testing: Parser14", " onmouseover= \nhttp://\n\n\n Contents \n\n\n 1 onmouseover=\n\n\n");
 add("html2html", "Fuzz testing: Parser24", "\n{{{|\n >\n\n\nMOVE
 YOUR MOUSE CURSOR OVER THIS TEXT\n\n\n\n\n\n");
 add("html2html", "Fuzz testing: encoded newline in generated HTML replacements 
(bug 6577)", " \n");
-add("html2html", "Special page transclusion", "\n 
Xyzzyx
 \n\n");
-add("html2html", "Special page transclusion twice (bug 5021)", "\n 
Xyzzyx
 \n\n\n Xyzzyx
 \n\n");
+add("html2html", "Special page transclusion", " Xyzzyx\n");
+add("html2html", "Special page transclusion twice (bug 5021)", " Xyzzyx\n\n 
Xyzzyx\n");
 add("html2html", "Transclusion of nonexistent MediaWiki message", "[/index.php?title=MediaWiki:Mainpagexxxaction=editredlink=1
 MediaWiki:Mainpagexxx]\n");
 add("html2html", "Special:Search page linking.", "Special:Search\n");
 add("html2html", "Say the magic word", " 
Parser test\n 
Parser_test\n Parser 
test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Talk:Parser test\n Talk:Parser_test\n Parser test\n Parser_test\n \n \n 0\n Talk\n Talk\n \n \n 
[/index.php?title=Template:Dynamicaction=editredlink=1 
Template:Dynamic]\n");
@@ -1190,8 +1190,8 @@
 add("html2wt", "Inline wiki vs wiki block nesting", "'''Bold 
paragraph'''\n\nNew wiki paragraph\n");
 add("html2wt", "Inline HTML vs wiki block nesting", "'''Bold 
paragraph'''\n\nNew wiki paragraph\n");
 add("html2wt", "Mixing markup for italics and bold", 
"'''bold''bold''bolditalics'\n");
-add("html2wt", "Special page transclusion", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
-add("html2wt", "Special page transclusion twice (bug 5021)", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
+add("html2wt", "Special page transclusion", "* [[wiki/Xyzzyx|Xyzzyx]]\n");
+add("html2wt", "Special page transclusion twice (bug 5021)", "* 
[[wiki/Xyzzyx|Xyzzyx]]\n\n* [[wiki/Xyzzyx|Xyzzyx]]\n");
 add("html2wt", "Transclusion of default MediaWiki message", "Main Page\n");
 add("html2wt", "Transclusion of nonexistent MediaWiki message", 
"[/index.php?title=MediaWiki:Mainpagexxx=edit=1 
MediaWiki:Mainpagexxx]\n");
 add("html2wt", "Transclusion of MediaWiki message with underscore", 
"History\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 192815d..58860e9 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -17120,8 +17120,8 @@
 !! wikitext
 {{Special:Prefixindex/Xyzzyx}}
 !! html
- Xyzzyx 
-
+Xyzzyx
+
 
 !! end
 
@@ -17132,10 +17132,10 @@
 {{Special:Prefixindex/Xyzzyx}}
 {{Special:Prefixindex/Xyzzyx}}
 !! html
- Xyzzyx 
-
- Xyzzyx 
-
+Xyzzyx
+
+Xyzzyx
+
 
 !! end
 
@@ -26323,3 +26323,19 @@
 foobar
 
 !! end
+
+!! test
+Empty LI (T49673)
+!! wikitext
+* a
+* 
+*
+* b
+!! html/php+tidy
+
+a
+
+
+b
+
+!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index f22588e..c1e102f 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/fetch-parserTests.txt.js
@@ -12,9 +12,9 @@
 // and update these hashes automatically.
 //
 // You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "55ee32c143b30469bb46d9ac876eae18a66a04d3";
+var expectedSHA1 = "9d6572659537683fac509869482553e8eef8aee9";
 // git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "e97dca8cbdd49d5118fcb4a861b9bb043c480e89";
+var latestCommit = "1f08236b978afdc59aae75a8cc67ee1b20ae1489";
 
 var fs = require('fs');
 var path = require('path');
diff --git a/tools/sync-parserTests.js b/tools/sync-parserTests.js
index e4acf15..498e068 100755
--- a/tools/sync-parserTests.js
+++ b/tools/sync-parserTests.js
@@ -12,7 +12,7 @@
  $BRANCH is a branch name for the patch to mediawiki/core (ie, 'pt-sync')
 
$ cd $PARSOID
-   $ tests/sync-parserTests.js $MEDIAWIKI $BRANCH
+   $ tools/sync-parserTests.js $MEDIAWIKI $BRANCH
$ cd $MEDIAWIKI
$ git rebase master
  ... resolve conflicts, sigh ...
@@ -23,8 +23,8 @@
  ... time passes, eventually your patch is merged to core ...
 
$ cd $PARSOID
-   $ tests/fetch-parserTests.txt.js --force
-   $ tests/parserTests.js --rewrite-blacklist
+   $ tools/fetch-parserTests.txt.js --force
+   $ bin/parserTests.js

[MediaWiki-commits] [Gerrit] Always encap fostered content when tmpl range is expanded to... - change (mediawiki...parsoid)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Always encap fostered content when tmpl range is expanded to 
table
..


Always encap fostered content when tmpl range is expanded to table

 * This was exposed by e057abe6bea6718a70753e969e6c6f051403cedf.

 * Fixes the duplicate content generated while rt'ing:

 kowiki/박성균?oldid=14967512
 kowiki/송병구?oldid=15031525

Change-Id: I17aa33ee3a9aa67e42dd3f5f00a53fd258c89537
---
M lib/wt2html/pp/wrapTemplates.js
M tests/parserTests.txt
2 files changed, 21 insertions(+), 0 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/wt2html/pp/wrapTemplates.js b/lib/wt2html/pp/wrapTemplates.js
index d669ff4..420de1f 100644
--- a/lib/wt2html/pp/wrapTemplates.js
+++ b/lib/wt2html/pp/wrapTemplates.js
@@ -224,6 +224,14 @@
range.start = tcStart;
}
 
+   // If we have any fostered content, include it as well.
+   if (tcStart.nodeName === 'TABLE') {
+   while (DU.isElt(tcStart.previousSibling) &&
+   
DU.getDataParsoid(tcStart.previousSibling).fostered) {
+   range.start = tcStart = tcStart.previousSibling;
+   }
+   }
+
if (updateDP) {
updateDSRForFirstTplNode(startElem, tcStart);
} else if (tcStart === startElem && DU.isElt(tcStart.nextSibling)) {
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 58860e9..324a4e0 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -24342,6 +24342,19 @@
 
 !! end
 
+!! test
+Always encapsulate foster box when template range is expanded to table
+!! options
+parsoid=wt2wt
+!! wikitext
+{|
+hello
+{{OpenTable}}
+|}
+!! html/parsoid
+
+!! end
+
 !!test
 Support  element with .data attribute
 !!options

-- 
To view, visit https://gerrit.wikimedia.org/r/252141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I17aa33ee3a9aa67e42dd3f5f00a53fd258c89537
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)

2015-11-09 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252145

Change subject: Sync parserTests with core
..

Sync parserTests with core

Change-Id: I27b7fd70c8cf06b9ed39c005ba5bdea52fab1440
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
M tools/sync-parserTests.js
3 files changed, 27 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/45/252145/1

diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 192815d..58860e9 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -17120,8 +17120,8 @@
 !! wikitext
 {{Special:Prefixindex/Xyzzyx}}
 !! html
- Xyzzyx 
-
+Xyzzyx
+
 
 !! end
 
@@ -17132,10 +17132,10 @@
 {{Special:Prefixindex/Xyzzyx}}
 {{Special:Prefixindex/Xyzzyx}}
 !! html
- Xyzzyx 
-
- Xyzzyx 
-
+Xyzzyx
+
+Xyzzyx
+
 
 !! end
 
@@ -26323,3 +26323,19 @@
 foobar
 
 !! end
+
+!! test
+Empty LI (T49673)
+!! wikitext
+* a
+* 
+*
+* b
+!! html/php+tidy
+
+a
+
+
+b
+
+!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index f22588e..c1e102f 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/fetch-parserTests.txt.js
@@ -12,9 +12,9 @@
 // and update these hashes automatically.
 //
 // You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "55ee32c143b30469bb46d9ac876eae18a66a04d3";
+var expectedSHA1 = "9d6572659537683fac509869482553e8eef8aee9";
 // git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "e97dca8cbdd49d5118fcb4a861b9bb043c480e89";
+var latestCommit = "1f08236b978afdc59aae75a8cc67ee1b20ae1489";
 
 var fs = require('fs');
 var path = require('path');
diff --git a/tools/sync-parserTests.js b/tools/sync-parserTests.js
index e4acf15..498e068 100755
--- a/tools/sync-parserTests.js
+++ b/tools/sync-parserTests.js
@@ -12,7 +12,7 @@
  $BRANCH is a branch name for the patch to mediawiki/core (ie, 'pt-sync')
 
$ cd $PARSOID
-   $ tests/sync-parserTests.js $MEDIAWIKI $BRANCH
+   $ tools/sync-parserTests.js $MEDIAWIKI $BRANCH
$ cd $MEDIAWIKI
$ git rebase master
  ... resolve conflicts, sigh ...
@@ -23,8 +23,8 @@
  ... time passes, eventually your patch is merged to core ...
 
$ cd $PARSOID
-   $ tests/fetch-parserTests.txt.js --force
-   $ tests/parserTests.js --rewrite-blacklist
+   $ tools/fetch-parserTests.txt.js --force
+   $ bin/parserTests.js --rewrite-blacklist
$ git add -u
$ git commit -m "Sync parserTests with core"
$ git review

-- 
To view, visit https://gerrit.wikimedia.org/r/252145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27b7fd70c8cf06b9ed39c005ba5bdea52fab1440
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] peopleweb: add motd message about public_html - change (operations/puppet)

2015-11-09 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252150

Change subject: peopleweb: add motd message about public_html
..

peopleweb: add motd message about public_html

Change-Id: I495a55d6797cb56100da5bac836334f492d5eb42
---
M manifests/role/peopleweb.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/252150/1

diff --git a/manifests/role/peopleweb.pp b/manifests/role/peopleweb.pp
index 125d894..33bdc94 100644
--- a/manifests/role/peopleweb.pp
+++ b/manifests/role/peopleweb.pp
@@ -11,6 +11,11 @@
 proto => 'tcp',
 port  => '80',
 }
+
+motd::script { 'people-motd':
+ensure  => present,
+content => "#!/bin/sh\necho '\nThis is people.wikimedia.org.\nFiles 
you put in 'public_html' in your home dir will be accessible on the web.\nMore 
info on https://wikitech.wikimedia.org/wiki/People.wikimedia.org.\n'",
+}
 }
 
 class role::peopleweb::migration {

-- 
To view, visit https://gerrit.wikimedia.org/r/252150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I495a55d6797cb56100da5bac836334f492d5eb42
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] peopleweb: remove role from terbium - change (operations/puppet)

2015-11-09 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252153

Change subject: peopleweb: remove role from terbium
..

peopleweb: remove role from terbium

This role is now on rutherfordium.

The backup::set is set in the role now instead
of the node.

Bug:T116992
Change-Id: Ie7702f43f23dac70dac61152ffbd0340b9a81c55
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/252153/1

diff --git a/manifests/site.pp b/manifests/site.pp
index aa92f47..a628ae2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2398,7 +2398,7 @@
 
 # https://wikitech.wikimedia.org/wiki/Terbium
 node 'terbium.eqiad.wmnet' {
-role db::maintenance, peopleweb, mediawiki::maintenance, backup::host
+role db::maintenance, mediawiki::maintenance, backup::host
 
 include ldap::role::client::labs
 

-- 
To view, visit https://gerrit.wikimedia.org/r/252153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7702f43f23dac70dac61152ffbd0340b9a81c55
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] peopleweb: update Apache config to 2.4 - change (operations/puppet)

2015-11-09 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252154

Change subject: peopleweb: update Apache config to 2.4
..

peopleweb: update Apache config to 2.4

Need to update the Apache config to 2.4 syntax
after moving this to rutherfordium on jessie or
the index file could not be viewed on
https://people.wikimedia.org.

Bug:T116992
Change-Id: Iad2f478d198677603cb98f436c56d5fb93672843
---
M modules/publichtml/templates/apacheconfig.erb
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/252154/1

diff --git a/modules/publichtml/templates/apacheconfig.erb 
b/modules/publichtml/templates/apacheconfig.erb
index 9d44194..8d1bf1f 100644
--- a/modules/publichtml/templates/apacheconfig.erb
+++ b/modules/publichtml/templates/apacheconfig.erb
@@ -28,8 +28,7 @@
 CustomLog /var/log/apache2/access.log combined
 
 
-Order Deny,Allow
-AllowOverride All
+Require all granted
 
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/252154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad2f478d198677603cb98f436c56d5fb93672843
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] resourceloader: Log if MessageBlobStore failed to fetch a me... - change (mediawiki/core)

2015-11-09 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252159

Change subject: resourceloader: Log if MessageBlobStore failed to fetch a 
message
..

resourceloader: Log if MessageBlobStore failed to fetch a message

Bug: T93800
Change-Id: I6f174251a6b9a6b31921037f672dbc197f3abb7e
---
M includes/cache/MessageBlobStore.php
1 file changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/252159/1

diff --git a/includes/cache/MessageBlobStore.php 
b/includes/cache/MessageBlobStore.php
index ab7e171..dcb358f 100644
--- a/includes/cache/MessageBlobStore.php
+++ b/includes/cache/MessageBlobStore.php
@@ -322,6 +322,19 @@
}
 
/**
+* @param string $key Message key
+* @param string $lang Language code
+* @return string
+*/
+   private function fetchMessage( $key, $lang ) {
+   $message = wfMessage( $key )->inLanguage( $lang );
+   if ( !$message->exists() ) {
+   wfDebugLog( 'resourceloader', __METHOD__ . " failed to 
find: '$key' ($lang)" );
+   }
+   return $message->plain();
+   }
+
+   /**
 * Reencode a message blob with the updated value for a message
 *
 * @param string $blob Message blob (JSON object)
@@ -331,8 +344,7 @@
 */
private function reencodeBlob( $blob, $key, $lang ) {
$decoded = FormatJson::decode( $blob, true );
-   $decoded[$key] = wfMessage( $key )->inLanguage( $lang 
)->plain();
-
+   $decoded[$key] = $this->fetchMessage( $key, $lang );
return FormatJson::encode( (object)$decoded );
}
 
@@ -390,7 +402,7 @@
$messages = array();
 
foreach ( $module->getMessages() as $key ) {
-   $messages[$key] = wfMessage( $key )->inLanguage( $lang 
)->plain();
+   $messages[$key] = $this->fetchMessage( $key, $lang );
}
 
return FormatJson::encode( (object)$messages );

-- 
To view, visit https://gerrit.wikimedia.org/r/252159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f174251a6b9a6b31921037f672dbc197f3abb7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Switch to use ChangesListSpecialPageFilters hook in client - change (mediawiki...Wikibase)

2015-11-09 Thread Aude (Code Review)

Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252162

Change subject: Switch to use ChangesListSpecialPageFilters hook in client
..

Switch to use ChangesListSpecialPageFilters hook in client

Not in scope of this patch is to rename the recent changes
option name etc. While this might seem simple, it needs a
migration strategy to convert existing preferences and
b/w compat for the old filter name and should be done
carefully in a separate patch.

Change-Id: I66d345e4355accf44f93ce8c6d765c41cebbcc3b
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
A client/includes/Hooks/ChangesListSpecialPageFilterHandler.php
D client/includes/Hooks/ChangesPageWikibaseFilterHandler.php
A 
client/tests/phpunit/includes/Hooks/ChangesListSpecialPageFilterHandlerTest.php
D client/tests/phpunit/includes/Hooks/ChangesPageWikibaseFilterHandlerTest.php
6 files changed, 330 insertions(+), 299 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/62/252162/1

diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index dbf0e26..9178629 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -439,54 +439,6 @@
}
 
/**
-* Adds a toggle for showing/hiding Wikidata entries in recent changes
-*
-* @param SpecialRecentChanges $special
-* @param array &$filters
-*
-* @return bool
-*/
-   public static function onSpecialRecentChangesFilters( 
SpecialRecentChanges $special, array &$filters ) {
-   $hookHandler = new ChangesPageWikibaseFilterHandler(
-   $special->getContext(),
-   
WikibaseClient::getDefaultInstance()->getSettings()->getSetting( 
'showExternalRecentChanges' ),
-   'hidewikidata',
-   'rcshowwikidata',
-   'wikibase-rc-hide-wikidata'
-   );
-
-   // @fixme remove wikidata-specific stuff!
-   $filters = $hookHandler->addFilterIfEnabled( $filters );
-
-   return true;
-   }
-
-   /**
-* Modifies watchlist options to show a toggle for Wikibase changes
-* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/SpecialWatchlistFilters
-*
-* @since 0.4
-*
-* @param SpecialWatchlist $special
-* @param array $filters
-*
-* @return bool
-*/
-   public static function onSpecialWatchlistFilters( $special, &$filters ) 
{
-   $hookHandler = new ChangesPageWikibaseFilterHandler(
-   $special->getContext(),
-   
WikibaseClient::getDefaultInstance()->getSettings()->getSetting( 
'showExternalRecentChanges' ),
-   'hideWikibase',
-   'wlshowwikibase',
-   'wikibase-rc-hide-wikidata'
-   );
-
-   $filters = $hookHandler->addFilterIfEnabled( $filters );
-
-   return true;
-   }
-
-   /**
 * Adds a preference for showing or hiding Wikidata entries in recent 
changes
 *
 * @param User $user
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index c57f995..2a57df9 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -111,14 +111,10 @@
$wgHooks['ParserGetVariableValueSwitch'][] = 
'\Wikibase\ClientHooks::onParserGetVariableValueSwitch';
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = 
'\Wikibase\ClientHooks::onSkinTemplateOutputPageBeforeExec';
$wgHooks['SpecialMovepageAfterMove'][] = 
'\Wikibase\Client\Hooks\MovePageNotice::onSpecialMovepageAfterMove';
-   $wgHooks['SpecialWatchlistQuery'][] = 
'\Wikibase\ClientHooks::onSpecialWatchlistQuery';
-   $wgHooks['SpecialRecentChangesQuery'][] = 
'\Wikibase\ClientHooks::onSpecialRecentChangesQuery';
-   $wgHooks['SpecialRecentChangesFilters'][] = 
'\Wikibase\ClientHooks::onSpecialRecentChangesFilters';
$wgHooks['GetPreferences'][] = 
'\Wikibase\ClientHooks::onGetPreferences';
$wgHooks['BeforePageDisplay'][] = 
'\Wikibase\ClientHooks::onBeforePageDisplay';
$wgHooks['BeforePageDisplay'][] = 
'\Wikibase\ClientHooks::onBeforePageDisplayAddJsConfig';
$wgHooks['ScribuntoExternalLibraries'][] = 
'\Wikibase\ClientHooks::onScribuntoExternalLibraries';
-   $wgHooks['SpecialWatchlistFilters'][] = 
'\Wikibase\ClientHooks::onSpecialWatchlistFilters';
$wgHooks['InfoAction'][] = '\Wikibase\ClientHooks::onInfoAction';
$wgHooks['TitleMoveComplete'][] = 
'\Wikibase\Client\Hooks\UpdateRepoHookHandlers::onTitleMoveComplete';
$wgHooks['BaseTemplateAfterPortlet'][] = 
'\Wikibase\ClientHooks::onBaseTemplateAfterPortlet';
@@ -129,6 +125,11 @@
$wgHooks['ParserLimitReportPrepare'][] =

[MediaWiki-commits] [Gerrit] Replace deprecated wfMsg* functions in /model - change (mediawiki...ConventionExtension)

2015-11-09 Thread McIntireEvan (Code Review)

McIntireEvan has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252147

Change subject: Replace deprecated wfMsg* functions in /model
..

Replace deprecated wfMsg* functions in /model

Bug: T70750
Change-Id: Ibfbabdf3f44aa61c051825c45660bdb2990ba165
---
M model/AuthorSubmission.php
M model/Conference.php
M model/ConferenceAccount.php
M model/ConferenceAuthor.php
M model/ConferenceEvent.php
M model/ConferenceOrganizer.php
M model/ConferencePage.php
M model/ConferencePassportInfo.php
M model/ConferenceRegistration.php
M model/EventLocation.php
10 files changed, 153 insertions(+), 153 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConventionExtension 
refs/changes/47/252147/1

diff --git a/model/AuthorSubmission.php b/model/AuthorSubmission.php
index c4b7732..a414980 100644
--- a/model/AuthorSubmission.php
+++ b/model/AuthorSubmission.php
@@ -108,8 +108,8 @@
}

# create the page title
-   $titleSub = $conferenceTitle . '/' . wfMsgForContent( 
'cvext-authors' ) . '/' . $username . '/'  
-   .wfMsgForContent( 
'cvext-submissions' ) . '/' . $title;
+   $titleSub = $conferenceTitle . '/' . $this->msg( 
'cvext-authors' )->inContentLanguage()->text() . '/' . $username . '/'
+   .$this->msg( 
'cvext-submissions' )->inContentLanguage()->text() . '/' . $title;
$titleObj = Title::newFromText( $titleSub );


@@ -193,7 +193,7 @@
$conferenceTitle = 
ConferenceAuthorUtils::getConferenceTitleFromSubAuthor( $value );
}
} else {
-   $msg = ($name === 'submissiontype') ? wfMsg( 
'cvext-author-sub-reg-type' ) : wfMsg( 'cvext-author-sub-reg-' . strtolower( 
$name ) );
+   $msg = ($name === 'submissiontype') ? 
$this->msg( 'cvext-author-sub-reg-type' )->text() : $this->msg( 
'cvext-author-sub-reg-' . strtolower( $name )->text() );
$output .= Xml::openElement( 'dl' )
.Xml::element( 'dt', 
array(), $msg )
.Xml::element( 'dd', 
array(), $value )
@@ -208,9 +208,9 @@
$output .= Xml::openElement( 'dl' )
.Xml::element( 'dt', array() )
.Xml::openElement( 'dt' )
-   .Xml::element( 'a', array( 'href' => 
$editLink ), wfMsg( 'cvext-dash-edit' ) )
-   .wfMsg( 'pipe-separator' )
-   .Xml::element( 'a', array( 'href' => 
$deleteLink ), wfMsg( 'cvext-dash-delete' ) )
+   .Xml::element( 'a', array( 'href' => 
$editLink ), $this->msg( 'cvext-dash-edit' )->text() )
+   .$this->msg( 'pipe-separator' )->text()
+   .Xml::element( 'a', array( 'href' => 
$deleteLink ), $this->msg( 'cvext-dash-delete' )->text() )
.Xml::closeElement( 'dt' )
.Xml::closeElement( 'dl' );
}
diff --git a/model/Conference.php b/model/Conference.php
index 4c60c17..bd22ad0 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -314,7 +314,7 @@
if ( $search === false )
{
$result['done'] = false;
-   $result['msg'] = wfMsg( 'cvext-confedit-error' 
);
+   $result['msg'] = $this->msg( 
'cvext-confedit-error' )->text();
$result['flag'] = self::ERROR_EDIT;
return $result;

@@ -352,7 +352,7 @@
{
$result['done'] = true;
$result['flag'] = self::SUCCESS_CODE;
-   $result['msg'] = wfMsg( 
'cvext-confedit-success' );
+   $result['msg'] = $this->msg( 
'cvext-confedit-success' )->text();
$result['title'] = $title->getText();
$result['venue'] = $venue;
$result['capacity'] = $capacity;
@@ -368,14 +368,14 @@
{

$result['done'] = false;
-   $result['msg'] = wfMsg( 'cvext-confedit-error' 
);
+   $result['msg'] = $this->msg(

[MediaWiki-commits] [Gerrit] misc: add rutherfordium and point people.wm.o to it - change (operations/puppet)

2015-11-09 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: misc: add rutherfordium and point people.wm.o to it
..


misc: add rutherfordium and point people.wm.o to it

Adds rutherfordium.eqiad.wmnet as a new backend and point people.wm.o to it.
Also change the comment on terbium from public_html to noc.wm.o.

Bug: T116992
Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index b90fcc0..ffa2da0 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -125,12 +125,17 @@
 'type' => 'random',
 'backends' => ['ruthenium.eqiad.wmnet'],
 },
+'rutherfordium' => { # people.wikimedia.org
+'dynamic' => 'no',
+'type' => 'random',
+'backends' => ['rutherfordium.eqiad.wmnet'],
+},
 'stat1001' => { # metrics and metrics-api
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['stat1001.eqiad.wmnet'],
 },
-'terbium' => { # public_html
+'terbium' => { # noc.wikimedia.org
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['terbium.eqiad.wmnet'],
diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 995a3ee..219e9e0 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -63,7 +63,7 @@
 // No caching of OTRS for now
 return (pass);
 } elsif (req.http.Host == "people.wikimedia.org") {
-set req.backend = terbium;
+set req.backend = rutherfordium;
 // No caching of public_html dirs
 return (pass);
 } elsif (req.http.Host == "racktables.wikimedia.org" || req.http.Host == 
"rt.wikimedia.org") {

-- 
To view, visit https://gerrit.wikimedia.org/r/251115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] peopleweb: remove role from terbium - change (operations/puppet)

2015-11-09 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: peopleweb: remove role from terbium
..


peopleweb: remove role from terbium

This role is now on rutherfordium.

The backup::set is set in the role now instead
of the node.

Bug:T116992
Change-Id: Ie7702f43f23dac70dac61152ffbd0340b9a81c55
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index aa92f47..a628ae2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2398,7 +2398,7 @@
 
 # https://wikitech.wikimedia.org/wiki/Terbium
 node 'terbium.eqiad.wmnet' {
-role db::maintenance, peopleweb, mediawiki::maintenance, backup::host
+role db::maintenance, mediawiki::maintenance, backup::host
 
 include ldap::role::client::labs
 

-- 
To view, visit https://gerrit.wikimedia.org/r/252153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7702f43f23dac70dac61152ffbd0340b9a81c55
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] resourceloader: Add log warning if module produces an invali... - change (mediawiki/core)

2015-11-09 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252156

Change subject: resourceloader: Add log warning if module produces an invalid 
version hash
..

resourceloader: Add log warning if module produces an invalid version hash

* Add logger to ResourceLoaderContext for convenient use within modules.
* Group related members within ResourceLoaderContext.

Change-Id: Ifbc3de1b6e0838386735f1573df328d9b331ac37
---
M includes/resourceloader/ResourceLoader.php
M includes/resourceloader/ResourceLoaderContext.php
M includes/resourceloader/ResourceLoaderStartUpModule.php
3 files changed, 36 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/252156/1

diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index 6995642..48446c4 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -241,7 +241,8 @@
 
/**
 * Register core modules and runs registration hooks.
-* @param Config|null $config
+* @param Config $config [optional]
+* @param LoggerInterface $logger [optional]
 */
public function __construct( Config $config = null, LoggerInterface 
$logger = null ) {
global $IP;
@@ -284,11 +285,23 @@
return $this->config;
}
 
+   /**
+* @since 1.26
+* @param LoggerInterface $logger
+*/
public function setLogger( LoggerInterface $logger ) {
$this->logger = $logger;
}
 
/**
+* @since 1.27
+* @return LoggerInterface
+*/
+   public function getLogger() {
+   return $this->logger;
+   }
+
+   /**
 * @since 1.26
 * @return MessageBlobStore
 */
diff --git a/includes/resourceloader/ResourceLoaderContext.php 
b/includes/resourceloader/ResourceLoaderContext.php
index 6c4cdfe..37e7db8 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -29,11 +29,12 @@
  * of a specific loader request
  */
 class ResourceLoaderContext {
-   /* Protected Members */
-
protected $resourceLoader;
protected $request;
+   protected $logger;
+
protected $modules;
+
protected $language;
protected $direction;
protected $skin;
@@ -41,15 +42,16 @@
protected $debug;
protected $only;
protected $version;
+
protected $hash;
protected $raw;
+
protected $image;
protected $variant;
protected $format;
+
protected $userObj;
protected $imageObj;
-
-   /* Methods */
 
/**
 * @param ResourceLoader $resourceLoader
@@ -58,6 +60,7 @@
public function __construct( ResourceLoader $resourceLoader, WebRequest 
$request ) {
$this->resourceLoader = $resourceLoader;
$this->request = $request;
+   $this->logger = $resourceLoader->getLogger();
 
// List of modules
$modules = $request->getVal( 'modules' );
@@ -147,6 +150,14 @@
}
 
/**
+* @since 1.27
+* @return \\Psr\\Log\\LoggerInterface
+*/
+   public function getLogger() {
+   return $this->logger;
+   }
+
+   /**
 * @return array
 */
public function getModules() {
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php 
b/includes/resourceloader/ResourceLoaderStartUpModule.php
index e900200..692ca91 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -211,6 +211,13 @@
 
$versionHash = $module->getVersionHash( $context );
if ( strlen( $versionHash ) !== 8 ) {
+   $context->getLogger()->warning(
+   "Module '{module}' produced an invalid 
version hash: '{version}'.",
+   array(
+   'module' => $name,
+   'version' => $versionHash,
+   )
+   );
// Module implementation either broken or 
deviated from ResourceLoader::makeHash
// Asserted by 
tests/phpunit/structure/ResourcesTest.
$versionHash = ResourceLoader::makeHash( 
$versionHash );

-- 
To view, visit https://gerrit.wikimedia.org/r/252156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbc3de1b6e0838386735f1573df328d9b331ac37
Gerrit-PatchSet: 1
Gerrit-Project:

[MediaWiki-commits] [Gerrit] Break long lines and cleanup some RefreshLinksJob checks - change (mediawiki/core)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Break long lines and cleanup some RefreshLinksJob checks
..


Break long lines and cleanup some RefreshLinksJob checks

Change-Id: I02c007a2c2032610551d71ce1b21e03db5c011db
---
M includes/jobqueue/jobs/RefreshLinksJob.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php 
b/includes/jobqueue/jobs/RefreshLinksJob.php
index 25c3ba4..5f1a1a6 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -216,10 +216,10 @@
$title, null, !empty( 
$this->params['useRecursiveLinksUpdate'] ), $parserOutput );
foreach ( $updates as $key => $update ) {
if ( $update instanceof LinksUpdate ) {
-   if ( isset( $this->params['triggeredRecursive'] 
) ) {
+   if ( !empty( 
$this->params['triggeredRecursive'] ) ) {
$update->setTriggeredRecursive();
}
-   if ( isset( $this->params['triggeringUser'] ) 
&& $this->params['triggeringUser'] ) {
+   if ( !empty( $this->params['triggeringUser'] ) 
) {
$userInfo = 
$this->params['triggeringUser'];
if ( $userInfo['userId'] ) {
$user = User::newFromId( 
$userInfo['userId'] );
@@ -229,7 +229,7 @@
}
$update->setTriggeringUser( $user );
}
-   if ( isset( 
$this->params['triggeringRevisionId'] ) && 
$this->params['triggeringRevisionId'] ) {
+   if ( !empty( 
$this->params['triggeringRevisionId'] ) ) {
$revision = Revision::newFromId( 
$this->params['triggeringRevisionId'] );
if ( $revision === null ) {
$revision = Revision::newFromId(

-- 
To view, visit https://gerrit.wikimedia.org/r/251688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I02c007a2c2032610551d71ce1b21e03db5c011db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improve LoadBalancer::doWait() performance via APC - change (mediawiki/core)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Improve LoadBalancer::doWait() performance via APC
..


Improve LoadBalancer::doWait() performance via APC

* This avoids bothering with MASTER_POS_WAIT() if an equal/higher
  position was already successfully waited on by another process.
* Add DBMasterPos toString() and hasReached() methods, which
  MySQLMasterPos already implemented and used.
* Moved more wfDebug() statements to the 'replication' log.

Change-Id: I423b5fe2da8d97889a6d204a635e351342de7649
---
M includes/db/ChronologyProtector.php
M includes/db/DatabaseMysqlBase.php
M includes/db/DatabaseUtility.php
M includes/db/loadbalancer/LoadBalancer.php
M tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
5 files changed, 62 insertions(+), 20 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/db/ChronologyProtector.php 
b/includes/db/ChronologyProtector.php
index 0c7b612..6840d17 100644
--- a/includes/db/ChronologyProtector.php
+++ b/includes/db/ChronologyProtector.php
@@ -60,7 +60,7 @@
if ( !empty( $this->startupPositions[$masterName] ) ) {
$info = $lb->parentInfo();
$pos = $this->startupPositions[$masterName];
-   wfDebug( __METHOD__ . ": LB " . $info['id'] . " waiting 
for master pos $pos\n" );
+   wfDebug( __METHOD__ . ": LB '" . $info['id'] . "' 
waiting for master pos $pos\n" );
$lb->waitFor( $pos );
}
}
diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 907cdbf..4f93419 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -1354,6 +1354,21 @@
$this->asOfTime = microtime( true );
}
 
+   function asOfTime() {
+   return $this->asOfTime;
+   }
+
+   function hasReached( DBMasterPos $pos ) {
+   if ( !( $pos instanceof self ) ) {
+   throw new InvalidArgumentException( "Position not an 
instance of " . __CLASS__ );
+   }
+
+   $thisPos = $this->getCoordinates();
+   $thatPos = $pos->getCoordinates();
+
+   return ( $thisPos && $thatPos && $thisPos >= $thatPos );
+   }
+
function __toString() {
// e.g db1034-bin.000976/843431247
return "{$this->file}/{$this->pos}";
@@ -1369,16 +1384,5 @@
}
 
return false;
-   }
-
-   function hasReached( MySQLMasterPos $pos ) {
-   $thisPos = $this->getCoordinates();
-   $thatPos = $pos->getCoordinates();
-
-   return ( $thisPos && $thatPos && $thisPos >= $thatPos );
-   }
-
-   function asOfTime() {
-   return $this->asOfTime;
}
 }
diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php
index 969ed5e..dea7d94 100644
--- a/includes/db/DatabaseUtility.php
+++ b/includes/db/DatabaseUtility.php
@@ -321,6 +321,20 @@
 interface DBMasterPos {
/**
 * @return float UNIX timestamp
+* @since 1.25
 */
public function asOfTime();
+
+   /**
+* @param DBMasterPos $pos
+* @return bool Whether this position is at or higher than $pos
+* @since 1.27
+*/
+   public function hasReached( DBMasterPos $pos );
+
+   /**
+* @return string
+* @since 1.27
+*/
+   public function __toString();
 }
diff --git a/includes/db/loadbalancer/LoadBalancer.php 
b/includes/db/loadbalancer/LoadBalancer.php
index a5a5c37..65ee9c7 100644
--- a/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@ -47,6 +47,8 @@
private $mLoadMonitorClass;
/** @var LoadMonitor */
private $mLoadMonitor;
+   /** @var BagOStuff */
+   private $srvCache;
 
/** @var bool|DatabaseBase Database connection that caused a problem */
private $mErrorConnection;
@@ -123,6 +125,8 @@
}
}
}
+
+   $this->srvCache = ObjectCache::getLocalServerInstance();
}
 
/**
@@ -445,17 +449,27 @@
protected function doWait( $index, $open = false, $timeout = null ) {
$close = false; // close the connection afterwards
 
-   # Find a connection to wait on, creating one if needed and 
allowed
+   // Check if we already know that the DB has reached this point
+   $server = $this->getServerName( $index );
+   $key = $this->srvCache->makeGlobalKey( __CLASS__, 
'last-known-pos', $server );
+   /** @var DBMasterPos $knownReachedPos */
+   $knownReachedPos = $this->srvCache->get( $key );
+

[MediaWiki-commits] [Gerrit] Merge commit 'refs/changes/40/251940/1' of https://gerrit.wi... - change (wikidata...rdf)

2015-11-09 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252149

Change subject: Merge commit 'refs/changes/40/251940/1' of 
https://gerrit.wikimedia.org/r/wikidata/query/rdf
..

Merge commit 'refs/changes/40/251940/1' of 
https://gerrit.wikimedia.org/r/wikidata/query/rdf

Conflicts:
gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js

Change-Id: I27fefc14f6d163098cb9d4c19492f774e778e4b0
---
M gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
M gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
2 files changed, 0 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/49/252149/1

diff --git a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js 
b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
index d8ee5c1..313a07c 100755
--- a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
+++ b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
@@ -58,16 +58,12 @@
}
};
 
-<<< HEAD   (8fa71e Small bug fixes)
-   function getSPARQLHints( term ){
-===
CodeMirror.hint.sparql.async = true;
CodeMirror.defaults.hintOptions = {};
CodeMirror.defaults.hintOptions.closeCharacters = /[]/;
CodeMirror.defaults.hintOptions.completeSingle = false;
 
function getSPARQLHints( term ) {
->>> BRANCH (3d1164 Clean up code style in gui/wikibase/codemirror/addon/*)
var list = [];
 
$.each( SPARQL_KEYWORDS, function ( key, keyword ) {
@@ -82,15 +78,9 @@
function getDefinedVariables( text ) {
var variables = [];
 
-<<< HEAD   (8fa71e Small bug fixes)
-   $.each(text.split(' '), function( key, word ){
-   if( word.match(/^\?\w+$/)){
-   variables.push(word);
-===
$.each( text.split( ' ' ), function ( key, word ) {
if ( word.indexOf( '?' ) === 0 ){
variables.push( word );
->>> BRANCH (3d1164 Clean up code style in gui/wikibase/codemirror/addon/*)
}
});
 
diff --git a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js 
b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
index b7f8ba1..ebbdaf2 100644
--- a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
+++ b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
@@ -51,12 +51,7 @@
var posX = e.clientX,
posY = e.clientY + $( window ).scrollTop();
 
-<<< HEAD   (8fa71e Small bug fixes)
-   var token = 
this.editor.getTokenAt(this.editor.coordsChar({left: posX, top: posY})).string;
-===
var token = this.editor.getTokenAt( this.editor.coordsChar( { 
left: posX, top: posY } ) ).string;
-   console.log( token );
->>> BRANCH (3d1164 Clean up code style in gui/wikibase/codemirror/addon/*)
 
if ( !token.match( /.+\:(Q|P)[0-9]*/ ) ) {
return;

-- 
To view, visit https://gerrit.wikimedia.org/r/252149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27fefc14f6d163098cb9d4c19492f774e778e4b0
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Apex theme: Remove dead styles for ComboBoxWidget - change (oojs/ui)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Apex theme: Remove dead styles for ComboBoxWidget
..


Apex theme: Remove dead styles for ComboBoxWidget

The class this tries to style doesn't exist.

Change-Id: I59b2f0d07e55da9c7dc168bf250db886783a2757
---
M src/themes/apex/widgets.less
1 file changed, 0 insertions(+), 9 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 80f7688..70d5281 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -486,15 +486,6 @@
 
.oo-ui-inline-spacing(0.5em);
 
-   &-handle {
-   border: 1px solid rgba(0,0,0,0.1);
-   border-radius: 0.25em;
-
-   &:hover {
-   border-color: rgba(0,0,0,0.2);
-   }
-   }
-
&.oo-ui-widget-disabled,
&-empty {
.oo-ui-textInputWidget.oo-ui-indicatorElement {

-- 
To view, visit https://gerrit.wikimedia.org/r/251820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I59b2f0d07e55da9c7dc168bf250db886783a2757
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Do not explore statement URIs - change (wikidata...rdf)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Do not explore statement URIs
..


Do not explore statement URIs

Bug: T116735
Change-Id: I833077bb6308d69eb7be986db165fa9c3ed1ff22
---
M gui/gui.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Smalyshev: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/gui/gui.js b/gui/gui.js
index f941b8d..d02b85c 100644
--- a/gui/gui.js
+++ b/gui/gui.js
@@ -4,7 +4,7 @@
 ( function ( $, mw ) {
var SERVICE = '/bigdata/namespace/wdq/sparql',
SHORTURL = 'http://tinyurl.com/create.php?url=',
-   EXPLORE_URL = 'http://www.wikidata.org/entity/',
+   EXPLORE_URL = 'http://www.wikidata.org/entity/Q',
NAMESPACE_SHORTCUTS = {
'Wikidata': {
'wikibase': 'http://wikiba.se/ontology#',

-- 
To view, visit https://gerrit.wikimedia.org/r/252151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I833077bb6308d69eb7be986db165fa9c3ed1ff22
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added Rakefile - change (mediawiki...CirrusSearch)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Added Rakefile
..


Added Rakefile

This is needed for our continuous integration.

Bug: T117993
Change-Id: I7f3f6f9cb6dc35a727e70799aeae509bcdd93b3a
---
A Rakefile
1 file changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  DCausse: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..6eef121
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the 
directory
+  # where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]

-- 
To view, visit https://gerrit.wikimedia.org/r/251988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f3f6f9cb6dc35a727e70799aeae509bcdd93b3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't run maintenance scripts for Elasticsearch 2.x - change (mediawiki...CirrusSearch)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Don't run maintenance scripts for Elasticsearch 2.x
..


Don't run maintenance scripts for Elasticsearch 2.x

ES 2.0.0 is a major release, which may have breaking changes, that
aren't supported in CirrusSearch/Elastica (currently). One thing is,
e.g., that the _status api was replaced by Indicies recvery[2] and
Indices stats (_stats endpoint)[3], see [1].

This change results in an exception in Elastica, which, in the latest
release, supports ES 1.7.3, only. The maintenance sccript should exit
as early as possible, instead of trying to use ES 2.0.0 and fail with
a user-unfriendly exception.

[1] 
https://www.elastic.co/guide/en/elasticsearch/reference/2.0/indices-status.html
[2] 
https://www.elastic.co/guide/en/elasticsearch/reference/2.0/indices-recovery.html
[3] 
https://www.elastic.co/guide/en/elasticsearch/reference/2.0/indices-stats.html

Change-Id: I52e93ea2c1b5f602dc101c8c79fd958fbb8a941c
---
M includes/Maintenance/ConfigUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  DCausse: Looks good to me, approved
  jenkins-bot: Verified

Objections:
  Cindy-the-browser-test-bot: There's a problem with this change, please improve



diff --git a/includes/Maintenance/ConfigUtils.php 
b/includes/Maintenance/ConfigUtils.php
index 0bd7c00..bee41a9 100644
--- a/includes/Maintenance/ConfigUtils.php
+++ b/includes/Maintenance/ConfigUtils.php
@@ -52,7 +52,7 @@
}
$result = $result[ 'version' ][ 'number' ];
$this->output( "$result..." );
-   if ( !preg_match( '/^(1|2)./', $result ) ) {
+   if ( !preg_match( '/^1./', $result ) ) {
$this->output( "Not supported!\n" );
$this->error( "Only Elasticsearch 1.x is supported.  
Your version: $result.", 1 );
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/251831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I52e93ea2c1b5f602dc101c8c79fd958fbb8a941c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
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 share icon background transparent - change (apps...wikipedia)

2015-11-09 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252015

Change subject: Make share icon background transparent
..

Make share icon background transparent

The change in 9e91af8 appeared correct initially on my device. However,
after uninstalling and reinstalling the app, the share icons had an
opaque black background, probably due to an old PNGCRUSH version. This
patch simply recuts the assets.

Change-Id: Ibf44910645e8cef189404ce4a5e7a01c98ab00c4
---
M app/src/main/res/drawable-hdpi/ic_share_dark.png
M app/src/main/res/drawable-ldrtl-hdpi/ic_share_dark.png
M app/src/main/res/drawable-ldrtl-mdpi/ic_share_dark.png
M app/src/main/res/drawable-ldrtl-xhdpi/ic_share_dark.png
M app/src/main/res/drawable-ldrtl-xxhdpi/ic_share_dark.png
M app/src/main/res/drawable-ldrtl-xxxhdpi/ic_share_dark.png
M app/src/main/res/drawable-mdpi/ic_share_dark.png
M app/src/main/res/drawable-xhdpi/ic_share_dark.png
M app/src/main/res/drawable-xxhdpi/ic_share_dark.png
M app/src/main/res/drawable-xxxhdpi/ic_share_dark.png
10 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/15/252015/1

diff --git a/app/src/main/res/drawable-hdpi/ic_share_dark.png 
b/app/src/main/res/drawable-hdpi/ic_share_dark.png
index 25641b3..5cc27a8 100644
--- a/app/src/main/res/drawable-hdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/ic_share_dark.png 
b/app/src/main/res/drawable-ldrtl-hdpi/ic_share_dark.png
index e264768..7ebd86c 100644
--- a/app/src/main/res/drawable-ldrtl-hdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-ldrtl-hdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/ic_share_dark.png 
b/app/src/main/res/drawable-ldrtl-mdpi/ic_share_dark.png
index 38687b9..d9066e0 100644
--- a/app/src/main/res/drawable-ldrtl-mdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-ldrtl-mdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/ic_share_dark.png 
b/app/src/main/res/drawable-ldrtl-xhdpi/ic_share_dark.png
index 8a09181..263aef7 100644
--- a/app/src/main/res/drawable-ldrtl-xhdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-ldrtl-xhdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_share_dark.png 
b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_share_dark.png
index 977266a..17c4f14 100644
--- a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_share_dark.png 
b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_share_dark.png
index 3210f2f..1cdcefb 100644
--- a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_dark.png 
b/app/src/main/res/drawable-mdpi/ic_share_dark.png
index 09a48a7..ef62875 100644
--- a/app/src/main/res/drawable-mdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_dark.png 
b/app/src/main/res/drawable-xhdpi/ic_share_dark.png
index 146cd00..1d569ec 100644
--- a/app/src/main/res/drawable-xhdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-xhdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_dark.png 
b/app/src/main/res/drawable-xxhdpi/ic_share_dark.png
index 2d2930e..9da247b 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_share_dark.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_dark.png 
b/app/src/main/res/drawable-xxxhdpi/ic_share_dark.png
index 53754b6..55b7f3c 100644
--- a/app/src/main/res/drawable-xxxhdpi/ic_share_dark.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_share_dark.png
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/252015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf44910645e8cef189404ce4a5e7a01c98ab00c4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Assign salt grains for cp* hosts - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for cp* hosts
..


Assign salt grains for cp* hosts

Change-Id: I9cac6ba19cdd39e3615c427881c32539a1058b89
---
A hieradata/hosts/cp1008.yaml
A hieradata/hosts/cp4018.yaml
A hieradata/role/codfw/cache/mobile.yaml
A hieradata/role/codfw/cache/parsoid.yaml
A hieradata/role/codfw/cache/text.yaml
A hieradata/role/codfw/cache/upload.yaml
A hieradata/role/eqiad/cache/maps.yaml
A hieradata/role/eqiad/cache/misc.yaml
A hieradata/role/eqiad/cache/mobile.yaml
A hieradata/role/eqiad/cache/parsoid.yaml
A hieradata/role/eqiad/cache/text.yaml
A hieradata/role/eqiad/cache/upload.yaml
A hieradata/role/esams/cache/mobile.yaml
A hieradata/role/esams/cache/text.yaml
A hieradata/role/esams/cache/upload.yaml
A hieradata/role/ulsfo/cache/mobile.yaml
A hieradata/role/ulsfo/cache/text.yaml
A hieradata/role/ulsfo/cache/upload.yaml
M modules/debdeploy/templates/debdeploy.erb
19 files changed, 85 insertions(+), 0 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml
new file mode 100644
index 000..0898300
--- /dev/null
+++ b/hieradata/hosts/cp1008.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp:
+value: canary
diff --git a/hieradata/hosts/cp4018.yaml b/hieradata/hosts/cp4018.yaml
new file mode 100644
index 000..0898300
--- /dev/null
+++ b/hieradata/hosts/cp4018.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp:
+value: canary
diff --git a/hieradata/role/codfw/cache/mobile.yaml 
b/hieradata/role/codfw/cache/mobile.yaml
new file mode 100644
index 000..32dfd54
--- /dev/null
+++ b/hieradata/role/codfw/cache/mobile.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-mobile:
+value: standard
diff --git a/hieradata/role/codfw/cache/parsoid.yaml 
b/hieradata/role/codfw/cache/parsoid.yaml
new file mode 100644
index 000..e81e00d
--- /dev/null
+++ b/hieradata/role/codfw/cache/parsoid.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-parsoid:
+value: standard
diff --git a/hieradata/role/codfw/cache/text.yaml 
b/hieradata/role/codfw/cache/text.yaml
new file mode 100644
index 000..2baffc3
--- /dev/null
+++ b/hieradata/role/codfw/cache/text.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-text:
+value: standard
diff --git a/hieradata/role/codfw/cache/upload.yaml 
b/hieradata/role/codfw/cache/upload.yaml
new file mode 100644
index 000..6ffc684
--- /dev/null
+++ b/hieradata/role/codfw/cache/upload.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-codfw-upload:
+value: standard
diff --git a/hieradata/role/eqiad/cache/maps.yaml 
b/hieradata/role/eqiad/cache/maps.yaml
new file mode 100644
index 000..d2aad56
--- /dev/null
+++ b/hieradata/role/eqiad/cache/maps.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-maps:
+value: standard
diff --git a/hieradata/role/eqiad/cache/misc.yaml 
b/hieradata/role/eqiad/cache/misc.yaml
new file mode 100644
index 000..ff54641
--- /dev/null
+++ b/hieradata/role/eqiad/cache/misc.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-misc:
+value: standard
diff --git a/hieradata/role/eqiad/cache/mobile.yaml 
b/hieradata/role/eqiad/cache/mobile.yaml
new file mode 100644
index 000..aa324fa
--- /dev/null
+++ b/hieradata/role/eqiad/cache/mobile.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-mobile:
+value: standard
diff --git a/hieradata/role/eqiad/cache/parsoid.yaml 
b/hieradata/role/eqiad/cache/parsoid.yaml
new file mode 100644
index 000..19619e2
--- /dev/null
+++ b/hieradata/role/eqiad/cache/parsoid.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-parsoid:
+value: standard
diff --git a/hieradata/role/eqiad/cache/text.yaml 
b/hieradata/role/eqiad/cache/text.yaml
new file mode 100644
index 000..98d4941
--- /dev/null
+++ b/hieradata/role/eqiad/cache/text.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-text:
+value: standard
diff --git a/hieradata/role/eqiad/cache/upload.yaml 
b/hieradata/role/eqiad/cache/upload.yaml
new file mode 100644
index 000..8e6390c
--- /dev/null
+++ b/hieradata/role/eqiad/cache/upload.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-eqiad-upload:
+value: standard
diff --git a/hieradata/role/esams/cache/mobile.yaml 
b/hieradata/role/esams/cache/mobile.yaml
new file mode 100644
index 000..32450e8
--- /dev/null
+++ b/hieradata/role/esams/cache/mobile.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-esams-mobile:
+value: standard
diff --git a/hieradata/role/esams/cache/text.yaml 
b/hieradata/role/esams/cache/text.yaml
new file mode 100644
index 000..3c9b3c1
--- /dev/null
+++ b/hieradata/role/esams/cache/text.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-cp-esams-text:
+

[MediaWiki-commits] [Gerrit] Use role spare for calcium - change (operations/puppet)

2015-11-09 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252018

Change subject: Use role spare for calcium
..

Use role spare for calcium

It is in the process of being decomissioned, but until that happens use
role spare, so that security updates still reach it.

Change-Id: I6ff4efcea55856e27053e8c15ac499ab28799399
---
M manifests/site.pp
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/252018/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2b608a7..c85bec5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -282,9 +282,7 @@
 # T83044 cameras
 node 'calcium.wikimedia.org' {
 $cluster = 'misc'
-
-include standard
-include base::firewall
+role spare
 }
 
 # Californium hosts openstack-dashboard AKA horizon

-- 
To view, visit https://gerrit.wikimedia.org/r/252018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ff4efcea55856e27053e8c15ac499ab28799399
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 280b68b..b966333 - change (mediawiki/extensions)

2015-11-09 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251968

Change subject: Syncronize VisualEditor: 280b68b..b966333
..

Syncronize VisualEditor: 280b68b..b966333

Change-Id: I321c3243c674427fc3d756b58e13144749ac0d3c
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/68/251968/1

diff --git a/VisualEditor b/VisualEditor
index 280b68b..b966333 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 280b68b183e9c35afce7a7d8e4eb984601c3a8e6
+Subproject commit b966333009eea695121bf01d967437449daa6106

-- 
To view, visit https://gerrit.wikimedia.org/r/251968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I321c3243c674427fc3d756b58e13144749ac0d3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 280b68b..b966333 - change (mediawiki/extensions)

2015-11-09 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 280b68b..b966333
..


Syncronize VisualEditor: 280b68b..b966333

Change-Id: I321c3243c674427fc3d756b58e13144749ac0d3c
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 280b68b..b966333 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 280b68b183e9c35afce7a7d8e4eb984601c3a8e6
+Subproject commit b966333009eea695121bf01d967437449daa6106

-- 
To view, visit https://gerrit.wikimedia.org/r/251968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I321c3243c674427fc3d756b58e13144749ac0d3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Unset 'action' query parameter from veEditUri, which should ... - change (mediawiki...VisualEditor)

2015-11-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Unset 'action' query parameter from veEditUri, which should 
always point to VE
..


Unset 'action' query parameter from veEditUri, which should always point to VE

Bug: T117780
Change-Id: I1377145bbbe05611ee75ae27922cf7a2cc5895e7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 8b042e8..0270920 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -231,6 +231,7 @@
// On a view page, extend the current URI so parameters like oldid are 
carried over
// On a non-view page, use viewUri
veEditUri = ( pageCanLoadVE ? uri : viewUri ).clone().extend( { 
veaction: 'edit' } );
+   delete veEditUri.query.action;
 
support = {
es5: !!(

-- 
To view, visit https://gerrit.wikimedia.org/r/251843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1377145bbbe05611ee75ae27922cf7a2cc5895e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added Rakefile - change (mediawiki...Translate)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251977

Change subject: Added Rakefile
..

Added Rakefile

This is needed for our continuous integration.

Bug: T117993
Change-Id: Idaf0f082022e553708393bde3f084744160282ec
---
A Rakefile
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/77/251977/1

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..6eef121
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the 
directory
+  # where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]

-- 
To view, visit https://gerrit.wikimedia.org/r/251977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaf0f082022e553708393bde3f084744160282ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added Rakefile - change (mediawiki...ContentTranslation)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251989

Change subject: Added Rakefile
..

Added Rakefile

This is needed for our continuous integration.

Bug: T117993
Change-Id: Idf6d1451614a29bb59e19997b4354bb325f211e4
---
A Rakefile
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/89/251989/1

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..6eef121
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the 
directory
+  # where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]

-- 
To view, visit https://gerrit.wikimedia.org/r/251989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf6d1451614a29bb59e19997b4354bb325f211e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added Rakefile - change (mediawiki...Flow)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251991

Change subject: Added Rakefile
..

Added Rakefile

This is needed for our continuous integration.

Bug: T117993
Change-Id: I12532e9a6a75d4c25397cd4b468f7f8ca71be728
---
A Rakefile
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/91/251991/1

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..6eef121
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the 
directory
+  # where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]

-- 
To view, visit https://gerrit.wikimedia.org/r/251991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12532e9a6a75d4c25397cd4b468f7f8ca71be728
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added Rakefile - change (mediawiki...CirrusSearch)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251988

Change subject: Added Rakefile
..

Added Rakefile

This is needed for our continuous integration.

Bug: T117993
Change-Id: I7f3f6f9cb6dc35a727e70799aeae509bcdd93b3a
---
A Rakefile
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/88/251988/1

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..6eef121
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the 
directory
+  # where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]

-- 
To view, visit https://gerrit.wikimedia.org/r/251988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f3f6f9cb6dc35a727e70799aeae509bcdd93b3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added Rakefile - change (mediawiki...CentralAuth)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251987

Change subject: Added Rakefile
..

Added Rakefile

This is needed for our continuous integration.

Bug: T117993
Change-Id: Idfab3e414343a7d56117463dd5b07d6f16f71efb
---
A Rakefile
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/87/251987/1

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..6eef121
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the 
directory
+  # where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]

-- 
To view, visit https://gerrit.wikimedia.org/r/251987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfab3e414343a7d56117463dd5b07d6f16f71efb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added Rakefile - change (mediawiki...Echo)

2015-11-09 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251990

Change subject: Added Rakefile
..

Added Rakefile

This is needed for our continuous integration.

Bug: T117993
Change-Id: I505de688e73488624cbecc5e644aa1b739ad1f23
---
M Gemfile.lock
A Rakefile
2 files changed, 14 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/90/251990/1

diff --git a/Gemfile.lock b/Gemfile.lock
index 2641b23..b3e5c3f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,6 +105,3 @@
   csscss (~> 1.3.3)
   mediawiki_selenium (~> 1.5.0)
   rubocop (~> 0.34.2)
-
-BUNDLED WITH
-   1.10.5
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..6eef121
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the 
directory
+  # where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]

-- 
To view, visit https://gerrit.wikimedia.org/r/251990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I505de688e73488624cbecc5e644aa1b739ad1f23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 3 4 >

1 - 100 of 317 matches

Mail list logo