date:20170912

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: scap: fix checks.yaml syntax

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377502 )

Change subject: scap: fix checks.yaml syntax
..


scap: fix checks.yaml syntax

Change-Id: I0a08cbf7cea116e646eecf1ad53ce9e51e0941e2
---
M scap/checks.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 53f10d9..c64c33f 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -3,5 +3,5 @@
   scholarships_responds:
 type: command
 stage: promote
-command: curl -SsI -H 'Host: scholarships.wikimedia.org' 
'http://localhost:80/apply'
+command: "curl -SsI -H 'Host: scholarships.wikimedia.org' 
'http://localhost:80/apply'"
 timeout: 10

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a08cbf7cea116e646eecf1ad53ce9e51e0941e2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: fix k8s classes that just include k8s::proxy

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377505 )

Change subject: toollabs: fix k8s classes that just include k8s::proxy
..

toollabs: fix k8s classes that just include k8s::proxy

Change-Id: If2ab6669c8941840dcf23600df4196349af71219
---
M modules/role/manifests/toollabs/k8s/bastion.pp
M modules/role/manifests/toollabs/k8s/webproxy.pp
2 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/377505/1

diff --git a/modules/role/manifests/toollabs/k8s/bastion.pp 
b/modules/role/manifests/toollabs/k8s/bastion.pp
index ec922e2..30e84db 100644
--- a/modules/role/manifests/toollabs/k8s/bastion.pp
+++ b/modules/role/manifests/toollabs/k8s/bastion.pp
@@ -13,6 +13,11 @@
 etcd_endpoints => $etcd_url,
 }
 
+
+class { 'k8s::infrastructure_config':
+master_host => $master_host,
+}
+
 class { '::k8s::proxy':
 master_host => $master_host,
 }
diff --git a/modules/role/manifests/toollabs/k8s/webproxy.pp 
b/modules/role/manifests/toollabs/k8s/webproxy.pp
index 28d973a..edd5daa 100644
--- a/modules/role/manifests/toollabs/k8s/webproxy.pp
+++ b/modules/role/manifests/toollabs/k8s/webproxy.pp
@@ -17,6 +17,10 @@
 master_host => $master_host,
 }
 
+class { 'k8s::infrastructure_config':
+master_host => $master_host,
+}
+
 class { '::k8s::proxy':
 master_host => $master_host,
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2ab6669c8941840dcf23600df4196349af71219
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] operations/puppet[production]: Scap: Allow phabricator as a source

2017-09-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376571 )

Change subject: Scap: Allow phabricator as a source
..


Scap: Allow phabricator as a source

Setting the origin is already set up in the scap_source puppet type, but
not in the scap::source puppet resource. This adds 'origin' as a
configurable parameter of the scap::source puppet resource. This also
updates the git url for phabricator.

Change-Id: I1bbe9b6af0e76e606375619812eebd71ff7eb123
---
M modules/scap/lib/puppet/provider/scap_source/default.rb
M modules/scap/manifests/source.pp
2 files changed, 9 insertions(+), 3 deletions(-)

Approvals:
  20after4: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/modules/scap/lib/puppet/provider/scap_source/default.rb 
b/modules/scap/lib/puppet/provider/scap_source/default.rb
index f901355..f401ed4 100644
--- a/modules/scap/lib/puppet/provider/scap_source/default.rb
+++ b/modules/scap/lib/puppet/provider/scap_source/default.rb
@@ -41,7 +41,7 @@
 when :gerrit
   "https://gerrit.wikimedia.org/r/p/#{repo_name}.git";
 when :phabricator
-  "https://phabricator.wikimedia.org/diffusion/#{repo_name}.git";
+  "https://phabricator.wikimedia.org/source/#{repo_name}.git";
 end
   end
 
@@ -50,7 +50,7 @@
 when :gerrit
   origin.slice! "https://gerrit.wikimedia.org/r/p/";
 when :phabricator
-  origin.slice! "https://phabricator.wikimedia.org/diffusion/";
+  origin.slice! "https://phabricator.wikimedia.org/source/";
 end
 origin.gsub(/\.git$/, '')
   end
diff --git a/modules/scap/manifests/source.pp b/modules/scap/manifests/source.pp
index 39c0244..88295c9 100644
--- a/modules/scap/manifests/source.pp
+++ b/modules/scap/manifests/source.pp
@@ -18,7 +18,7 @@
 # == Parameters
 #
 # [*repository*]
-#   Repository name in gerrit.  Default: $title
+#   Repository name in gerrit/phabricator.  Default: $title
 #
 # [*scap_repository*]
 #   String or boolean.
@@ -44,6 +44,10 @@
 # [*base_path*]
 #   Base path for deployments.
 #   Default: /srv/deployment
+#
+# [*origin*]
+#   Origin of cloned repository, either gerrit or phabricator
+#   Default: gerrit
 #
 # [*lvs_service*]
 #   Name of the lvs service associated with this deployment, if any
@@ -91,6 +95,7 @@
 $owner= 'trebuchet',
 $group= 'wikidev',
 $base_path= '/srv/deployment',
+$origin   = 'gerrit',
 $canaries = undef,
 $lvs_service  = undef,
 $hosts= undef,
@@ -103,6 +108,7 @@
 owner   => $owner,
 group   => $group,
 base_path   => $base_path,
+origin  => $origin,
 }
 
 # Scap dsh lists.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bbe9b6af0e76e606375619812eebd71ff7eb123
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove @cover of private Sanitizer method

2017-09-12 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377504 )

Change subject: Remove @cover of private Sanitizer method
..

Remove @cover of private Sanitizer method

Breaks mediawiki-core-code-coverage

https://integration.wikimedia.org/ci/job/mediawiki-core-code-coverage/3003/console

Change-Id: I3204289c1d45e5ea0bee5c4bb6869434152e6017
---
M tests/phpunit/includes/SanitizerTest.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/377504/1

diff --git a/tests/phpunit/includes/SanitizerTest.php 
b/tests/phpunit/includes/SanitizerTest.php
index 7472fb9..350cb70 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -432,7 +432,6 @@
 * @covers Sanitizer::escapeIdForLink()
 * @covers Sanitizer::escapeIdForExternalInterwiki()
 * @covers Sanitizer::escapeIdInternal()
-* @covers Sanitizer::urlEscapeId()
 *
 * @param string $stuff
 * @param string[] $config

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nodepool: remove trusty image

2017-09-12 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377476 )

Change subject: nodepool: remove trusty image
..


nodepool: remove trusty image

We no more use it. The last use was for the PHP 5.5 jobs which are now
running on Jessie.

Bug: T175696
Change-Id: I0653636060d29f70039516be37eb05a842816444
---
M modules/nodepool/templates/nodepool.yaml.erb
1 file changed, 0 insertions(+), 13 deletions(-)

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



diff --git a/modules/nodepool/templates/nodepool.yaml.erb 
b/modules/nodepool/templates/nodepool.yaml.erb
index 99e1885..e4aa398 100644
--- a/modules/nodepool/templates/nodepool.yaml.erb
+++ b/modules/nodepool/templates/nodepool.yaml.erb
@@ -66,12 +66,6 @@
 min-ready: 12
 providers:
   - name: wmflabs-eqiad
-  - name: ci-trusty-wikimedia
-image: snapshot-ci-trusty
-ready-script: ready.sh
-min-ready: 2
-providers:
-  - name: wmflabs-eqiad
 
 providers:
   - name: wmflabs-eqiad
@@ -94,13 +88,6 @@
   # RelEng manually build and upload the images to Glance
   - name: snapshot-ci-jessie
 base-image: image-ci-jessie
-min-ram: 0
-name-filter: 'm1.medium'
-setup: setup_node.sh
-username: jenkins
-private-key: /var/lib/nodepool/.ssh/id_rsa
-  - name: snapshot-ci-trusty
-base-image: image-ci-trusty
 min-ram: 0
 name-filter: 'm1.medium'
 setup: setup_node.sh

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377503 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

85a1b0493 Retry deadlock / lock wait failures

Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
---
0 files changed, 0 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-09-12 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377503 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

85a1b0493 Retry deadlock / lock wait failures

Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/03/377503/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: scap: fix checks.yaml syntax

2017-09-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377502 )

Change subject: scap: fix checks.yaml syntax
..

scap: fix checks.yaml syntax

Change-Id: I0a08cbf7cea116e646eecf1ad53ce9e51e0941e2
---
M scap/checks.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/02/377502/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 53f10d9..c64c33f 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -3,5 +3,5 @@
   scholarships_responds:
 type: command
 stage: promote
-command: curl -SsI -H 'Host: scholarships.wikimedia.org' 
'http://localhost:80/apply'
+command: "curl -SsI -H 'Host: scholarships.wikimedia.org' 
'http://localhost:80/apply'"
 timeout: 10

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a08cbf7cea116e646eecf1ad53ce9e51e0941e2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
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] operations/puppet[production]: wmf-auto-reimage refactoring

2017-09-12 Thread Volans (Code Review)

Volans has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377501 )

Change subject: wmf-auto-reimage refactoring
..

wmf-auto-reimage refactoring

* Allow to specify a conftool state: T149230
* Add step to reset puppet.service: T169555
* Removed dependency on the old wmf-reimage script on the puppetmaster
  host: T148817
* Remove all Salt dependencies and replaced them with Cumin or direct
  calls to ipmitool: T166300

The work to migrate from Salt to Cumin and remove the wmf-reimage
dependency required a major refactor in order to support multiple hosts
in a reliable and independent way.
In addition, it required to move it from the 'salt' module in the Puppet
tree to the 'cumin' module and split it into a common library and two
different scripts:
* wmf-auto-reimage-host: takes care of reimaging a single host
* wmf-auto-reimage: a wrapper around wmf-auto-reimage-host with
  subprocess to reimage a list of hosts either in parallel or in a
  sequence.

Because of the above it was not possible to have a clean diff anyway, so
I decided to add in the same CR the minor additional features that were
pending.
The scripts have been tested with production spare hosts and some new
hosts.

Bug: T148814
Change-Id: If1e0aafcfbfa1ff429a8947bb409e4abee895559
---
A modules/profile/files/cumin/wmf_auto_reimage.py
A modules/profile/files/cumin/wmf_auto_reimage_host.py
A modules/profile/files/cumin/wmf_auto_reimage_lib.py
M modules/profile/manifests/cumin/master.pp
D modules/salt/files/wmf_auto_reimage.py
M modules/salt/manifests/orchestration.pp
6 files changed, 1,291 insertions(+), 1,124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/377501/1

diff --git a/modules/profile/files/cumin/wmf_auto_reimage.py 
b/modules/profile/files/cumin/wmf_auto_reimage.py
new file mode 100644
index 000..ce7f6c5
--- /dev/null
+++ b/modules/profile/files/cumin/wmf_auto_reimage.py
@@ -0,0 +1,203 @@
+#!/usr/bin/env python
+"""Automated reimaging of a list of hosts."""
+
+import logging
+import os
+import socket
+import subprocess
+import sys
+import time
+
+from collections import defaultdict
+from datetime import datetime
+
+import wmf_auto_reimage_lib as lib
+
+
+LOG_PATTERN = '/var/log/wmf-auto-reimage/{start}_{user}_{pid}.log'
+
+logger = logging.getLogger('wmf-auto-reimage')
+
+
+def parse_args():
+"""Parse and return command line arguments, validate the hosts."""
+parser = lib.get_base_parser('Automated reimaging of a list of hosts')
+parser.add_argument(
+'--sequential', action='store_true',
+help=('run one reimage at a time, sequentially. By default the reimage 
for all the hosts '
+  'are run in parallel.'))
+parser.add_argument(
+'--sleep', action='store', type=int, default=0,
+help=('amount of seconds to sleep between one reimage and the next 
when --sequential '
+  'is set. Has no effect if --sequential is not set. [default: 
0]'))
+parser.add_argument(
+'hosts', metavar='HOST', nargs='+', action='store',
+help='FQDN of the host(s) to be reimaged')
+
+args = parser.parse_args()
+
+# Perform a quick sanity check on the hosts
+for host in args.hosts:
+if '.' not in host or not lib.HOSTS_PATTERN.match(host):
+raise ValueError("Expected FQDN of hosts, got '{host}'".format(
+host=host))
+
+if not lib.is_hostname_valid(host):
+raise ValueError(
+"Unable to resolve host '{host}'".format(host=host))
+
+# Ensure there are no duplicates in the hosts list
+duplicates = {host for host in args.hosts if args.hosts.count(host) > 1}
+if len(duplicates) > 0:
+raise ValueError("Duplicate hosts detected: {dup}".format(
+dup=duplicates))
+
+# Ensure Phab task is properly formatted
+if (args.phab_task_id is not None and
+lib.PHAB_TASK_PATTERN.search(args.phab_task_id) is None):
+raise ValueError(("Invalid Phabricator task ID '{task}', expected in "
+  "the form T12345").format(task=args.phab_task_id))
+
+return args
+
+
+def setup_logging(user):
+"""Set up the logger instance and return the log file path.
+
+Arguments:
+user -- the real user to use in the logging formatter for auditing
+"""
+log_path = LOG_PATTERN.format(
+start=datetime.now().strftime('%Y%m%d%H%M'), user=user, 
pid=os.getpid())
+lib.setup_logging(logger, user, log_path)
+
+return log_path
+
+
+def reimage_host(host, mgmt, args):
+"""Run the reimage script for a single host in a subprocess.
+
+Arguments:
+host -- the FQDN of the host to be reimaged
+mgmt -- the FQDN of the management interface of the host
+args -- the parsed arguments to pass over to the reimage script
+"""
+command = lib.get_reimage_host_command(host, mgmt, args

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: Fix up for the logo

2017-09-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377499 )

Change subject: gerrit: Fix up for the logo
..


gerrit: Fix up for the logo

Change-Id: I8a15467c657058dffd26df8a743e47ee8cfb9ad8
---
M modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
M modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png 
b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
index 8a75644..525e79f 100644
--- a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
+++ b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
Binary files differ
diff --git a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg 
b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
index bee6b4a..dca3616 100644
--- a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
+++ b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
@@ -20,7 +20,7 @@
inkscape:version="0.91 r13725"
sodipodi:docname="CodeReview_logo (3).svg"
width="196"
-   height="46">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
\ No newline at end of file
+   ]]>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a15467c657058dffd26df8a743e47ee8cfb9ad8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup 
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] operations/puppet[production]: role::elasticsearch::(cirrus|relforge): move to the future p...

2017-09-12 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374341 )

Change subject: role::elasticsearch::(cirrus|relforge): move to the future 
parser
..


role::elasticsearch::(cirrus|relforge): move to the future parser

Bug: T171704
Change-Id: If2bc6cc17cd7bf4894a09a1d3f284f644c224571
---
M hieradata/role/common/elasticsearch/cirrus.yaml
M hieradata/role/common/elasticsearch/relforge.yaml
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/elasticsearch/cirrus.yaml 
b/hieradata/role/common/elasticsearch/cirrus.yaml
index 805da53..2871ede 100644
--- a/hieradata/role/common/elasticsearch/cirrus.yaml
+++ b/hieradata/role/common/elasticsearch/cirrus.yaml
@@ -30,3 +30,6 @@
 # We have seen (T169498) servers completely exhaust their CPU though, so 
setting
 # this to match cpu counts to prevent overcommit of CPU resources.
 profile::elasticsearch::search_thread_pool_executors: 32
+
+# Use the future parser here
+profile::base::environment: "future"
diff --git a/hieradata/role/common/elasticsearch/relforge.yaml 
b/hieradata/role/common/elasticsearch/relforge.yaml
index 831e73c..4957b8b 100644
--- a/hieradata/role/common/elasticsearch/relforge.yaml
+++ b/hieradata/role/common/elasticsearch/relforge.yaml
@@ -26,3 +26,6 @@
 # We have seen (T169498) servers completely exhaust their CPU though, so 
setting
 # this to match cpu counts to prevent overcommit of CPU resources.
 profile::elasticsearch::search_thread_pool_executors: 32
+
+# Use the future parser here
+profile::base::environment: "future"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2bc6cc17cd7bf4894a09a1d3f284f644c224571
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Gehel 
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] operations/puppet[production]: role::kafka::jumbo::broker - Don't include standard if alrea...

2017-09-12 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377500 )

Change subject: role::kafka::jumbo::broker - Don't include standard if already 
included
..


role::kafka::jumbo::broker - Don't include standard if already included

In labs, this is included elsewhere with a different parameter.

Change-Id: I3dae0f00b86c585f715ff78caca10bdae975880a
---
M modules/role/manifests/kafka/jumbo/broker.pp
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/manifests/kafka/jumbo/broker.pp 
b/modules/role/manifests/kafka/jumbo/broker.pp
index 59fcab5..b79d36b 100644
--- a/modules/role/manifests/kafka/jumbo/broker.pp
+++ b/modules/role/manifests/kafka/jumbo/broker.pp
@@ -6,9 +6,12 @@
 description => "Kafka Broker in a 'jumbo' Kafka cluster",
 }
 
-# Don't use ganglia
-class { '::standard':
-has_ganglia => false
+# Don't use ganglia.
+# Something in labs is including standard.  Only include if not already 
defined.
+if !defined(Class['::standard']) {
+class { '::standard':
+has_ganglia => false
+}
 }
 include base::firewall
 include profile::kafka::broker

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dae0f00b86c585f715ff78caca10bdae975880a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
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] operations/puppet[production]: role::kafka::jumbo::broker - Don't include standard if alrea...

2017-09-12 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377500 )

Change subject: role::kafka::jumbo::broker - Don't include standard if already 
included
..

role::kafka::jumbo::broker - Don't include standard if already included

In labs, this is included elsewhere with a different parameter.

Change-Id: I3dae0f00b86c585f715ff78caca10bdae975880a
---
M modules/role/manifests/kafka/jumbo/broker.pp
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/377500/1

diff --git a/modules/role/manifests/kafka/jumbo/broker.pp 
b/modules/role/manifests/kafka/jumbo/broker.pp
index 59fcab5..b79d36b 100644
--- a/modules/role/manifests/kafka/jumbo/broker.pp
+++ b/modules/role/manifests/kafka/jumbo/broker.pp
@@ -6,9 +6,12 @@
 description => "Kafka Broker in a 'jumbo' Kafka cluster",
 }
 
-# Don't use ganglia
-class { '::standard':
-has_ganglia => false
+# Don't use ganglia.
+# Something in labs is including standard.  Only include if not already 
defined.
+if !defined(Class['::standard']) {
+class { '::standard':
+has_ganglia => false
+}
 }
 include base::firewall
 include profile::kafka::broker

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: Fix up for the logo

2017-09-12 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377499 )

Change subject: gerrit: Fix up for the logo
..

gerrit: Fix up for the logo

Change-Id: I8a15467c657058dffd26df8a743e47ee8cfb9ad8
---
M modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
M modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/377499/1

diff --git a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png 
b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
index 8a75644..525e79f 100644
--- a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
+++ b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
Binary files differ
diff --git a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg 
b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
index bee6b4a..dca3616 100644
--- a/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
+++ b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
@@ -20,7 +20,7 @@
inkscape:version="0.91 r13725"
sodipodi:docname="CodeReview_logo (3).svg"
width="196"
-   height="46">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
\ No newline at end of file
+   ]]>

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Make special keys translatable

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376896 )

Change subject: Make special keys translatable
..


Make special keys translatable

Bug: T175449
Change-Id: I1c0e5e3af3c74d0d1950c635e0dd33ddd19c4b40
---
M i18n/en.json
M i18n/qqq.json
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
M src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
M src/ui/ve.ui.Trigger.js
5 files changed, 136 insertions(+), 32 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 06ef3ce..e8eea5a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -117,6 +117,25 @@
"visualeditor-indentationbutton-outdent-tooltip": "Decrease 
indentation",
"visualeditor-inspector-close-tooltip": "Close",
"visualeditor-inspector-remove-tooltip": "Remove",
+   "visualeditor-key-alt": "Alt",
+   "visualeditor-key-backspace": "Backspace",
+   "visualeditor-key-ctrl": "Ctrl",
+   "visualeditor-key-delete": "Delete",
+   "visualeditor-key-down": "Down",
+   "visualeditor-key-end": "End",
+   "visualeditor-key-enter": "Enter",
+   "visualeditor-key-escape": "Escape",
+   "visualeditor-key-home": "Home",
+   "visualeditor-key-insert": "Insert",
+   "visualeditor-key-left": "Left",
+   "visualeditor-key-meta": "Meta",
+   "visualeditor-key-page-down": "Page Down",
+   "visualeditor-key-page-up": "Page Up",
+   "visualeditor-key-right": "Right",
+   "visualeditor-key-shift": "Shift",
+   "visualeditor-key-space": "Space",
+   "visualeditor-key-tab": "Tab",
+   "visualeditor-key-up": "Up",
"visualeditor-language-search-input-placeholder": "Search by language 
name or code",
"visualeditor-languageannotation-description": "$1",
"visualeditor-languageannotation-description-with-dir": "$1 ($2)",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1b30374..5f7d97b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -126,6 +126,25 @@
"visualeditor-indentationbutton-outdent-tooltip": "Tooltip text for 
list outdent button",
"visualeditor-inspector-close-tooltip": "{{Identical|Close}}",
"visualeditor-inspector-remove-tooltip": "Tooltip text for the button 
to remove an annotation in an inspector.\n{{Identical|Remove}}",
+   "visualeditor-key-alt": "The common identifier of the alt key",
+   "visualeditor-key-backspace": "The common identifier of the backspace 
key",
+   "visualeditor-key-ctrl": "The common identifier of the control key",
+   "visualeditor-key-delete": "The common identifier of the delete key",
+   "visualeditor-key-down": "The common identifier of the down arrow key",
+   "visualeditor-key-end": "The common identifier of the end key",
+   "visualeditor-key-enter": "The common identifier of the enter key",
+   "visualeditor-key-escape": "The common identifier of the escape key",
+   "visualeditor-key-home": "The common identifier of the home key",
+   "visualeditor-key-insert": "The common identifier of the insert key",
+   "visualeditor-key-left": "The common identifier of the left arrow key",
+   "visualeditor-key-meta": "The common identifier of the meta key",
+   "visualeditor-key-page-down": "The common identifier of the page down 
key",
+   "visualeditor-key-page-up": "The common identifier of the page up key",
+   "visualeditor-key-right": "The common identifier of the right arrow 
key",
+   "visualeditor-key-shift": "The common identifier of the shift key",
+   "visualeditor-key-space": "The common identifier of the space bar",
+   "visualeditor-key-tab": "The common identifier of the tab key",
+   "visualeditor-key-up": "The common identifier of the up arrow key",
"visualeditor-language-search-input-placeholder": "Placeholder text for 
language search widget.",
"visualeditor-languageannotation-description": "Description of a 
language annotation\n\n* $1 - Language autonym",
"visualeditor-languageannotation-description-with-dir": "Description of 
a language annotation with overridden directionality\n\n* $1 - Language 
autonym\n* $2 - Overridden direction (either LTR or RTL)",
diff --git a/src/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
index 097d6c0..d20ffd6 100644
--- a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -182,13 +182,15 @@
  * @return {jQuery} A kbd wrapping the key text
  */
 ve.ui.CommandHelpDialog.static.buildKeyNode = function ( key ) {
+   var $key = $( '' );
if ( key === ' ' ) {
// Might need to expand this if other keys show up, but 
currently things like
// the tab-character only come from Triggers and are 
pre-localized there into
// "tab" anyway.
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Deploy scholarships with scap3

2017-09-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326461 )

Change subject: Deploy scholarships with scap3
..


Deploy scholarships with scap3

Bug: T129134
Depends-On: Ibf70cc31bb0dc6e0dce366cdc5b5eb46cbc242e7
Change-Id: I24094dd9335b930f9933d8f58d53f5be3ae25e23
---
M hieradata/common/role/deployment.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/deployment_server.yaml
M modules/wikimania_scholarships/manifests/init.pp
4 files changed, 11 insertions(+), 11 deletions(-)

Approvals:
  Thcipriani: Looks good to me, but someone else must approve
  20after4: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index 712ba72..5942294 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -11,8 +11,6 @@
   elasticsearch/plugins:
 gitfat_enabled: true
 upstream: 
https://gerrit.wikimedia.org/r/operations/software/elasticsearch/plugins
-  scholarships/scholarships:
-upstream: https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
   librenms/librenms:
 upstream: https://gerrit.wikimedia.org/r/operations/software/librenms
   iegreview/iegreview:
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 66c6420..e7b8fa6 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -338,6 +338,10 @@
   prometheus/jmx_exporter:
 repository: operations/software/prometheus_jmx_exporter
 
+  # Wikimania scholarships app
+  scholarships/scholarships:
+repository: wikimedia/wikimania-scholarships
+
 prometheus_nodes:
   - deployment-prometheus01.deployment-prep.eqiad.wmflabs
 profile::recommendation_api::wdqs_uri: http://wdqs-test.wmflabs.org
diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index db92a51..d4e1145 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -139,6 +139,9 @@
 repository: maps/tilerator/deploy
 #lvs_service: tilerator
   trending-edits/deploy: {}
+  # Wikimania scholarships app
+  scholarships/scholarships:
+repository: wikimedia/wikimania-scholarships
   wdqs/wdqs:
 repository: wikidata/query/deploy
 #lvs_service: wdqs
diff --git a/modules/wikimania_scholarships/manifests/init.pp 
b/modules/wikimania_scholarships/manifests/init.pp
index 7790306..d3addeb 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -48,21 +48,16 @@
 description => 'Wikimania Scholarships server'
 }
 
-package { 'scholarships':
-provider => 'trebuchet',
+scap::target { 'scholarships/scholarships':
+service_name => 'scholarships',
+deploy_user  => 'deploy-service'
 }
 
 apache::site { 'scholarships.wikimedia.org':
 content => template('wikimania_scholarships/apache.conf.erb'),
 }
 
-ensure_resource('file', '/srv/deployment', {'ensure' => 'directory' })
-
-file { [ '/srv/deployment/scholarships', $deploy_dir ]:
-ensure  => directory,
-}
-
-file { "${deploy_dir}/.env":
+file { '/etc/wikimania-scholarships.ini':
 ensure  => present,
 mode=> '0444',
 owner   => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24094dd9335b930f9933d8f58d53f5be3ae25e23
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Put default search namespaces in content index

2017-09-12 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377498 )

Change subject: Put default search namespaces in content index
..

Put default search namespaces in content index

Part of the benefit of splitting our data between content and
general indices, besides frequency counts, is offering better
performance by querying a much smaller dataset. A variety of wikis
though may configure their default search namespaces to include
more than just content namespaces. Adjust our handling so all
namespaces searched by default are included in the content
index.

After deployment this will require a run of the saneitizer on
all wikis that have additional namespaces in their
wgNamespacesToBeSearchedDefault.

Change-Id: Iba8b8e1f204958ccdf2cab562dc34e0008fe97ea
---
M includes/Api/ConfigDump.php
M includes/Connection.php
M includes/Search/RescoreBuilders.php
M includes/SearchConfig.php
M tests/unit/ConnectionTest.php
M tests/unit/RescoreBuilderTest.php
M tests/unit/SearcherTest.php
7 files changed, 49 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/98/377498/1

diff --git a/includes/Api/ConfigDump.php b/includes/Api/ConfigDump.php
index 14dd3ef..aba3420 100644
--- a/includes/Api/ConfigDump.php
+++ b/includes/Api/ConfigDump.php
@@ -122,6 +122,7 @@
'CirrusSearchMaxPhraseTokens',
'LanguageCode',
'ContentNamespaces',
+   'NamespacesToBeSearchedDefault',
];
 
public function execute() {
diff --git a/includes/Connection.php b/includes/Connection.php
index 128985d..c2a4da0 100644
--- a/includes/Connection.php
+++ b/includes/Connection.php
@@ -265,6 +265,10 @@
if ( isset( $mappings[$namespace] ) ) {
return $mappings[$namespace];
}
+   $defaultSearch = $this->config->get( 
'NamespacesToBeSearchedDefault' );
+   if ( isset( $defaultSearch[$namespace] ) && 
$defaultSearch[$namespace] ) {
+   return self::CONTENT_INDEX_TYPE;
+   }
 
return MWNamespace::isContent( $namespace ) ?
self::CONTENT_INDEX_TYPE : self::GENERAL_INDEX_TYPE;
@@ -282,14 +286,29 @@
}
 
$mappings = $this->config->get( 'CirrusSearchNamespaceMappings' 
);
-   $count = count( array_keys( $mappings, $indexType ) );
+   $inIndexType = [];
+   foreach ( $mappings as $ns => $type ) {
+   if ( $indexType === $type ) {
+   $inIndexType[$ns] = true;
+   }
+   }
if ( $indexType === self::CONTENT_INDEX_TYPE ) {
// The content namespace includes everything set in the 
mappings to content (count right now)
// Plus everything in wgContentNamespaces that isn't 
already in namespace mappings
$contentNamespaces = $this->config->get( 
'ContentNamespaces' );
-   $count += count( array_diff( $contentNamespaces, 
array_keys( $mappings ) ) );
+   foreach ( $contentNamespaces as $ns ) {
+   if ( !isset( $mappings[$ns] ) ) {
+   $inIndexType[$ns] = true;
+   }
+   }
+   $defaultSearch = $this->config->get( 
'NamespacesToBeSearchedDefault' );
+   foreach ( $defaultSearch as $ns => $shouldSearch ) {
+   if ( $shouldSearch && !isset( $mappings[$ns] ) 
) {
+   $inIndexType[$ns] = true;
+   }
+   }
}
-   return $count;
+   return count( $inIndexType );
}
 
/**
diff --git a/includes/Search/RescoreBuilders.php 
b/includes/Search/RescoreBuilders.php
index 2650c52..16f5fbc 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -222,6 +222,13 @@
return true;
case 'content':
$profileNs = $this->context->getConfig()->get( 
'ContentNamespaces' );
+   // Default search namespaces are also 
considered content
+   $defaultSearch = 
$this->context->getConfig()->get( 'NamespacesToBeSearchedDefault' );
+   foreach ( $defaultSearch as $ns => $isDefault ) 
{
+   if ( $isDefault ) {
+   $profileNs[] = $ns;
+   }
+   }
break;

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use new logo of WMF for gerrit

2017-09-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377049 )

Change subject: Use new logo of WMF for gerrit
..


Use new logo of WMF for gerrit

Based on T174576#3585053

Bug: T174576
Change-Id: Id9dce8cf88f68c2054189f0c97af7d7d51387d59
---
M modules/gerrit/files/etc/GerritSite.css
M modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
A modules/gerrit/files/static/wikimedia-codereview-logo.cache.svg
3 files changed, 10,540 insertions(+), 1 deletion(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9dce8cf88f68c2054189f0c97af7d7d51387d59
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Greg Grossmeier 
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] apps...wikipedia[master]: Remove unnecessary layered drawable from page toolbar.

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377256 )

Change subject: Remove unnecessary layered drawable from page toolbar.
..


Remove unnecessary layered drawable from page toolbar.

Change-Id: I9bc71b15eab485da3f59c1b892929e9a6b294bee
---
M app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
D app/src/main/res/drawable/toolbar_background.xml
M app/src/main/res/layout/activity_page.xml
3 files changed, 2 insertions(+), 23 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java 
b/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
index ab222b6..96d80e4 100644
--- a/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
+++ b/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
@@ -1,7 +1,6 @@
 package org.wikipedia.page;
 
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
 import android.support.annotation.NonNull;
 import android.view.Gravity;
 import android.view.View;
@@ -19,10 +18,7 @@
 
 public PageToolbarHideHandler(@NonNull View hideableView) {
 super(hideableView, Gravity.TOP);
-
-LayerDrawable toolbarBackgroundLayers = (LayerDrawable) 
hideableView.getBackground();
-toolbarBackground = 
toolbarBackgroundLayers.findDrawableByLayerId(R.id.toolbar_background_solid).mutate();
-
+toolbarBackground = hideableView.getBackground().mutate();
 statusBar = 
hideableView.findViewById(R.id.empty_status_bar).getBackground().mutate();
 }
 
diff --git a/app/src/main/res/drawable/toolbar_background.xml 
b/app/src/main/res/drawable/toolbar_background.xml
deleted file mode 100644
index 81610b9..000
--- a/app/src/main/res/drawable/toolbar_background.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-http://schemas.android.com/apk/res/android";>
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_page.xml 
b/app/src/main/res/layout/activity_page.xml
index 0f4fcec..e763bae 100644
--- a/app/src/main/res/layout/activity_page.xml
+++ b/app/src/main/res/layout/activity_page.xml
@@ -39,7 +39,7 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:orientation="vertical"
-android:background="@drawable/toolbar_background"
+android:background="@color/base18"
 android:elevation="4dp">
 
 https://gerrit.wikimedia.org/r/377256
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bc71b15eab485da3f59c1b892929e9a6b294bee
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: WIP: Light vs. Dark -- the reckoning.

2017-09-12 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377497 )

Change subject: WIP: Light vs. Dark -- the reckoning.
..

WIP: Light vs. Dark -- the reckoning.

Change-Id: Ide40d4ca1b902fd899847ae64cd1ddbf60f986a3
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/java/org/wikipedia/language/LangLinksActivity.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/settings/AboutActivity.java
M app/src/main/java/org/wikipedia/settings/DeveloperSettingsActivity.java
M app/src/main/java/org/wikipedia/settings/LicenseActivity.java
M app/src/main/java/org/wikipedia/settings/SettingsActivity.java
M app/src/main/java/org/wikipedia/theme/Theme.java
M app/src/main/java/org/wikipedia/useroption/ui/UserOptionRowActivity.java
M app/src/main/res/layout/activity_page.xml
M app/src/main/res/layout/activity_single_fragment_with_toolbar.xml
M app/src/main/res/layout/fragment_compilation_detail.xml
M app/src/main/res/layout/fragment_news.xml
M app/src/main/res/layout/fragment_reading_list.xml
M app/src/main/res/layout/fragment_remote_compilations.xml
M app/src/main/res/layout/fragment_search.xml
M app/src/main/res/layout/group_find_in_page.xml
M app/src/main/res/values/styles.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
23 files changed, 152 insertions(+), 211 deletions(-)


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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 623ac60..c46c8ae 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,10 +67,10 @@
 
 
-
+
 
 
 
@@ -87,8 +87,9 @@
 
 
 
-
 
 
-
-
-
+
+
-
+android:theme="@style/AppTheme.ActionBar"
+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize" />
+
 
 
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 
@@ -158,32 +169,32 @@
 
 
 
-
+
 
-
 
-
 
-
+
 
 
-
-
+android:name=".descriptions.DescriptionEditTutorialActivity" />
 
 
+android:name=".readinglist.ReadingListActivity" />
+
+
 
 
 
 
+android:name=".offline.RemoteCompilationsActivity" />
 
 
+android:name=".offline.CompilationDetailActivity" />
 
 
+android:name=".offline.OfflineTutorialActivity" />
 
 
 
 
+android:name="android.support.v4.content.FileProvider"
+android:authorities="${applicationId}.fileprovider"
+android:exported="false"
+android:grantUriPermissions="true">
 
diff --git 
a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java 
b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
index e1ab755..0d0e3a5 100644
--- a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
@@ -10,7 +10,6 @@
 
 import com.squareup.otto.Subscribe;
 
-import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.events.ThemeChangeEvent;
 import org.wikipedia.recurring.RecurringTasksExecutor;
@@ -60,12 +59,6 @@
 
 protected void setTheme() {
 setTheme(WikipediaApp.getInstance().getCurrentTheme().getResourceId());
-}
-
-protected void setActionBarTheme() {
-setTheme(WikipediaApp.getInstance().isCurrentThemeLight()
-? R.style.Theme_Light_ActionBar
-: R.style.Theme_Dark_ActionBar);
 }
 
 /**
diff --git 
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java 
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index 023adb4..e283c12 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -170,11 +170,6 @@
 }
 
 @Override
-protected void setTheme() {
-setActionBarTheme();
-}
-
-@Override
 protected void onSaveInstanceState(Bundle outState) {
 super.onSaveInstanceState(outState);
 outState.putParcelable("result", createAccountResult);
diff -

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db1059 from mediawiki to misc (m3)

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377474 )

Change subject: mariadb: Move db1059 from mediawiki to misc (m3)
..


mariadb: Move db1059 from mediawiki to misc (m3)

Bug: T175679
Change-Id: Ib0f3012f36feaa00fb428a550c8ee3f20dc8faf2
---
D hieradata/hosts/db1059.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
M modules/role/files/prometheus/mysql-misc_eqiad.yaml
6 files changed, 13 insertions(+), 6 deletions(-)

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



diff --git a/hieradata/hosts/db1059.yaml b/hieradata/hosts/db1059.yaml
deleted file mode 100644
index 7db8adb..000
--- a/hieradata/hosts/db1059.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mariadb::shard: 's4'
diff --git a/manifests/site.pp b/manifests/site.pp
index 0eaddad..b546f8d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -412,7 +412,7 @@
 role(mariadb::core)
 }
 
-node /^db10(53|56|59|64|81|84|91|97)\.eqiad\.wmnet/ {
+node /^db10(53|56|64|81|84|91|97)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
@@ -599,6 +599,12 @@
 }
 include ::base::firewall
 }
+node 'db1059.eqiad.wmnet' {
+class { '::role::mariadb::misc::phabricator':
+shard => 'm3',
+}
+include ::base::firewall
+}
 
 node 'db2012.codfw.wmnet' {
 class { '::role::mariadb::misc::phabricator':
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 1ccc40f..1588d63 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -64,7 +64,7 @@
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
-db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \
+db1059|db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \
 db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
 deploy[12]001) echo partman/raid1-lvm-ext4-srv-noswap.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 4c673bd..64c02e1 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1091,6 +1091,8 @@
 host db1059 {
 hardware ethernet 90:B1:1C:2A:D3:AE;
 fixed-address db1059.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db1060 {
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index e91b2d5..9b10182 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -56,7 +56,6 @@
   targets:
   - db1053:9104
   - db1056:9104
-  - db1059:9104
   - db1064:9104
   - db1081:9104
   - db1084:9104
diff --git a/modules/role/files/prometheus/mysql-misc_eqiad.yaml 
b/modules/role/files/prometheus/mysql-misc_eqiad.yaml
index 7da08c5..9ea7d6e 100644
--- a/modules/role/files/prometheus/mysql-misc_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-misc_eqiad.yaml
@@ -20,13 +20,14 @@
 shard: m3
 role: master
   targets:
-  - db1048:9104
+  - db1043:9104
 
 - labels:
 shard: m3
 role: slave
   targets:
-  - db1043:9104
+  - db1048:9104
+  - db1059:9104
 
 - labels:
 shard: m4

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (02a2ea954)

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377336 )

Change subject: Update VE core submodule to master (02a2ea954)
..


Update VE core submodule to master (02a2ea954)

New changes:
5b0c644ce Localisation updates from https://translatewiki.net.
20075fa86 Rebaser: Rename author to authorId consistently
e70a4632e lint: Remove unnecessary parentheses
358ef33da ve.ui.Surface: Documentation type hint fix
4b1eec402 Localisation updates from https://translatewiki.net.
2fabe9fe8 i18n-bot fix
02a2ea954 Fix editing figcaptions in Firefox

Bug: T174774
Change-Id: I6beaa9ba8b266b5b53bd6ddc3301ff52ce69bbd5
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/ve b/lib/ve
index 834fd70..02a2ea9 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 834fd702fec544913f38339f7bd7ee1966f151e0
+Subproject commit 02a2ea95418ce72d98a04fe010beb8646a3ca149

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6beaa9ba8b266b5b53bd6ddc3301ff52ce69bbd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
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] mediawiki...mobileapps[master]: Hygiene: Refactor sectioning tests

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377347 )

Change subject: Hygiene: Refactor sectioning tests
..


Hygiene: Refactor sectioning tests

Change-Id: I2c818450432681318f546dc37cbc09db0c47817e
---
M test/lib/parsoid/parsoid-sections-test.js
1 file changed, 6 insertions(+), 8 deletions(-)

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



diff --git a/test/lib/parsoid/parsoid-sections-test.js 
b/test/lib/parsoid/parsoid-sections-test.js
index 9ec100d..bf1a655 100644
--- a/test/lib/parsoid/parsoid-sections-test.js
+++ b/test/lib/parsoid/parsoid-sections-test.js
@@ -4,11 +4,6 @@
 const domino = require('domino');
 const parsoid = require('../../../lib/parsoidSections');
 
-const html = 'text0' +
-'footext1' +
-'Funny section !@#$%^&*()text2' +
-'';
-
 describe('lib:parsoid-sections', function() {
 
 this.timeout(2); // eslint-disable-line no-invalid-this
@@ -18,12 +13,12 @@
 assert.deepEqual(sections[0].text, 'text0', 
JSON.stringify(sections[0], null, 2));
 }
 
-function assertSection1(sections) {
+function assertSection1(sections, extraText = '') {
 assert.deepEqual(sections[1].id, 1);
 assert.deepEqual(sections[1].toclevel, 1);
 assert.deepEqual(sections[1].line, 'foo');
 assert.deepEqual(sections[1].anchor, 'foo');
-assert.deepEqual(sections[1].text, 'text1');
+assert.deepEqual(sections[1].text, `text1${extraText}`);
 }
 
 function assertSection2(sections) {
@@ -62,7 +57,10 @@
 });
 
 it('getSectionsText() with one h2 and h3 should produce three sections', 
() => {
-const doc = domino.createDocument(html);
+const doc = domino.createDocument('text0' +
+'footext1' +
+'Funny section 
!@#$%^&*()text2' +
+'');
 parsoid.addSectionDivs(doc);
 const sections = parsoid.getSectionsText(doc);
 assert.deepEqual(sections.length, 3);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c818450432681318f546dc37cbc09db0c47817e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve namespace handling in tests

2017-09-12 Thread Anomie (Code Review)

Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377496 )

Change subject: Improve namespace handling in tests
..

Improve namespace handling in tests

MWNamespace has three internal caches, only one of which can be cleared
(and that somewhat oddly by passing a boolean to
MWNamespace::getCanonicalNamespaces()).

This change introduces a MWNamespace::clearCaches() method to clear all
three caches. It also adds some resetting in tests that seemed to be
missing it.

Change-Id: I1dcfcd8713888b3ff8fc75e95329ba72bd95d0c9
---
M includes/MWNamespace.php
M tests/parser/ParserTestRunner.php
M tests/phpunit/includes/EditPageTest.php
M tests/phpunit/includes/PagePropsTest.php
M tests/phpunit/includes/PrefixSearchTest.php
M tests/phpunit/includes/RevisionStorageTest.php
M tests/phpunit/includes/RevisionTest.php
M tests/phpunit/includes/TitleMethodsTest.php
M tests/phpunit/includes/XmlTest.php
M tests/phpunit/includes/api/ApiEditPageTest.php
M tests/phpunit/includes/content/ContentHandlerTest.php
11 files changed, 80 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/377496/1

diff --git a/includes/MWNamespace.php b/includes/MWNamespace.php
index 97dba26..849a744 100644
--- a/includes/MWNamespace.php
+++ b/includes/MWNamespace.php
@@ -38,6 +38,15 @@
 */
private static $alwaysCapitalizedNamespaces = [ NS_SPECIAL, NS_USER, 
NS_MEDIAWIKI ];
 
+   /** @var string[]|null Canonical namespaces cache */
+   private static $canonicalNamespaces = null;
+
+   /** @var array|false Canonical namespaces index cache */
+   private static $namespaceIndexes = false;
+
+   /** @var int[]|null Valid namespaces cache */
+   private static $validNamespaces = null;
+
/**
 * Throw an exception when trying to get the subject or talk page
 * for a given namespace where it does not make sense.
@@ -55,6 +64,17 @@
throw new MWException( "$method does not make any sense 
for given namespace $index" );
}
return true;
+   }
+
+   /**
+* Clear internal caches
+*
+* For use in unit testing when namespace configuration is changed.
+*/
+   public static function clearCaches() {
+   self::$canonicalNamespaces = null;
+   self::$namespaceIndexes = false;
+   self::$validNamespaces = null;
}
 
/**
@@ -200,23 +220,28 @@
 * (English) names.
 *
 * @param bool $rebuild Rebuild namespace list (default = false). Used 
for testing.
+*  Deprecated since 1.30, use self::clearCaches() instead.
 *
 * @return array
 * @since 1.17
 */
public static function getCanonicalNamespaces( $rebuild = false ) {
-   static $namespaces = null;
-   if ( $namespaces === null || $rebuild ) {
-   global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
-   $namespaces = [ NS_MAIN => '' ] + 
$wgCanonicalNamespaceNames;
-   // Add extension namespaces
-   $namespaces += 
ExtensionRegistry::getInstance()->getAttribute( 'ExtensionNamespaces' );
-   if ( is_array( $wgExtraNamespaces ) ) {
-   $namespaces += $wgExtraNamespaces;
-   }
-   Hooks::run( 'CanonicalNamespaces', [ &$namespaces ] );
+   if ( $rebuild ) {
+   self::clearCaches();
}
-   return $namespaces;
+
+   if ( self::$canonicalNamespaces === null ) {
+   global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
+   self::$canonicalNamespaces = [ NS_MAIN => '' ] + 
$wgCanonicalNamespaceNames;
+   // Add extension namespaces
+   self::$canonicalNamespaces +=
+   ExtensionRegistry::getInstance()->getAttribute( 
'ExtensionNamespaces' );
+   if ( is_array( $wgExtraNamespaces ) ) {
+   self::$canonicalNamespaces += 
$wgExtraNamespaces;
+   }
+   Hooks::run( 'CanonicalNamespaces', [ 
&self::$canonicalNamespaces ] );
+   }
+   return self::$canonicalNamespaces;
}
 
/**
@@ -242,15 +267,14 @@
 * @return int
 */
public static function getCanonicalIndex( $name ) {
-   static $xNamespaces = false;
-   if ( $xNamespaces === false ) {
-   $xNamespaces = [];
+   if ( self::$namespaceIndexes === false ) {
+   self::$namespaceIndexes = [];
foreach ( self::getCanonicalNamespaces() as $i => $text 
) {
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve flaky SiteStatsTest

2017-09-12 Thread Anomie (Code Review)

Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377495 )

Change subject: Improve flaky SiteStatsTest
..

Improve flaky SiteStatsTest

SiteStatsTest::testJobsCountGetCached() is somewhat flaky in that if it
runs after a test that adds a page (thereby producing htmlCacheUpdate
and recentChangesUpdate jobs) but doesn't have the CI framework reset
the `page` tables (which has the side effect of clearing all such jobs),
it will fail.

This change manually clears those jobs so it doesn't depend on test
ordering.

Change-Id: I1277e633c81b29bda7564fa12d23f13ded7298c7
---
M tests/phpunit/includes/SiteStatsTest.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/377495/1

diff --git a/tests/phpunit/includes/SiteStatsTest.php 
b/tests/phpunit/includes/SiteStatsTest.php
index ea476a7..cdbf9fd 100644
--- a/tests/phpunit/includes/SiteStatsTest.php
+++ b/tests/phpunit/includes/SiteStatsTest.php
@@ -11,6 +11,11 @@
$cache = 
\MediaWiki\MediaWikiServices::getInstance()->getMainWANObjectCache();
$jobq = JobQueueGroup::singleton();
 
+   // Delete EditPage jobs that might have been left behind by 
other tests
+   $jobq->get( 'htmlCacheUpdate' )->delete();
+   $jobq->get( 'recentChangesUpdate' )->delete();
+   $cache->delete( $cache->makeKey( 'SiteStats', 'jobscount' ) );
+
$jobq->push( new NullJob( Title::newMainPage(), [] ) );
$this->assertEquals( 1, SiteStats::jobs(),
 'A single job enqueued bumps jobscount stat to 1' );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: JobQueueMemory: Actually return values in MappedIterator cal...

2017-09-12 Thread Anomie (Code Review)

Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377494 )

Change subject: JobQueueMemory: Actually return values in MappedIterator 
callback
..

JobQueueMemory: Actually return values in MappedIterator callback

Change-Id: Ie489d43ba3e9f4a10580716f38ec0f123d9ab5bb
---
M includes/jobqueue/JobQueueMemory.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/377494/1

diff --git a/includes/jobqueue/JobQueueMemory.php 
b/includes/jobqueue/JobQueueMemory.php
index 649e2af..f9e2c3d 100644
--- a/includes/jobqueue/JobQueueMemory.php
+++ b/includes/jobqueue/JobQueueMemory.php
@@ -177,7 +177,7 @@
return new MappedIterator(
$unclaimed,
function ( $value ) {
-   $this->jobFromSpecInternal( $value );
+   return $this->jobFromSpecInternal( $value );
}
);
}
@@ -196,7 +196,7 @@
return new MappedIterator(
$claimed,
function ( $value ) {
-   $this->jobFromSpecInternal( $value );
+   return $this->jobFromSpecInternal( $value );
}
);
}

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update PHP-Queue to 1.0

2017-09-12 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377490 )

Change subject: Update PHP-Queue to 1.0
..


Update PHP-Queue to 1.0

Change-Id: I7a8ac462c40ed8ca54d6b18264e1d9f97f237bc1
---
M coderkungfu/php-queue/.travis.yml
M coderkungfu/php-queue/README.md
M coderkungfu/php-queue/composer.json
M coderkungfu/php-queue/demo/runners/README.md
M composer/installed.json
5 files changed, 113 insertions(+), 108 deletions(-)

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



diff --git a/coderkungfu/php-queue/.travis.yml 
b/coderkungfu/php-queue/.travis.yml
index 7941bc4..8f270d2 100644
--- a/coderkungfu/php-queue/.travis.yml
+++ b/coderkungfu/php-queue/.travis.yml
@@ -4,16 +4,21 @@
 #
 
 language: php
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+
+dist: trusty
  
 matrix:
+  include:
+- php: 5.3
+  dist: precise
+- php: 5.4
+- php: 5.5
+- php: 5.6
+- php: 7.0
+- php: hhvm
   allow_failures:
+- php: 5.3
+  dist: precise
 - php: 7.0
 - php: hhvm
 
@@ -22,6 +27,8 @@
   username: root
   encoding: utf8
 
+before_install: echo "extension=memcache.so" >> ~/.phpenv/versions/$(phpenv 
version-name)/etc/php.ini
+
 before_script:
   - mysql -e 'create database phpqueuetest;'
   - composer self-update
@@ -29,5 +36,3 @@
 
 script: phpunit --coverage-text -c phpunit.travis.xml
 
-after_script:
-  - "wget --quiet http://mauris.sg/bin/pdc.phar && php pdc.phar src"
diff --git a/coderkungfu/php-queue/README.md b/coderkungfu/php-queue/README.md
index 74ff0e7..3f3d2f6 100644
--- a/coderkungfu/php-queue/README.md
+++ b/coderkungfu/php-queue/README.md
@@ -1,5 +1,5 @@
 # PHP-Queue #
-[![Gitter](https://badges.gitter.im/Join 
Chat.svg)](https://gitter.im/CoderKungfu/php-queue?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CoderKungfu/php-queue?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A unified front-end for different queuing backends. Includes a REST server, 
CLI interface and daemon runners.
 
@@ -57,12 +57,12 @@
 
 2. Download and install Composer.
 
-   ```
+```
 curl -s "http://getcomposer.org/installer"; | php
 ```
 3. Install your dependencies.
 
-   ```
+```
 php composer.phar install
 ```
 
@@ -70,7 +70,7 @@
 
 5. Require Composer's autoloader.
 
-   ```php
+```php
 
@@ -130,19 +130,19 @@
 
 1. Add new job.
 
-   ```
+```
 # Form post
 curl -XPOST http://localhost// -d "var1=foo&var2=bar"
 ```
 
-   ```
+```
 # JSON post
 curl -XPOST http://localhost// -H "Content-Type: application/json" 
-d '{"var1":"foo","var2":"bar"}'
 ```
 
 2. Trigger next job.
 
-   ```
+```
 curl -XPUT http://localhost//
 ```
 
@@ -154,13 +154,13 @@
 
 1. Add new job.
 
-   ```
+```
 $ php cli.php  add --data '{"boo":"bar","foo":"car"}'
 ```
 
 2. Trigger next job.
 
-   ```
+```
 $ php cli.php  work
 ```
 
diff --git a/coderkungfu/php-queue/composer.json 
b/coderkungfu/php-queue/composer.json
index 085c069..6e30fad 100644
--- a/coderkungfu/php-queue/composer.json
+++ b/coderkungfu/php-queue/composer.json
@@ -5,6 +5,7 @@
 "homepage": "http://github.com/CoderKungfu/php-queue";,
 "type": "library",
 "license": "MIT",
+"version": "1.0.0",
 "authors": [
 {
 "name": "Michael Cheng",
@@ -24,12 +25,12 @@
 },
 "require-dev": {
 "mrpoundsign/pheanstalk-5.3": "dev-master",
-"aws/aws-sdk-php": "dev-master",
+"aws/aws-sdk-php": ">=2.8",
 "amazonwebservices/aws-sdk-for-php": "dev-master",
 "predis/predis": "1.*",
 "iron-io/iron_mq": "dev-master",
 "ext-memcache": "*",
-"microsoft/windowsazure": "dev-master"
+"microsoft/windowsazure": ">=0.4.0"
 },
 "suggest": {
 "predis/predis": "For Redis backend support",
diff --git a/coderkungfu/php-queue/demo/runners/README.md 
b/coderkungfu/php-queue/demo/runners/README.md
index 5ddab8d..3f89d0f 100644
--- a/coderkungfu/php-queue/demo/runners/README.md
+++ b/coderkungfu/php-queue/demo/runners/README.md
@@ -26,13 +26,13 @@
 1. Create a new PHP file named "SimpleRunner.php" (no naming convention here).
 2. Include the config file:
 
-   ```php
+```php
 require_once '/path/to/your/config.php';
 ```
 
 3. Create a new Runner class (extending `PHPQueue\Runner`). The queue name can 
be defined in the `$queue_name` attribute.
 
-   ```php
+```php
 class SampleRunner extends PHPQueue\Runner
 {
 public $queue_name = 'Sample';
@@ -41,14 +41,14 @@
 
 4. Instantiate the class and call the `run()` method.
 
-   ```php
+```php
 $runner = new SampleRunner();
 $runner->run();
 ```
 
 5. Run the Runner.
 
-   ```
+```
 $ php SimpleRunner.php
 ```
 
@@ -92,8 +92,7 @@
 $ php BeanstalkSampleStop.php
 ```
 
-***Note:***
-On CentOS, you will need to install `p

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::snapshot::common: properly scope included classes

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377493 )

Change subject: role::snapshot::common: properly scope included classes
..

role::snapshot::common: properly scope included classes

While the old parser would search classes within the current namespace
if their name is not absolute, the future parser does not.

So, fix the unfortunate clash of namespaces we had here.

Bug: T171704
Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6
---
M modules/role/manifests/snapshot/common.pp
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/377493/1

diff --git a/modules/role/manifests/snapshot/common.pp 
b/modules/role/manifests/snapshot/common.pp
index a038d1a..7ee5723 100644
--- a/modules/role/manifests/snapshot/common.pp
+++ b/modules/role/manifests/snapshot/common.pp
@@ -6,9 +6,8 @@
 # mw packages and dependencies, dataset server nfs mount,
 # config files, stages files, dblists, html templates
 include ::role::mediawiki::common
-include snapshot::dumps
+include ::snapshot::dumps
 
 # scap3 deployment of dump scripts
-include snapshot::deployment
+include ::role::snapshot::deployment
 }
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6
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] operations/puppet[production]: CI: install docker-ce from download.docker.com

2017-09-12 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377492 )

Change subject: CI: install docker-ce from download.docker.com
..

CI: install docker-ce from download.docker.com

Bug: T175293
Change-Id: I491eb051b77d4d38ace6a79a881d000757628f37
---
A modules/contint/files/download.docker.com.asc
A modules/contint/manifests/docker.pp
M modules/profile/manifests/ci/docker.pp
M modules/role/manifests/ci/master.pp
4 files changed, 90 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/377492/1

diff --git a/modules/contint/files/download.docker.com.asc 
b/modules/contint/files/download.docker.com.asc
new file mode 100644
index 000..ee7872e
--- /dev/null
+++ b/modules/contint/files/download.docker.com.asc
@@ -0,0 +1,62 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBFit2ioBEADhWpZ8/wvZ6hUTiXOwQHXMAlaFHcPH9hAtr4F1y2+OYdbtMuth
+lqqwp028AqyY+PRfVMtSYMbjuQuu5byyKR01BbqYhuS3jtqQmljZ/bJvXqnmiVXh
+38UuLa+z077PxyxQhu5BbqntTPQMfiyqEiU+BKbq2WmANUKQf+1AmZY/IruOXbnq
+L4C1+gJ8vfmXQt99npCaxEjaNRVYfOS8QcixNzHUYnb6emjlANyEVlZzeqo7XKl7
+UrwV5inawTSzWNvtjEjj4nJL8NsLwscpLPQUhTQ+7BbQXAwAmeHCUTQIvvWXqw0N
+cmhh4HgeQscQHYgOJjjDVfoY5MucvglbIgCqfzAHW9jxmRL4qbMZj+b1XoePEtht
+ku4bIQN1X5P07fNWzlgaRL5Z4POXDDZTlIQ/El58j9kp4bnWRCJW0lya+f8ocodo
+vZZ+Doi+fy4D5ZGrL4XEcIQP/Lv5uFyf+kQtl/94VFYVJOleAv8W92KdgDkhTcTD
+G7c0tIkVEKNUq48b3aQ64NOZQW7fVjfoKwEZdOqPE72Pa45jrZzvUFxSpdiNk2tZ
+XYukHjlxxEgBdC/J3cMMNRE1F4NCA3ApfV1Y7/hTeOnmDuDYwr9/obA8t016Yljj
+q5rdkywPf4JF8mXUW5eCN1vAFHxeg9ZWemhBtQmGxXnw9M+z6hWwc6ahmwARAQAB
+tCtEb2NrZXIgUmVsZWFzZSAoQ0UgZGViKSA8ZG9ja2VyQGRvY2tlci5jb20+iQI3
+BBMBCgAhBQJYrefAAhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEI2BgDwO
+v82IsskP/iQZo68flDQmNvn8X5XTd6RRaUH33kXYXquT6NkHJciS7E2gTJmqvMqd
+tI4mNYHCSEYxI5qrcYV5YqX9P6+Ko+vozo4nseUQLPH/ATQ4qL0Zok+1jkag3Lgk
+jonyUf9bwtWxFp05HC3GMHPhhcUSexCxQLQvnFWXD2sWLKivHp2fT8QbRGeZ+d3m
+6fqcd5Fu7pxsqm0EUDK5NL+nPIgYhN+auTrhgzhK1CShfGccM/wfRlei9Utz6p9P
+XRKIlWnXtT4qNGZNTN0tR+NLG/6Bqd8OYBaFAUcue/w1VW6JQ2VGYZHnZu9S8LMc
+FYBa5Ig9PxwGQOgq6RDKDbV+PqTQT5EFMeR1mrjckk4DQJjbxeMZbiNMG5kGECA8
+g383P3elhn03WGbEEa4MNc3Z4+7c236QI3xWJfNPdUbXRaAwhy/6rTSFbzwKB0Jm
+ebwzQfwjQY6f55MiI/RqDCyuPj3r3jyVRkK86pQKBAJwFHyqj9KaKXMZjfVnowLh
+9svIGfNbGHpucATqREvUHuQbNnqkCx8VVhtYkhDb9fEP2xBu5VvHbR+3nfVhMut5
+G34Ct5RS7Jt6LIfFdtcn8CaSas/l1HbiGeRgc70X/9aYx/V/CEJv0lIe8gP6uDoW
+FPIZ7d6vH+Vro6xuWEGiuMaiznap2KhZmpkgfupyFmplh0s6knymuQINBFit2ioB
+EADneL9S9m4vhU3blaRjVUUyJ7b/qTjcSylvCH5XUE6R2k+ckEZjfAMZPLpO+/tF
+M2JIJMD4SifKuS3xck9KtZGCufGmcwiLQRzeHF7vJUKrLD5RTkNi23ydvWZgPjtx
+Q+DTT1Zcn7BrQFY6FgnRoUVIxwtdw1bMY/89rsFgS5wwuMESd3Q2RYgb7EOFOpnu
+w6da7WakWf4IhnF5nsNYGDVaIHzpiqCl+uTbf1epCjrOlIzkZ3Z3Yk5CM/TiFzPk
+z2lLz89cpD8U+NtCsfagWWfjd2U3jDapgH+7nQnCEWpROtzaKHG6lA3pXdix5zG8
+eRc6/0IbUSWvfjKxLLPfNeCS2pCL3IeEI5nothEEYdQH6szpLog79xB9dVnJyKJb
+VfxXnseoYqVrRz2VVbUI5Blwm6B40E3eGVfUQWiux54DspyVMMk41Mx7QJ3iynIa
+1N4ZAqVMAEruyXTRTxc9XW0tYhDMA/1GYvz0EmFpm8LzTHA6sFVtPm/ZlNCX6P1X
+zJwrv7DSQKD6GGlBQUX+OeEJ8tTkkf8QTJSPUdh8P8YxDFS5EOGAvhhpMBYD42kQ
+pqXjEC+XcycTvGI7impgv9PDY1RCC1zkBjKPa120rNhv/hkVk/YhuGoajoHyy4h7
+ZQopdcMtpN2dgmhEegny9JCSwxfQmQ0zK0g7m6SHiKMwjwARAQABiQQ+BBgBCAAJ
+BQJYrdoqAhsCAikJEI2BgDwOv82IwV0gBBkBCAAGBQJYrdoqAAoJEH6gqcPyc/zY
+1WAP/2wJ+R0gE6qsce3rjaIz58PJmc8goKrir5hnElWhPgbq7cYIsW5qiFyLhkdp
+YcMmhD9mRiPpQn6Ya2w3e3B8zfIVKipbMBnke/ytZ9M7qHmDCcjoiSmwEXN3wKYI
+mD9VHONsl/CG1rU9Isw1jtB5g1YxuBA7M/m36XN6x2u+NtNMDB9P56yc4gfsZVES
+KA9v+yY2/l45L8d/WUkUi0YXomn6hyBGI7JrBLq0CX37GEYP6O9rrKipfz73XfO7
+JIGzOKZlljb/D9RX/g7nRbCn+3EtH7xnk+TK/50euEKw8SMUg147sJTcpQmv6UzZ
+cM4JgL0HbHVCojV4C/plELwMddALOFeYQzTif6sMRPf+3DSj8frbInjChC3yOLy0
+6br92KFom17EIj2CAcoeq7UPhi2oouYBwPxh5ytdehJkoo+sN7RIWua6P2WSmon5
+U888cSylXC0+ADFdgLX9K2zrDVYUG1vo8CX0vzxFBaHwN6Px26fhIT1/hYUHQR1z
+VfNDcyQmXqkOnZvvoMfz/Q0s9BhFJ/zU6AgQbIZE/hm1spsfgvtsD1frZfygXJ9f
+irP+MSAI80xHSf91qSRZOj4Pl3ZJNbq4yYxv0b1pkMqeGdjdCYhLU+LZ4wbQmpCk
+SVe2prlLureigXtmZfkqevRz7FrIZiu9ky8wnCAPwC7/zmS18rgP/17bOtL4/iIz
+QhxAAoAMWVrGyJivSkjhSGx1uCojsWfsTAm11P7jsruIL61ZzMUVE2aM3Pmj5G+W
+9AcZ58Em+1WsVnAXdUR//bMmhyr8wL/G1YO1V3JEJTRdxsSxdYa4deGBBY/Adpsw
+24jxhOJR+lsJpqIUeb999+R8euDhRHG9eFO7DRu6weatUJ6suupoDTRWtr/4yGqe
+dKxV3qQhNLSnaAzqW/1nA3iUB4k7kCaKZxhdhDbClf9P37qaRW467BLCVO/coL3y
+Vm50dwdrNtKpMBh3ZpbB1uJvgi9mXtyBOMJ3v8RZeDzFiG8HdCtg9RvIt/AIFoHR
+H3S+U79NT6i0KPzLImDfs8T7RlpyuMc4Ufs8ggyg9v3Ae6cN3eQyxcK3w0cbBwsh
+/nQNfsA6uu+9H7NhbehBMhYnpNZyrHzCmzyXkauwRAqoCbGCNykTRwsur9gS41TQ
+M8ssD1jFheOJf3hODnkKU+HKjvMROl1DK7zdmLdNzA1cvtZH/nCC9KPj1z8QC47S
+xx+dTZSx4ONAhwbS/LN3PoKtn8LPjY9NP9uDWI+TWYquS2U+KHDrBDlsgozDbs/O
+jCxcpDzNmXpWQHEtHU7649OXHP7UeNST1mCUCH5qdank0V1iejF6/CfTFU4MfcrG
+YT90qFF93M3v01BbxP+EIY2/9tiIPbrd
+=0YYh
+-END PGP PUBLIC KEY BLOCK-
diff --git a/modules/contint/manifests/docker.pp 
b/modules/contint/manifests/docker.pp
new file mode 100644
index 000..03a7554
--- /dev/null
+++ b/modules/contint/manifests/docker.pp
@@ -0,0 +1,25 @@
+# == Class contint::docker
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: UX: Consolidate Light and Dark modes

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376788 )

Change subject: UX: Consolidate Light and Dark modes
..


UX: Consolidate Light and Dark modes

-Consolidating expected Light and Dark mode colors will be done in multiple 
commits.
-This is the first of many commits, and removes usage of duplicate color 
variables in colors.xml

Bug: T172984
Change-Id: I59049aa64a56a6e41e30b76fa3051dd43d4f1a84
---
M app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
M app/src/main/java/org/wikipedia/edit/richtext/SyntaxRuleStyle.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/notifications/NotificationPresenter.java
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/views/ConfigurableTabLayout.java
M app/src/main/java/org/wikipedia/views/FacePostprocessor.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
M app/src/main/res/drawable/edit_improve_tag_selected_dark.xml
M app/src/main/res/drawable/edit_improve_tag_selected_light.xml
M app/src/main/res/drawable/edit_improve_tag_unselected_dark.xml
M app/src/main/res/drawable/edit_improve_tag_unselected_light.xml
M app/src/main/res/drawable/ic_abusefilter_disallow.xml
M app/src/main/res/drawable/ic_abusefilter_warn.xml
M app/src/main/res/drawable/shape_border_1dp_gray.xml
M app/src/main/res/drawable/splash_bg.xml
M app/src/main/res/drawable/tab_item_shape_dark.xml
M app/src/main/res/drawable/tab_item_shape_light.xml
M app/src/main/res/drawable/toolbar_background.xml
M app/src/main/res/drawable/view_list_card_item_image_background.xml
M app/src/main/res/layout/activity_about.xml
M app/src/main/res/layout/activity_gallery.xml
M app/src/main/res/layout/activity_page.xml
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/layout/fragment_preview_edit.xml
M app/src/main/res/layout/fragment_search.xml
M app/src/main/res/layout/view_card_header.xml
M app/src/main/res/layout/view_card_offline.xml
M app/src/main/res/layout/view_description_edit.xml
M app/src/main/res/layout/view_description_edit_help.xml
M app/src/main/res/layout/view_description_edit_success.xml
M app/src/main/res/layout/view_disk_usage.xml
M app/src/main/res/layout/view_explore_overflow.xml
M app/src/main/res/layout/view_wiki_error.xml
M app/src/main/res/layout/widget_featured_page.xml
M app/src/main/res/layout/widget_search.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/styles.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
43 files changed, 81 insertions(+), 133 deletions(-)

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



diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
index 9c7e223..210663a 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -29,7 +29,7 @@
 import static org.mockito.Mockito.mock;
 
 public class CardHeaderViewTest extends ViewTest {
-@ColorRes private static final int BLUE = R.color.foundation_blue;
+@ColorRes private static final int BLUE = R.color.accent50;
 private CardHeaderView subject;
 
 @Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M}) 
int widthDp,
@@ -47,7 +47,7 @@
 }
 
 @Theory public void testTheme(@NonNull Theme theme,
-  @TestedOn(ints = {BLUE, 
R.color.foundation_green}) int circleColor) {
+  @TestedOn(ints = {BLUE, R.color.green50}) 
int circleColor) {
 setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, theme, 
PrimaryTestImg.NONNULL,
 PrimaryTestStr.SHORT, SecondaryTestStr.SHORT, circleColor);
 snap(subject, circleColor == BLUE ? "blue" : "green");
@@ -96,7 +96,7 @@
 @Test public void testSetImage() {
 setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, 
Theme.LIGHT, PrimaryTestImg.NONNULL,
 PrimaryTestStr.SHORT, SecondaryTestStr.SHORT,
-R.color.foundation_blue);
+R.color.accent50);
 ImageView imageView = findById(subject, R.id.view_card_header_image);
 imageView.setImageDrawable(null);
 subject.setImage(SecondaryTestImg.CHECKERBOARD.id());
diff --git a/app/src/main/java/org/wikipedia/edit/richtext/SyntaxRuleStyle.java 
b/app/src/main/java/org/wikipedia/edit/richtext/SyntaxRuleStyle.java
index

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Merge branch 'master' into deployment

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377491 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor

160d94f Use version 1.0.0 of PHP-Queue
35e6281 Clean up duplicate curlWrapper stuff
fd9d434 Always clear all database statics in tearDown
5ab1be5 Finally set a version number - 0.5
0529ea7 Fix a couple auto-inserted braces, break lines
f4e44cd Move FinalStatus enum to SmashPig, add ValidationAction
650c204 Move PaymentError and ValidationError to SmashPig
8006a59 Push PaymentResult down into SmashPig

Change-Id: I5468f7a131d4905501b0e298bea19b180c0afb48
---
D PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
D PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
D Tests/BaseSmashPigUnitTestCase.php
D Tests/DamagedDatabaseTest.php
D Tests/PaymentsInitialDatabaseTest.php
D Tests/PendingDatabaseTest.php
D Tests/PendingQueueConsumerTest.php
D Tests/SmashPigDatabaseTest.php
D Tests/TestingDatabase.php
M vendor
11 files changed, 1 insertion(+), 870 deletions(-)

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



diff --git a/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
deleted file mode 100644
index cc3bf27..000
--- a/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<<< HEAD   (dce4f0 Merge branch 'master' into HEAD)
-===
-setProviderConfiguration( 
'ingenico' );
-   $this->curlWrapper = $this->getMock( 
'\SmashPig\Core\Http\CurlWrapper' );
-   $providerConfiguration->overrideObjectInstance( 'curl/wrapper', 
$this->curlWrapper );
-
-   $this->authenticator = new Authenticator(
-   '5e45c937b9db33ae',
-   'I42Zf4pVnRdroHfuHnRiJjJ2B6+22h0yQt/R3nZR8Xg='
-   );
-   $this->api = new Api(
-   'https://example.com',
-   '9876'
-   );
-   }
-
-   public function testCreateRequest() {
-   $headerVerification = function ( $headers ) {
-   $date = new DateTime( $headers['Date'] );
-   return $date !== null &&
-   $headers['Content-Type'] === 'application/json';
-   };
-
-   $this->curlWrapper->expects( $this->once() )
-   ->method( 'execute' )
-   ->with(
-   $this->equalTo( 
'https://example.com/v1/9876/testPath' ),
-   $this->equalTo( 'POST' ),
-   $this->callback( $headerVerification ),
-   $this->equalTo( '{"foo":"bar"}' )
-   )->willReturn( array(
-   'body' => '{"baz":"quux"}'
-   ) );
-
-   $this->api->makeApiCall( 'testPath', 'POST', array( 'foo' => 
'bar' ) );
-   }
-
-   /**
-* @expectedException SmashPig\PaymentProviders\Ingenico\ApiException
-* @expectedExceptionMessage Ingenico error id 
460d9c9c-098c-4d84-b1e5-ee27ec601757. Error code 9002: 
MISSING_OR_INVALID_AUTHORIZATION
-*/
-   public function testError() {
-   $this->curlWrapper->method( 'execute' )
-   ->willReturn( array(
-   'body' => '{"errorId" : 
"460d9c9c-098c-4d84-b1e5-ee27ec601757","errors" : [ {   "code" : "9002",   
"message" : "MISSING_OR_INVALID_AUTHORIZATION",   "httpStatusCode" : 403} ] }',
-   'headers' => array(),
-   'status' => 403
-   ) );
-   $this->api->makeApiCall( 'testPath', 'POST', array( 'foo' => 
'bar' ) );
-   }
-}
->>> BRANCH (8006a5 Push PaymentResult down into SmashPig)
diff --git 
a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
deleted file mode 100644
index b0174d3..000
--- a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<<< HEAD   (dce4f0 Merge branch 'master' into HEAD)
-===
-setProviderConfiguration( 'ingenico' );
-
-   $globalConfig = Context::get()->getGlobalConfiguration();
-   $this->cache = $globalConfig->object( 'cache', true );
-   $this->cache->clear();
-
-   $this->provider = new BankPaymentProvider( array(
-   'cache-parameters' => array(
-   'duration' => 10,
-   'key-base' => 'BLAH_BLAH'
-   )
-   ) );
-   }
-
-   publ

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ui.TableLineContext: adjust positioning

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377482 )

Change subject: ui.TableLineContext: adjust positioning
..


ui.TableLineContext: adjust positioning

a4a0be2da1 restored this rule to stop overlap with the table context. However, 
it causes problems in RTL. Adjust it so it still stops overlap, without RTL 
issues.

Bug: T175417
Change-Id: I48aa0a542dbc42399e5ae6a5e341600dbb19427c
---
M src/ui/styles/ve.ui.TableLineContext.css
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/src/ui/styles/ve.ui.TableLineContext.css 
b/src/ui/styles/ve.ui.TableLineContext.css
index 1c781b0..d372ede 100644
--- a/src/ui/styles/ve.ui.TableLineContext.css
+++ b/src/ui/styles/ve.ui.TableLineContext.css
@@ -5,9 +5,8 @@
  */
 
 .ve-ui-tableLineContext {
-   position: absolute;
/* Ensure it is placed above the table context */
-   z-index: 2;
+   z-index: 3;
 }
 
 .ve-ui-tableLineContext-indicator {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48aa0a542dbc42399e5ae6a5e341600dbb19427c
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
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] wikimedia...SmashPig[deployment]: Merge branch 'master' into deployment

2017-09-12 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377491 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor

160d94f Use version 1.0.0 of PHP-Queue
35e6281 Clean up duplicate curlWrapper stuff
fd9d434 Always clear all database statics in tearDown
5ab1be5 Finally set a version number - 0.5
0529ea7 Fix a couple auto-inserted braces, break lines
f4e44cd Move FinalStatus enum to SmashPig, add ValidationAction
650c204 Move PaymentError and ValidationError to SmashPig
8006a59 Push PaymentResult down into SmashPig

Change-Id: I5468f7a131d4905501b0e298bea19b180c0afb48
---
D PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
D PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
D Tests/BaseSmashPigUnitTestCase.php
D Tests/DamagedDatabaseTest.php
D Tests/PaymentsInitialDatabaseTest.php
D Tests/PendingDatabaseTest.php
D Tests/PendingQueueConsumerTest.php
D Tests/SmashPigDatabaseTest.php
D Tests/TestingDatabase.php
M vendor
11 files changed, 1 insertion(+), 870 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/91/377491/1

diff --git a/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
deleted file mode 100644
index cc3bf27..000
--- a/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<<< HEAD   (dce4f0 Merge branch 'master' into HEAD)
-===
-setProviderConfiguration( 
'ingenico' );
-   $this->curlWrapper = $this->getMock( 
'\SmashPig\Core\Http\CurlWrapper' );
-   $providerConfiguration->overrideObjectInstance( 'curl/wrapper', 
$this->curlWrapper );
-
-   $this->authenticator = new Authenticator(
-   '5e45c937b9db33ae',
-   'I42Zf4pVnRdroHfuHnRiJjJ2B6+22h0yQt/R3nZR8Xg='
-   );
-   $this->api = new Api(
-   'https://example.com',
-   '9876'
-   );
-   }
-
-   public function testCreateRequest() {
-   $headerVerification = function ( $headers ) {
-   $date = new DateTime( $headers['Date'] );
-   return $date !== null &&
-   $headers['Content-Type'] === 'application/json';
-   };
-
-   $this->curlWrapper->expects( $this->once() )
-   ->method( 'execute' )
-   ->with(
-   $this->equalTo( 
'https://example.com/v1/9876/testPath' ),
-   $this->equalTo( 'POST' ),
-   $this->callback( $headerVerification ),
-   $this->equalTo( '{"foo":"bar"}' )
-   )->willReturn( array(
-   'body' => '{"baz":"quux"}'
-   ) );
-
-   $this->api->makeApiCall( 'testPath', 'POST', array( 'foo' => 
'bar' ) );
-   }
-
-   /**
-* @expectedException SmashPig\PaymentProviders\Ingenico\ApiException
-* @expectedExceptionMessage Ingenico error id 
460d9c9c-098c-4d84-b1e5-ee27ec601757. Error code 9002: 
MISSING_OR_INVALID_AUTHORIZATION
-*/
-   public function testError() {
-   $this->curlWrapper->method( 'execute' )
-   ->willReturn( array(
-   'body' => '{"errorId" : 
"460d9c9c-098c-4d84-b1e5-ee27ec601757","errors" : [ {   "code" : "9002",   
"message" : "MISSING_OR_INVALID_AUTHORIZATION",   "httpStatusCode" : 403} ] }',
-   'headers' => array(),
-   'status' => 403
-   ) );
-   $this->api->makeApiCall( 'testPath', 'POST', array( 'foo' => 
'bar' ) );
-   }
-}
->>> BRANCH (8006a5 Push PaymentResult down into SmashPig)
diff --git 
a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
deleted file mode 100644
index b0174d3..000
--- a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<<< HEAD   (dce4f0 Merge branch 'master' into HEAD)
-===
-setProviderConfiguration( 'ingenico' );
-
-   $globalConfig = Context::get()->getGlobalConfiguration();
-   $this->cache = $globalConfig->object( 'cache', true );
-   $this->cache->clear();
-
-   $this->provider = new BankPaymentProvider( array(
-   'cache-parameters' => array(
-   'duration' => 10,
-   'key-base' => 'BLAH_BLAH'
-   )
-   ) );
-   }

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update PHP-Queue to 1.0

2017-09-12 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377490 )

Change subject: Update PHP-Queue to 1.0
..

Update PHP-Queue to 1.0

Change-Id: I7a8ac462c40ed8ca54d6b18264e1d9f97f237bc1
---
M coderkungfu/php-queue/.travis.yml
M coderkungfu/php-queue/README.md
M coderkungfu/php-queue/composer.json
M coderkungfu/php-queue/demo/runners/README.md
M composer/installed.json
5 files changed, 113 insertions(+), 108 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig/vendor 
refs/changes/90/377490/1

diff --git a/coderkungfu/php-queue/.travis.yml 
b/coderkungfu/php-queue/.travis.yml
index 7941bc4..8f270d2 100644
--- a/coderkungfu/php-queue/.travis.yml
+++ b/coderkungfu/php-queue/.travis.yml
@@ -4,16 +4,21 @@
 #
 
 language: php
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+
+dist: trusty
  
 matrix:
+  include:
+- php: 5.3
+  dist: precise
+- php: 5.4
+- php: 5.5
+- php: 5.6
+- php: 7.0
+- php: hhvm
   allow_failures:
+- php: 5.3
+  dist: precise
 - php: 7.0
 - php: hhvm
 
@@ -22,6 +27,8 @@
   username: root
   encoding: utf8
 
+before_install: echo "extension=memcache.so" >> ~/.phpenv/versions/$(phpenv 
version-name)/etc/php.ini
+
 before_script:
   - mysql -e 'create database phpqueuetest;'
   - composer self-update
@@ -29,5 +36,3 @@
 
 script: phpunit --coverage-text -c phpunit.travis.xml
 
-after_script:
-  - "wget --quiet http://mauris.sg/bin/pdc.phar && php pdc.phar src"
diff --git a/coderkungfu/php-queue/README.md b/coderkungfu/php-queue/README.md
index 74ff0e7..3f3d2f6 100644
--- a/coderkungfu/php-queue/README.md
+++ b/coderkungfu/php-queue/README.md
@@ -1,5 +1,5 @@
 # PHP-Queue #
-[![Gitter](https://badges.gitter.im/Join 
Chat.svg)](https://gitter.im/CoderKungfu/php-queue?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CoderKungfu/php-queue?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A unified front-end for different queuing backends. Includes a REST server, 
CLI interface and daemon runners.
 
@@ -57,12 +57,12 @@
 
 2. Download and install Composer.
 
-   ```
+```
 curl -s "http://getcomposer.org/installer"; | php
 ```
 3. Install your dependencies.
 
-   ```
+```
 php composer.phar install
 ```
 
@@ -70,7 +70,7 @@
 
 5. Require Composer's autoloader.
 
-   ```php
+```php
 
@@ -130,19 +130,19 @@
 
 1. Add new job.
 
-   ```
+```
 # Form post
 curl -XPOST http://localhost// -d "var1=foo&var2=bar"
 ```
 
-   ```
+```
 # JSON post
 curl -XPOST http://localhost// -H "Content-Type: application/json" 
-d '{"var1":"foo","var2":"bar"}'
 ```
 
 2. Trigger next job.
 
-   ```
+```
 curl -XPUT http://localhost//
 ```
 
@@ -154,13 +154,13 @@
 
 1. Add new job.
 
-   ```
+```
 $ php cli.php  add --data '{"boo":"bar","foo":"car"}'
 ```
 
 2. Trigger next job.
 
-   ```
+```
 $ php cli.php  work
 ```
 
diff --git a/coderkungfu/php-queue/composer.json 
b/coderkungfu/php-queue/composer.json
index 085c069..6e30fad 100644
--- a/coderkungfu/php-queue/composer.json
+++ b/coderkungfu/php-queue/composer.json
@@ -5,6 +5,7 @@
 "homepage": "http://github.com/CoderKungfu/php-queue";,
 "type": "library",
 "license": "MIT",
+"version": "1.0.0",
 "authors": [
 {
 "name": "Michael Cheng",
@@ -24,12 +25,12 @@
 },
 "require-dev": {
 "mrpoundsign/pheanstalk-5.3": "dev-master",
-"aws/aws-sdk-php": "dev-master",
+"aws/aws-sdk-php": ">=2.8",
 "amazonwebservices/aws-sdk-for-php": "dev-master",
 "predis/predis": "1.*",
 "iron-io/iron_mq": "dev-master",
 "ext-memcache": "*",
-"microsoft/windowsazure": "dev-master"
+"microsoft/windowsazure": ">=0.4.0"
 },
 "suggest": {
 "predis/predis": "For Redis backend support",
diff --git a/coderkungfu/php-queue/demo/runners/README.md 
b/coderkungfu/php-queue/demo/runners/README.md
index 5ddab8d..3f89d0f 100644
--- a/coderkungfu/php-queue/demo/runners/README.md
+++ b/coderkungfu/php-queue/demo/runners/README.md
@@ -26,13 +26,13 @@
 1. Create a new PHP file named "SimpleRunner.php" (no naming convention here).
 2. Include the config file:
 
-   ```php
+```php
 require_once '/path/to/your/config.php';
 ```
 
 3. Create a new Runner class (extending `PHPQueue\Runner`). The queue name can 
be defined in the `$queue_name` attribute.
 
-   ```php
+```php
 class SampleRunner extends PHPQueue\Runner
 {
 public $queue_name = 'Sample';
@@ -41,14 +41,14 @@
 
 4. Instantiate the class and call the `run()` method.
 
-   ```php
+```php
 $runner = new SampleRunner();
 $runner->run();
 ```
 
 5. Run the Runner.
 
-   ```
+```
 $ php SimpleRunner.php
 ```
 
@@ -92,8 +92,7 @@
 $ php BeanstalkSampleStop.php
 ```
 
-***Note:

[MediaWiki-commits] [Gerrit] operations/puppet[production]: k8s: fix template scoping

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377459 )

Change subject: k8s: fix template scoping
..


k8s: fix template scoping

Since the future parser has different scoping rules, do as follows:
* Add a master_host parameter to k8s::infrastructure
* Explicitly declare k8s::infrastructure_config in k8s::node
* Change the "include" in a "require" for the config class in k8s::proxy
  and k8s::kubelet as it's the proper logical relationship

Bug: T171704
Change-Id: I7a59f3337d3f1d5c96eafbe3240a1544ef2366d8
---
M modules/k8s/manifests/infrastructure_config.pp
M modules/k8s/manifests/kubelet.pp
M modules/k8s/manifests/proxy.pp
M modules/profile/manifests/kubernetes/node.pp
4 files changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/k8s/manifests/infrastructure_config.pp 
b/modules/k8s/manifests/infrastructure_config.pp
index 61c2c5c..3953c93 100644
--- a/modules/k8s/manifests/infrastructure_config.pp
+++ b/modules/k8s/manifests/infrastructure_config.pp
@@ -1,4 +1,4 @@
-class k8s::infrastructure_config {
+class k8s::infrastructure_config($master_host) {
 file { '/etc/kubernetes':
 ensure => directory,
 owner  => 'root',
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index 885c894..68b6d36 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -11,7 +11,7 @@
 $cni_bin_dir='/opt/cni/bin',
 $cni_conf_dir='/etc/cni/net.d',
 ) {
-include ::k8s::infrastructure_config
+require ::k8s::infrastructure_config
 
 require_package('kubernetes-node')
 
diff --git a/modules/k8s/manifests/proxy.pp b/modules/k8s/manifests/proxy.pp
index e7ad8fa..c313c76 100644
--- a/modules/k8s/manifests/proxy.pp
+++ b/modules/k8s/manifests/proxy.pp
@@ -3,7 +3,7 @@
 $proxy_mode = 'iptables',
 $masquerade_all = true,
 ) {
-include ::k8s::infrastructure_config
+require ::k8s::infrastructure_config
 
 $master_ip = ipresolve($master_host, 4, $::nameservers[0])
 
diff --git a/modules/profile/manifests/kubernetes/node.pp 
b/modules/profile/manifests/kubernetes/node.pp
index 881208c..90642c3 100644
--- a/modules/profile/manifests/kubernetes/node.pp
+++ b/modules/profile/manifests/kubernetes/node.pp
@@ -10,6 +10,11 @@
 user=> 'root',
 group   => 'root',
 }
+
+class { '::k8s::infrastructure_config':
+master_host => $master_fqdn,
+}
+
 class { '::k8s::kubelet':
 master_host   => $master_fqdn,
 listen_address=> '0.0.0.0',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a59f3337d3f1d5c96eafbe3240a1544ef2366d8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Gehel 
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] VisualEditor/VisualEditor[master]: Trigger proper undo/redo when inputType=historyUndo/Redo

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377471 )

Change subject: Trigger proper undo/redo when inputType=historyUndo/Redo
..


Trigger proper undo/redo when inputType=historyUndo/Redo

Bug: T175634
Change-Id: Ic0bcec267a021ccdc9285ec9713eb82dd2fb0c42
---
M src/ce/ve.ce.Surface.js
M tests/ce/ve.ce.TestRunner.js
2 files changed, 23 insertions(+), 1 deletion(-)

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



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 6a7fb06..b81f76c 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -280,6 +280,19 @@
 ];
 
 /**
+ * Values of InputEvent.inputType which map to a command
+ *
+ * Currently these are triggered when the user selects
+ * undo/redo from the context menu in Chrome.
+ *
+ * @type {Object}
+ */
+ve.ce.Surface.static.inputTypeCommands = {
+   historyUndo: 'undo',
+   historyRedo: 'redo'
+};
+
+/**
  * Cursor holder template
  *
  * @static
@@ -2439,7 +2452,14 @@
  * @method
  * @param {jQuery.Event} e The input event
  */
-ve.ce.Surface.prototype.onDocumentInput = function () {
+ve.ce.Surface.prototype.onDocumentInput = function ( e ) {
+   var inputType = e.originalEvent.inputType;
+
+   if ( inputType && inputType in 
this.constructor.static.inputTypeCommands ) {
+   this.getSurface().executeCommand( 
this.constructor.static.inputTypeCommands[ inputType ] );
+   e.preventDefault();
+   return;
+   }
this.incRenderLock();
try {
this.surfaceObserver.pollOnce();
diff --git a/tests/ce/ve.ce.TestRunner.js b/tests/ce/ve.ce.TestRunner.js
index 8d50294..a48bacc 100644
--- a/tests/ce/ve.ce.TestRunner.js
+++ b/tests/ce/ve.ce.TestRunner.js
@@ -169,6 +169,8 @@
  * @param {Object} ev Fake event object with any necessary properties
  */
 ve.ce.TestRunner.prototype.sendEvent = function ( eventName, ev ) {
+   // Ensure ev has an originalEvent property.
+   ev.originalEvent = ev.originalEvent || {};
this.view.eventSequencer.onEvent( eventName, ev );
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0bcec267a021ccdc9285ec9713eb82dd2fb0c42
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Divec 
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] labs...wikibugs2[master]: Update Wikimedia-AI's irc config

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377364 )

Change subject: Update Wikimedia-AI's irc config
..


Update Wikimedia-AI's irc config

Change-Id: I8a1ed479886501fba9371ad6ccec68b4db558f48
---
M gerrit-channels.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Zppix: Looks good to me, but someone else must approve
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index f6cb4ee..279a383 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -60,6 +60,10 @@
 mediawiki/extensions/SolrStore:
 "#wikimedia-ai":
 mediawiki/extensions/ORES:
+mediawiki/services/ores/deploy:
+mediawiki/services/ores:
+mediawiki/services/ores/wikiclass:
+mediawiki/services/ores/editquality:
 "#wikimedia-analytics":
 analytics/.*:
 "#wikimedia-perf-bots":

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a1ed479886501fba9371ad6ccec68b4db558f48
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Zppix 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Set db1097 as the main api server for s4

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377489 )

Change subject: mariadb: Set db1097 as the main api server for s4
..

mariadb: Set db1097 as the main api server for s4

Change-Id: Idbb28f57c474a2dc820a95b3829132a27e04402c
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/89/377489/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 3f294e8..58f63a5 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -335,8 +335,8 @@
'db1064' => 1,
],
'api' => [
-   'db1081' => 10,
-   'db1097' => 1,
+   'db1081' => 1,
+   'db1097' => 3,
],
'watchlist' => [
'db1053' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbb28f57c474a2dc820a95b3829132a27e04402c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch - deploy plugins with debian package instead o...

2017-09-12 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/375812 )

Change subject: elasticsearch - deploy plugins with debian package instead of 
trebuchet
..


elasticsearch - deploy plugins with debian package instead of trebuchet

Bug: T158560
Depends-On: Ibf1f12c775b0b59b59fd89cd0b09dd35c97c0190
Change-Id: I69322724369e4574a1d048cc4c75eaffdbc2b260
---
M modules/profile/manifests/elasticsearch.pp
1 file changed, 3 insertions(+), 17 deletions(-)

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



diff --git a/modules/profile/manifests/elasticsearch.pp 
b/modules/profile/manifests/elasticsearch.pp
index b84f3f9..bc20147 100644
--- a/modules/profile/manifests/elasticsearch.pp
+++ b/modules/profile/manifests/elasticsearch.pp
@@ -48,26 +48,13 @@
 srange  => "@resolve((${elastic_nodes_ferm}))",
 }
 
-package { 'elasticsearch/plugins':
-provider => 'trebuchet',
-}
-# Elasticsearch 5 doesn't allow setting the plugin path, we need
-# to symlink it into place. The directory already exists as part of the
-# debian package, so we need to force the creation of the symlink.
-$plugins_dir = '/srv/deployment/elasticsearch/plugins'
-file { '/usr/share/elasticsearch/plugins':
-ensure  => 'link',
-target  => $plugins_dir,
-force   => true,
-require => Package['elasticsearch/plugins'],
+package {'wmf-elasticsearch-search-plugins':
+ensure => present,
+before => Service['elasticsearch'],
 }
 
 # Install
 class { '::elasticsearch':
-require=> [
-Package['elasticsearch/plugins'],
-File['/usr/share/elasticsearch/plugins'],
-],
 # Production elasticsearch needs these plugins to be loaded in order
 # to work properly.  This will keep elasticsearch from starting
 # if these plugins are  not available.
@@ -76,7 +63,6 @@
 'extra',
 'analysis-icu',
 ],
-plugins_dir=> $plugins_dir,
 # Let apifeatureusage create their indices
 auto_create_index  => '+apifeatureusage-*,-*',
 # Production can get a lot of use out of the filter cache.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69322724369e4574a1d048cc4c75eaffdbc2b260
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Fix typo on view creation query (missing `)

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377484 )

Change subject: mariadb: Fix typo on view creation query (missing `)
..


mariadb: Fix typo on view creation query (missing `)

Followup to gerrit: 377480

Change-Id: I7cc8259505256ba9fcb4f787e66cbc88ba650ae2
---
M modules/role/files/labs/db/views/heartbeat-views.sql
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/files/labs/db/views/heartbeat-views.sql 
b/modules/role/files/labs/db/views/heartbeat-views.sql
index 476b929..bcf462c 100644
--- a/modules/role/files/labs/db/views/heartbeat-views.sql
+++ b/modules/role/files/labs/db/views/heartbeat-views.sql
@@ -5,9 +5,8 @@
 CREATE OR REPLACE
 ALGORITHM=UNDEFINED
 DEFINER=`root`@`localhost`
-SQL SECURITY DEFINER VIEW
-`heartbeat_p`.`heartbeat` AS
-SELECT shard` AS `shard`,
+SQL SECURITY DEFINER VIEW `heartbeat_p`.`heartbeat` AS
+SELECT `shard` AS `shard`,
max(`heartbeat`.`heartbeat`.`ts`) AS `last_updated`,
greatest(timestampdiff(MICROSECOND, max(`heartbeat`.`heartbeat`.`ts`), 
utc_timestamp()), 0)/1000.0 AS `lag`
 FROM `heartbeat`.`heartbeat`

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

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

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

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Add Egypt in Arabic eg_ar

2017-09-12 Thread Code Review

Jean-Frédéric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377488 )

Change subject: Add Egypt in Arabic eg_ar
..

Add Egypt in Arabic eg_ar

Bug: T174261

Change-Id: I20da5ebdf51b4bfcce1120c299d04e2c3c449c08
---
A erfgoedbot/monuments_config/eg_ar.json
1 file changed, 123 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/88/377488/1

diff --git a/erfgoedbot/monuments_config/eg_ar.json 
b/erfgoedbot/monuments_config/eg_ar.json
new file mode 100644
index 000..37ebd60
--- /dev/null
+++ b/erfgoedbot/monuments_config/eg_ar.json
@@ -0,0 +1,123 @@
+{
+"country": "eg",
+"lang": "ar",
+"description": "Monuments in Egypt in Arabic",
+"project": "wikipedia",
+"namespaces": [
+0
+],
+"table": "monuments_eg_(ar)",
+"truncate": false,
+"primkey": "رقم",
+"headerTemplate": "رأس معلم مصر",
+"rowTemplate": "صف معلم مصر",
+"commonsTemplate": "Cultural Heritage Egypt",
+"commonsTrackerCategory": "Cultural heritage monuments in Egypt with known 
IDs ",
+"commonsCategoryBase": "Cultural heritage monuments in Egypt",
+"unusedImagesPage": "",
+"registrantUrlBase": "",
+"fields": [
+{
+"dest": "id",
+"source": "رقم"
+},
+{
+"dest": "name",
+"source": "اسم"
+},
+{
+"dest": "description",
+"source": "وصف"
+},
+{
+"dest": "",
+"source": "موقع"
+},
+{
+"dest": "municipality",
+"source": "مدينة"
+},
+{
+"dest": "",
+"source": "يحتاج تصريح بالتصوير"
+},
+{
+"dest": "lat",
+"source": "دائرة عرض",
+"check": "checkLat"
+},
+{
+"dest": "lon",
+"source": "خط طول",
+"check": "checkLon"
+},
+{
+"dest": "image",
+"source": "صورة"
+},
+{
+"dest": "commonscat",
+"source": "commonscat"
+}
+],
+"sql_lang": "Arabic",
+"sql_country": "Egyupe",
+"sql_data": {
+"country": {
+"value": "eg",
+"type": "Text"
+},
+"lang": {
+"value": "ar",
+"type": "Text"
+},
+"project": {
+"value": "wikipedia",
+"type": "Text"
+},
+"id": {
+"value": "id",
+"type": "Field"
+},
+"adm0": {
+"value": "eg",
+"type": "Text"
+},
+"adm1": {
+"value": "LOWER(`ISO`)",
+"type": "Raw"
+},
+"name": {
+"value": "name",
+"type": "Field"
+},
+"municipality": {
+"value": "municipality",
+"type": "Field"
+},
+"lat": {
+"value": "lat",
+"type": "Field"
+},
+"lon": {
+"value": "lon",
+"type": "Field"
+},
+"image": {
+"value": "image",
+"type": "Field"
+},
+"commonscat": {
+"value": "commonscat",
+"type": "Field"
+},
+"source": {
+"value": "source",
+"type": "Field"
+},
+"changed": {
+"value": "changed",
+"type": "Field"
+},
+}
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20da5ebdf51b4bfcce1120c299d04e2c3c449c08
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Capture format* inputTypes

2017-09-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377487 )

Change subject: Capture format* inputTypes
..

Capture format* inputTypes

In the real world, this means that iOS selection tools
will trigger our internal formatting commands instead
of modifying the CE directly, and hoping we observe
the change correctly.

Change-Id: I173c779bd32079d3f5ffa490e9bebe0d882cb15f
---
M src/ce/ve.ce.Surface.js
1 file changed, 30 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/87/377487/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index b81f76c..289aad8 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -283,13 +283,34 @@
  * Values of InputEvent.inputType which map to a command
  *
  * Currently these are triggered when the user selects
- * undo/redo from the context menu in Chrome.
+ * undo/redo from the context menu in Chrome, or uses the
+ * selection formatting tools on iOS.
+ *
+ * Values of null will perform no action and preventDefault.
  *
  * @type {Object}
  */
 ve.ce.Surface.static.inputTypeCommands = {
historyUndo: 'undo',
-   historyRedo: 'redo'
+   historyRedo: 'redo',
+   formatBold: 'bold',
+   formatItalic: 'italic',
+   formatUnderline: 'underline',
+   formatStrikeThrough: 'strikethrough',
+   formatSuperscript: 'superscript',
+   formatSubscript: 'subscript',
+   formatJustifyFull: null,
+   formatJustifyCenter: null,
+   formatJustifyRight: null,
+   formatJustifyLeft: null,
+   formatIndent: 'indent',
+   formatOutdent: 'outdent',
+   formatRemove: 'clear',
+   formatSetBlockTextDirection: null,
+   formatSetInlineTextDirection: null,
+   formatBackColor: null,
+   formatFontColor: null,
+   formatFontName: null
 };
 
 /**
@@ -2453,10 +2474,14 @@
  * @param {jQuery.Event} e The input event
  */
 ve.ce.Surface.prototype.onDocumentInput = function ( e ) {
-   var inputType = e.originalEvent.inputType;
+   var inputType = e.originalEvent.inputType,
+   inputTypeCommands = this.constructor.static.inputTypeCommands;
 
-   if ( inputType && inputType in 
this.constructor.static.inputTypeCommands ) {
-   this.getSurface().executeCommand( 
this.constructor.static.inputTypeCommands[ inputType ] );
+   if ( inputType && inputTypeCommands.hasOwnProperty( inputType ) ) {
+   // Value can be null, in which case we still want to 
preventDefault.
+   if ( inputTypeCommands[ inputType ] ) {
+   this.getSurface().executeCommand( 
this.constructor.static.inputTypeCommands[ inputType ] );
+   }
e.preventDefault();
return;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I173c779bd32079d3f5ffa490e9bebe0d882cb15f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: API: Expose $wgCiteResponsiveReferences via meta=siteinfo

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377388 )

Change subject: API: Expose $wgCiteResponsiveReferences via meta=siteinfo
..


API: Expose $wgCiteResponsiveReferences via meta=siteinfo

Bug: T159894
Change-Id: I2404999ab11b5cf7b740ae43696c4676ab1b6d22
---
M extension.json
M includes/CiteHooks.php
2 files changed, 15 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index cadd2dd..28a9229 100644
--- a/extension.json
+++ b/extension.json
@@ -44,7 +44,8 @@
],
"ResourceLoaderGetConfigVars": [
"CiteHooks::onResourceLoaderGetConfigVars"
-   ]
+   ],
+   "APIQuerySiteInfoGeneralInfo": 
"CiteHooks::onAPIQuerySiteInfoGeneralInfo"
},
"ResourceModules": {
"ext.cite.styles": {
diff --git a/includes/CiteHooks.php b/includes/CiteHooks.php
index 06bbba1..de5e70f 100644
--- a/includes/CiteHooks.php
+++ b/includes/CiteHooks.php
@@ -267,4 +267,17 @@
$vars['wgCiteVisualEditorOtherGroup'] = $config->get( 
'CiteVisualEditorOtherGroup' );
return true;
}
+
+   /**
+* Hook: APIQuerySiteInfoGeneralInfo
+*
+* Expose configs via action=query&meta=siteinfo
+*
+* @param ApiQuerySiteInfo $api
+* @param array &$data
+*/
+   public static function onAPIQuerySiteInfoGeneralInfo( ApiQuerySiteInfo 
$api, array &$data ) {
+   $config = ConfigFactory::getDefaultInstance()->makeConfig( 
'cite' );
+   $data['citeresponsivereferences'] = $config->get( 
'CiteResponsiveReferences' );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2404999ab11b5cf7b740ae43696c4676ab1b6d22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Fix typo on view creation query (missing `)

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377484 )

Change subject: mariadb: Fix typo on view creation query (missing `)
..

mariadb: Fix typo on view creation query (missing `)

Followup to gerrit: 377480

Change-Id: I7cc8259505256ba9fcb4f787e66cbc88ba650ae2
---
M modules/role/files/labs/db/views/heartbeat-views.sql
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/377484/1

diff --git a/modules/role/files/labs/db/views/heartbeat-views.sql 
b/modules/role/files/labs/db/views/heartbeat-views.sql
index 476b929..bcf462c 100644
--- a/modules/role/files/labs/db/views/heartbeat-views.sql
+++ b/modules/role/files/labs/db/views/heartbeat-views.sql
@@ -5,9 +5,8 @@
 CREATE OR REPLACE
 ALGORITHM=UNDEFINED
 DEFINER=`root`@`localhost`
-SQL SECURITY DEFINER VIEW
-`heartbeat_p`.`heartbeat` AS
-SELECT shard` AS `shard`,
+SQL SECURITY DEFINER VIEW `heartbeat_p`.`heartbeat` AS
+SELECT `shard` AS `shard`,
max(`heartbeat`.`heartbeat`.`ts`) AS `last_updated`,
greatest(timestampdiff(MICROSECOND, max(`heartbeat`.`heartbeat`.`ts`), 
utc_timestamp()), 0)/1000.0 AS `lag`
 FROM `heartbeat`.`heartbeat`

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin::data.yaml: Set cwdent to ldap user only

2017-09-12 Thread Elukey (Code Review)

Elukey has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377472 )

Change subject: admin::data.yaml: Set cwdent to ldap user only
..


admin::data.yaml: Set cwdent to ldap user only

Bug: T170878
Change-Id: Ib5c54c791d4ca99d6944b0e52eacc4df7abf74a6
---
M modules/admin/data/data.yaml
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 9044fcc..d4e6ced 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -8,7 +8,7 @@
   manybubbles, haithams, jzerebecki, ashwinpp, robla, asherman,
   laner, declerambaul, srijan, junikowski, krenair, springle, 
jhobs, vbaranetsky,
   yurik, bsimmers, bcohn, hjiang, tomasz, csteipp, zareen, 
jgirault, ellery,
-  psinger, midom, tparscal, dworley, ironholds, moushira, 
lpintscher, gpaumier]
+  psinger, midom, tparscal, dworley, ironholds, moushira, 
lpintscher, gpaumier, cwdent]
   absent_ldap:
 description: meta group for absented users which had privileged LDAP 
access in the past
 members: [siddharth11, adavenport]
@@ -233,7 +233,7 @@
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
 members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak,
-  halfak, dr0ptp4kt, bearloga, cwdent, elukey, gwicke, ppchelko,
+  halfak, dr0ptp4kt, bearloga, elukey, gwicke, ppchelko,
   nuria, otto, deskana, zhousquared, arnad, jgonsior,
   bsitzmann, dbrant, nettrom, leila,
   ezachte, mforns, reedy, west1, phuedx, awight,
@@ -2027,11 +2027,11 @@
 uid: 2501
 email: bdziewon...@wikimedia.org
   cwdent:
-ensure: present
+ensure: absent
 gid: 500
 name: cwdent
 realname: Casey Dentinger
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDhB5NxsYxf82q8N2/xUZXRUJNlgUB8moiLxFnrS8989pXs4wiilEFpYgMIZ0V30lu7xIeHzCWdJYEq0ySeQ8Wm5BVdM8APpiLZ4YNheG+gTtRaESSjyj6x/VcCxLjiXwzuXSEikmwXKhXeVFIO8s2FaOrb3JYizaWJxbA6DAQiD3ILR8pjuJtaUkZcmVO86qjdOFGqeRMMB1kVye9JYDRYow8QM13v0TDeP+5EY+6yTG5jlGNscTwYO6Xn/BPi+LS/X1AJYQ6qmWjUky3g6TJEREDmpZBmSfl5bGWBVohOZLuQWTxXAuQ/a5tuCbF+fVsJLZv4dRlEINgxyuEbTSwN]
+ssh_keys: []
 uid: 12179
 email: cdentin...@wikimedia.org
   ema:
@@ -2605,6 +2605,10 @@
 ensure: present
 realname: Corey Floyd
 email: cfl...@wikimedia.org
+  cwdent:
+ensure: present
+realname: Casey Dentinger
+email: cdentin...@wikimedia.org
   ferdbold:
 ensure: present
 realname: Frederic Bolduc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5c54c791d4ca99d6944b0e52eacc4df7abf74a6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Elukey 
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] apps...wikipedia[master]: Fix Chinese summary tags show in English

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377359 )

Change subject: Fix Chinese summary tags show in English
..


Fix Chinese summary tags show in English

In this update:
 - Replace with L10nUtil.setDesiredLocale() to get correct Chinese tags.
 - Change L10nUtil.setDesiredLocale to public

Bug: T174709
Change-Id: I6eeafa835f40a75e22aeeab1ecbd2411f210639e
---
M app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/util/L10nUtil.java
2 files changed, 9 insertions(+), 3 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java 
b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
index 9c57d00..6233058 100644
--- a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
+++ b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
@@ -98,7 +98,7 @@
 Configuration config = new 
Configuration(oldResources.getConfiguration());
 Resources tempResources = getResources();
 if (!oldLocale.getLanguage().equals(newLocale.getLanguage()) && 
!newLocale.getLanguage().equals("test")) {
-ConfigurationCompat.setLocale(config, newLocale);
+L10nUtil.setDesiredLocale(config, newLocale);
 tempResources = new Resources(assets, metrics, config);
 }
 
diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java 
b/app/src/main/java/org/wikipedia/util/L10nUtil.java
index 9aa538c..445cb3e 100644
--- a/app/src/main/java/org/wikipedia/util/L10nUtil.java
+++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java
@@ -205,7 +205,7 @@
 return getRelativeTimeSpanString(date.getTime(), currentTimeMillis(), 
SECOND_IN_MILLIS, 0).toString();
 }
 
-private static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
+public static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
 // when loads API in chinese variant, we can get zh-hant, zh-hans and 
zh
 // but if we want to display chinese correctly based on the article 
itself, we have to
 // detect the variant from the API responses; otherwise, we will only 
get english texts.
@@ -217,7 +217,13 @@
 } else if (desiredLocale.getLanguage().equals(CHINESE_LANGUAGE_CODE)) {
 // create a new Locale object to manage only "zh" language code 
based on its app language
 // code. e.g.: search "HK" article in "zh-hant" or "zh-hans" will 
get "zh" language code
-setLocale(config, new 
Locale(WikipediaApp.getInstance().getAppLanguageCode()));
+if 
(WikipediaApp.getInstance().getAppLanguageCode().equals(TRADITIONAL_CHINESE_LANGUAGE_CODE))
 {
+setLocale(config, TRADITIONAL_CHINESE);
+} else if 
(WikipediaApp.getInstance().getAppLanguageCode().equals(SIMPLIFIED_CHINESE_LANGUAGE_CODE))
 {
+setLocale(config, SIMPLIFIED_CHINESE);
+} else {
+setLocale(config, desiredLocale);
+}
 } else {
 setLocale(config, desiredLocale);
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6eeafa835f40a75e22aeeab1ecbd2411f210639e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Split categorization out of daily update job

2017-09-12 Thread Code Review

Jean-Frédéric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377483 )

Change subject: Split categorization out of daily update job
..

Split categorization out of daily update job

The categorisation task takes forever, which delays
the daily harversting.

This splits out the categorization to its own bin script.

Bug: T174871
Change-Id: Ic49505ff31316f617f6891d814b58aebbf25fc2a
---
A bin/categorize_images.sh
M bin/update_monuments.sh
2 files changed, 15 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/83/377483/1

diff --git a/bin/categorize_images.sh b/bin/categorize_images.sh
new file mode 100755
index 000..41da777
--- /dev/null
+++ b/bin/categorize_images.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Script to categorize images
+
+PYWIKIBOT_BIN=/data/project/heritage/pywikibot/pwb.py
+ERFGOED_PATH=/data/project/heritage/erfgoedbot
+
+# Make sure we are in our homedir
+cd /data/project/heritage/ || exit
+
+# Categorize some images
+echo "Categorize images..."
+$PYWIKIBOT_BIN $ERFGOED_PATH/categorize_images.py -log
+
+echo "Done with the categorization!"
diff --git a/bin/update_monuments.sh b/bin/update_monuments.sh
index 695f418..a715652 100755
--- a/bin/update_monuments.sh
+++ b/bin/update_monuments.sh
@@ -78,8 +78,4 @@
 echo_time "Refill prox_search table..."
 php ./prox_search/fill_table_prox_search.php
 
-# Categorize some images
-echo_time "Categorize images..."
-$PYWIKIBOT_BIN $ERFGOED_PATH/categorize_images.py -log
-
 echo_time "Done with the update!"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic49505ff31316f617f6891d814b58aebbf25fc2a
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Setup tuning profiles for different size datasets

2017-09-12 Thread DCausse (Code Review)

DCausse has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377344 )

Change subject: Setup tuning profiles for different size datasets
..


Setup tuning profiles for different size datasets

The appropriate hyperparameter space to search depends both
on the distribution of data in the dataset being trained against,
as well as the size of the dataset itself. For example a depth of 10
makes no sense when training a model with only 200k observations.

Setup some profiles based on size and set their parameters based on
the recent round of training models for 20 different wikis.

Change-Id: I1f2fe53f1080a6af1c7d71cb1d6d27693bd131a4
---
M mjolnir/training/xgboost.py
1 file changed, 87 insertions(+), 12 deletions(-)

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



diff --git a/mjolnir/training/xgboost.py b/mjolnir/training/xgboost.py
index c010fb0..6d1f70b 100644
--- a/mjolnir/training/xgboost.py
+++ b/mjolnir/training/xgboost.py
@@ -478,26 +478,96 @@
 print 'best %s: %f' % (k, best[k])
 return best, trials
 
+num_obs = df.count()
+
+if num_obs > 800:
+dataset_size = 'xlarge'
+elif num_obs > 100:
+dataset_size = 'large'
+elif num_obs > 50:
+dataset_size = 'med'
+else:
+dataset_size = 'small'
+
+# Setup different tuning profiles for different sizes of datasets.
+tune_space = {
+'xlarge': {
+# This is intentionally a numpy space for grid search, as xlarge
+# datasets get slightly different handling here.
+'eta': np.linspace(0.3, 0.8, 30),
+# Have seen values of 7 and 10 as best on roughly same size
+# datasets from different wikis. It really just depends.
+'max_depth': hyperopt.hp.quniform('max_depth', 6, 11, 1),
+'min_child_weight': hyperopt.hp.qloguniform(
+'min_child_weight', np.log(10), np.log(500), 10),
+},
+'large': {
+'eta': hyperopt.hp.uniform('eta', 0.3, 0.6),
+'max_depth': hyperopt.hp.quniform('max_depth', 5, 9, 1),
+'min_child_weight': hyperopt.hp.qloguniform(
+'min_child_weight', np.log(10), np.log(300), 10),
+},
+'med': {
+'eta': hyperopt.hp.uniform('eta', 0.1, 0.6),
+'max_depth': hyperopt.hp.quniform('max_depth', 4, 7, 1),
+'min_child_weight': hyperopt.hp.qloguniform(
+'min_child_weight', np.log(10), np.log(300), 10),
+},
+'small': {
+'eta': hyperopt.hp.uniform('eta', 0.1, 0.4),
+'max_depth': hyperopt.hp.quniform('max_depth', 3, 6, 1),
+'min_child_weight': hyperopt.hp.qloguniform(
+'min_child_weight', np.log(10), np.log(100), 10),
+}
+}
+
 # Baseline parameters to start with. Roughly tuned by what has worked in
-# the past. These vary though depending on number of training samples
+# the past. These vary though depending on number of training samples. 
These
+# defaults are for the smallest of wikis, which are then overridden for 
larger
+# wikis
 space = {
 'objective': 'rank:ndcg',
 'eval_metric': 'ndcg@10',
 'num_rounds': initial_num_trees,
 'min_child_weight': 200,
-'max_depth': 6,
+'max_depth': 4,
 'gamma': 0,
 'subsample': 1.0,
 'colsample_bytree': 0.8,
 }
 
+# Overrides for the first round of training when tuning eta.
+space_overrides = {
+'xlarge': {
+'max_depth': 7,
+},
+'large': {
+'max_depth': 6,
+},
+'med': {
+'max_depth': 5,
+},
+'small': {}
+}
+
+for k, v in space_overrides[dataset_size].items():
+space[k] = v
+
 # Find an eta that gives good results with only 100 trees. This is done
 # so most of the tuning is relatively quick. A final step will re-tune
 # eta with more trees.
-etas = np.linspace(0.3, 0.7, 30)
-space['eta'] = hyperopt.hp.choice('eta', etas)
-best_eta, trials_eta = eval_space_grid(space)
-space['eta'] = _estimate_best_eta(trials_eta, etas)
+# This estimate only seems to work well for xlarge datasets. On smaller
+# datasets the shape of the graph is much less consistent and doesn't
+# match the builtin expectation of an L shaped graph.
+if dataset_size == 'xlarge':
+etas = tune_space[dataset_size]['eta']
+space['eta'] = hyperopt.hp.choice('eta', etas)
+best_eta, trials_eta = eval_space_grid(space)
+space['eta'] = _estimate_best_eta(trials_eta, etas)
+else:
+space['eta'] = tune_space[dataset_size]['eta']
+best_eta, trials_eta = eval_space(space, 50)
+space['eta'] = best_eta['eta']
 pprint.pprint(space)
 
 # Determines the size of e

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Allow selecting exact number of trees for training

2017-09-12 Thread DCausse (Code Review)

DCausse has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377343 )

Change subject: Allow selecting exact number of trees for training
..


Allow selecting exact number of trees for training

The idea to base the number of trees off node evaluations, rather
than some explicit number of trees, seems to abstract. Lets just
allow explicitly setting the exact number of trees to use.

Change-Id: Ie5a50865244af91e082d8acb04596d12dfbe3f0a
---
M mjolnir/cli/training_pipeline.py
M mjolnir/training/xgboost.py
2 files changed, 28 insertions(+), 27 deletions(-)

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



diff --git a/mjolnir/cli/training_pipeline.py b/mjolnir/cli/training_pipeline.py
index 32d25cd..7425e87 100644
--- a/mjolnir/cli/training_pipeline.py
+++ b/mjolnir/cli/training_pipeline.py
@@ -20,7 +20,7 @@
 from pyspark.sql import functions as F
 
 
-def main(sc, sqlContext, input_dir, output_dir, wikis, target_node_evaluations,
+def main(sc, sqlContext, input_dir, output_dir, wikis, initial_num_trees, 
final_num_trees,
  num_workers, num_cv_jobs, num_folds, test_dir, zero_features):
 
 if os.path.exists(output_dir):
@@ -48,12 +48,11 @@
 df_hits_with_features = mjolnir.feature_engineering.zero_features(
 df_hits_with_features, zero_features)
 
-# Explore a hyperparameter space. Skip the most expensive part of 
tuning,
-# increasing the # of trees, with target_node_evaluations=None
 tune_results = mjolnir.training.xgboost.tune(
 df_hits_with_features, num_folds=num_folds,
 num_cv_jobs=num_cv_jobs, num_workers=num_workers,
-target_node_evaluations=target_node_evaluations)
+initial_num_trees=initial_num_trees,
+final_num_trees=final_num_trees)
 
 print 'CV  test-ndcg@10: %.4f' % (tune_results['metrics']['cv-test'])
 print 'CV train-ndcg@10: %.4f' % (tune_results['metrics']['cv-train'])
@@ -131,11 +130,12 @@
 '-f', '--folds', dest='num_folds', default=5, type=int,
 help='Number of cross validation folds to use. (Default: 5)')
 parser.add_argument(
-'-n', '--node-evaluations', dest='target_node_evaluations', type=int, 
default=None,
-help='Approximate number of node evaluations per predication that '
- + 'the final result will require. This controls the number of '
- + 'trees used in the final result. Default uses 100 trees rather '
- + 'than dynamically choosing based on max_depth. (Default: None)')
+'--initial-trees', dest='initial_num_trees', default=100, type=int,
+help='Number of trees to perform hyperparamter tuning with.  (Default: 
100)')
+parser.add_argument(
+'--final-trees', dest='final_num_trees', default=None, type=int,
+help='Number of trees in the final ensemble. If not provided the value 
from '
+ + '--initial-trees will be used.  (Default: None)')
 parser.add_argument(
 '-t', '--test-path', dest='test_dir', type=str, required=False, 
default=None,
 help='A holdout test set to evaluate the final model against')
diff --git a/mjolnir/training/xgboost.py b/mjolnir/training/xgboost.py
index 487a619..c010fb0 100644
--- a/mjolnir/training/xgboost.py
+++ b/mjolnir/training/xgboost.py
@@ -403,7 +403,7 @@
 return eta_pred[idx]
 
 
-def tune(df, num_folds=5, num_cv_jobs=5, num_workers=5, 
target_node_evaluations=5000):
+def tune(df, num_folds=5, num_cv_jobs=5, num_workers=5, initial_num_trees=100, 
final_num_trees=500):
 """Find appropriate hyperparameters for training df
 
 This is far from perfect, hyperparameter tuning is a bit of a black art
@@ -432,13 +432,14 @@
 number of executors used will be (num_cv_jobs * num_workers). Generally
 prefer executors with more cpu's over a higher number of workers where
 possible. (Default: 5)
-target_node_evaluations : int, optional
-The approximate number of node evaluations per prediction that the
-final result will require. This controls the number of trees used in
-the final result. The number of trees will be (target_node_evaluations
-/ optimal_max_depth). This is by far the most expensive part to tune,
-setting to None skips this and uses a constant 100 trees.
-(Default: 5000)
+initial_num_trees: int, optional
+The number of trees to do most of the hyperparameter tuning with. This
+should be large enough to be resonably representative of the final
+training size. (Default: 100)
+final_num_trees: int, optional
+The number of trees to do the final eta optimization with. If set to
+None the final eta optimization will be skipped and initial_n_tree will
+be kept.
 
 Returns
 ---
@@ -482,7 +483,7 @@
 space = {
 'objec

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Temporary lift account creation limits for WM United Kingdom...

2017-09-12 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377481 )

Change subject: Temporary lift account creation limits for WM United Kingdom 
workshop
..

Temporary lift account creation limits for WM United Kingdom workshop

Bug: T175700
Change-Id: I35cd47b9e114dc21caffa8433ccc2e87c35e7b29
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/81/377481/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35cd47b9e114dc21caffa8433ccc2e87c35e7b29
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ui.TableLineContext: adjust positioning

2017-09-12 Thread DLynch (Code Review)

DLynch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377482 )

Change subject: ui.TableLineContext: adjust positioning
..

ui.TableLineContext: adjust positioning

a4a0be2da1 restored this rule to stop overlap with the table context. However, 
it causes problems in RTL. Adjust it so it still stops overlap, without RTL 
issues.

Bug: T175417
Change-Id: I48aa0a542dbc42399e5ae6a5e341600dbb19427c
---
M src/ui/styles/ve.ui.TableLineContext.css
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/82/377482/1

diff --git a/src/ui/styles/ve.ui.TableLineContext.css 
b/src/ui/styles/ve.ui.TableLineContext.css
index 1c781b0..d372ede 100644
--- a/src/ui/styles/ve.ui.TableLineContext.css
+++ b/src/ui/styles/ve.ui.TableLineContext.css
@@ -5,9 +5,8 @@
  */
 
 .ve-ui-tableLineContext {
-   position: absolute;
/* Ensure it is placed above the table context */
-   z-index: 2;
+   z-index: 3;
 }
 
 .ve-ui-tableLineContext-indicator {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48aa0a542dbc42399e5ae6a5e341600dbb19427c
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Microsecond view bug fixed, removing workaround

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377480 )

Change subject: mariadb: Microsecond view bug fixed, removing workaround
..


mariadb: Microsecond view bug fixed, removing workaround

See:
* https://jira.mariadb.org/browse/MDEV-9175
* https://bugs.mysql.com/bug.php?id=60628
* https://bugs.mysql.com/bug.php?id=78506

Change-Id: Ie274663397813669fcf65116c202fbc7c40fdbcf
---
M modules/role/files/labs/db/views/heartbeat-views.sql
1 file changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/modules/role/files/labs/db/views/heartbeat-views.sql 
b/modules/role/files/labs/db/views/heartbeat-views.sql
index ebc74f6..476b929 100644
--- a/modules/role/files/labs/db/views/heartbeat-views.sql
+++ b/modules/role/files/labs/db/views/heartbeat-views.sql
@@ -7,11 +7,8 @@
 DEFINER=`root`@`localhost`
 SQL SECURITY DEFINER VIEW
 `heartbeat_p`.`heartbeat` AS
-SELECT
-`shard` AS `shard`,
-max(`heartbeat`.`heartbeat`.`ts`) AS `last_updated`,
-timestampdiff(SECOND, max(`heartbeat`.`heartbeat`.`ts`), utc_timestamp()) AS 
`lag`
+SELECT shard` AS `shard`,
+   max(`heartbeat`.`heartbeat`.`ts`) AS `last_updated`,
+   greatest(timestampdiff(MICROSECOND, max(`heartbeat`.`heartbeat`.`ts`), 
utc_timestamp()), 0)/1000.0 AS `lag`
 FROM `heartbeat`.`heartbeat`
 GROUP BY `shard`;
--- Change SECOND precission to MICROSECOND when this bug disappears:
--- https://mariadb.atlassian.net/browse/MDEV-9175

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie274663397813669fcf65116c202fbc7c40fdbcf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Microsecond view bug fixed, removing workaround

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377480 )

Change subject: mariadb: Microsecond view bug fixed, removing workaround
..

mariadb: Microsecond view bug fixed, removing workaround

See:
* https://jira.mariadb.org/browse/MDEV-9175
* https://bugs.mysql.com/bug.php?id=60628
* https://bugs.mysql.com/bug.php?id=78506

Change-Id: Ie274663397813669fcf65116c202fbc7c40fdbcf
---
M modules/role/files/labs/db/views/heartbeat-views.sql
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/377480/1

diff --git a/modules/role/files/labs/db/views/heartbeat-views.sql 
b/modules/role/files/labs/db/views/heartbeat-views.sql
index ebc74f6..2e301b0 100644
--- a/modules/role/files/labs/db/views/heartbeat-views.sql
+++ b/modules/role/files/labs/db/views/heartbeat-views.sql
@@ -7,11 +7,8 @@
 DEFINER=`root`@`localhost`
 SQL SECURITY DEFINER VIEW
 `heartbeat_p`.`heartbeat` AS
-SELECT
-`shard` AS `shard`,
-max(`heartbeat`.`heartbeat`.`ts`) AS `last_updated`,
-timestampdiff(SECOND, max(`heartbeat`.`heartbeat`.`ts`), utc_timestamp()) AS 
`lag`
+SELECT shard` AS `shard`,
+   max(`heartbeat`.`heartbeat`.`ts`) AS `last_updated`,
+   greatest(timestampdiff(MICROSECOND, max(`heartbeat`.`heartbeat`.`ts`), 
utc_timestamp()), 0)/1000.0 AS `lag` 
 FROM `heartbeat`.`heartbeat`
 GROUP BY `shard`;
--- Change SECOND precission to MICROSECOND when this bug disappears:
--- https://mariadb.atlassian.net/browse/MDEV-9175

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Create a repository component component/ci

2017-09-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377469 )

Change subject: Create a repository component component/ci
..


Create a repository component component/ci

This will be used to co-installable PHP packages used by CI, they are not
needed outside of CI.

Change-Id: Ib0b5fbf74d5674ac1f15a30be55ef493014d9369
---
M modules/aptrepo/files/distributions-wikimedia
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index 1cc4040..de1ab98 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -20,7 +20,7 @@
 AlsoAcceptFor: jessie jessie-backports
 Version: 8
 Architectures: source amd64 i386
-Components: main backports thirdparty experimental thirdparty/cloudera
+Components: main backports thirdparty experimental thirdparty/cloudera 
component/ci
 UDebComponents: main backports thirdparty experimental
 Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent 
elastic elasticsearch-curator docker jenkins
 Description: Wikimedia packages for Debian Jessie

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0b5fbf74d5674ac1f15a30be55ef493014d9369
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Hashar 
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] mediawiki...Cargo[refs/meta/config]: Modify access rules

2017-09-12 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377479 )

Change subject: Modify access rules
..


Modify access rules

Change-Id: Ifbbd093e8c674d798d606189b7cc162137668a96
---
M groups
M project.config
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Yaron Koren: Verified; Looks good to me, approved



diff --git a/groups b/groups
index 3431003..95ac2b6 100644
--- a/groups
+++ b/groups
@@ -1,4 +1,4 @@
 # UUID Group Name
 #
 00e81940d4bb19f2b47decce47c41ea61a4b98f8   extension-Cargo
-user:paladox   user/Paladox (paladox)
+8eea013ea51fe2d03da1fb89d9cc39aeb7285df0   mediawiki-skins-Metrolook
diff --git a/project.config b/project.config
index fba944e..f74c2b8 100644
--- a/project.config
+++ b/project.config
@@ -8,6 +8,6 @@
mergeContent = true
 [access "refs/*"]
owner = group extension-Cargo
-   owner = group user/Paladox (paladox)
+   owner = group mediawiki-skins-Metrolook
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbbd093e8c674d798d606189b7cc162137668a96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: refs/meta/config
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: integration-composer-check-php55 to Nodepool and Jessie

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377478 )

Change subject: integration-composer-check-php55 to Nodepool and Jessie
..


integration-composer-check-php55 to Nodepool and Jessie

Delete integration-composer-check-php55
Create integration-composer-check-php55-jessie

Bug: T161882
Change-Id: Ida75ed8fd839e0017287778eed0782bafc32391a
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 12 insertions(+), 11 deletions(-)

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



diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index f965667..634da60 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -134,8 +134,8 @@
 
 # Super basic sanity check for integration/composer repo
 - job-template:
-name: 'integration-composer-check-{phpflavor}'
-node: contintLabsSlave && phpflavor-{phpflavor}
+name: 'integration-composer-check-{phpflavor}-{image}'
+node: ci-{image}-wikimedia
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 triggers:
@@ -143,6 +143,14 @@
 builders:
  - shell: |
 ./vendor/bin/composer --version
+
+- project:
+name: 'integration-composer'
+jobs:
+ - 'integration-composer-check-{phpflavor}-{image}':
+ phpflavor:
+ - php55:
+ image: jessie
 
 - job:
 name: integration-config-qa
@@ -214,10 +222,3 @@
 name: 'integration-docroot'
 jobs:
  - 'integration-docroot-deploy'
-
-- project:
-name: 'integration-composer'
-jobs:
- - 'integration-composer-check-{phpflavor}':
- phpflavor:
- - php55
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 44ae7cb..9d6f728 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1282,9 +1282,9 @@
 
   - name: integration/composer
 test:
-  - integration-composer-check-php55
+  - integration-composer-check-php55-jessie
 gate-and-submit:
-  - integration-composer-check-php55
+  - integration-composer-check-php55-jessie
 
   - name: integration/commit-message-validator
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida75ed8fd839e0017287778eed0782bafc32391a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[refs/meta/config]: Modify access rules

2017-09-12 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377479 )

Change subject: Modify access rules
..

Modify access rules

Change-Id: Ifbbd093e8c674d798d606189b7cc162137668a96
---
M groups
M project.config
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/79/377479/1

diff --git a/groups b/groups
index 3431003..95ac2b6 100644
--- a/groups
+++ b/groups
@@ -1,4 +1,4 @@
 # UUID Group Name
 #
 00e81940d4bb19f2b47decce47c41ea61a4b98f8   extension-Cargo
-user:paladox   user/Paladox (paladox)
+8eea013ea51fe2d03da1fb89d9cc39aeb7285df0   mediawiki-skins-Metrolook
diff --git a/project.config b/project.config
index fba944e..f74c2b8 100644
--- a/project.config
+++ b/project.config
@@ -8,6 +8,6 @@
mergeContent = true
 [access "refs/*"]
owner = group extension-Cargo
-   owner = group user/Paladox (paladox)
+   owner = group mediawiki-skins-Metrolook
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbbd093e8c674d798d606189b7cc162137668a96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: refs/meta/config
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nagios_common: use the template if empty($content)

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377445 )

Change subject: nagios_common: use the template if empty($content)
..


nagios_common: use the template if empty($content)

We currently use a stock template if $content is undef, but $content is
set to secret('nagios/contacts.cfg') in the role class, which may return
'' in a test environment and seems to vary between current and future
parser. Change the if to vary on $content being empty() as well.

Change-Id: I5fc26b00f2314bc27fb2d1ba7110ba1040439ef1
---
M modules/monitoring/.fixtures.yml
M modules/nagios_common/.fixtures.yml
M modules/nagios_common/manifests/contacts.pp
3 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/monitoring/.fixtures.yml b/modules/monitoring/.fixtures.yml
index dc4f9cc..b2567a1 100644
--- a/modules/monitoring/.fixtures.yml
+++ b/modules/monitoring/.fixtures.yml
@@ -6,3 +6,4 @@
 wmflib: "../../../../wmflib"
 logrotate: "../../../../logrotate"
 elasticsearch: "../../../../elasticsearch"
+stdlib: "../../../../stdlib"
diff --git a/modules/nagios_common/.fixtures.yml 
b/modules/nagios_common/.fixtures.yml
index 1cde35d..b8a4937 100644
--- a/modules/nagios_common/.fixtures.yml
+++ b/modules/nagios_common/.fixtures.yml
@@ -1,3 +1,4 @@
 fixtures:
 symlinks:
 nagios_common: "#{source_dir}"
+stdlib: "../../../../stdlib"
diff --git a/modules/nagios_common/manifests/contacts.pp 
b/modules/nagios_common/manifests/contacts.pp
index 7977b7e..a767645 100644
--- a/modules/nagios_common/manifests/contacts.pp
+++ b/modules/nagios_common/manifests/contacts.pp
@@ -47,7 +47,7 @@
 show_diff => false,
 }
 } else {
-if ($content == undef) {
+if ($content == undef or empty($content)) {
 $real_content = template('nagios_common/contacts.cfg.erb')
 } else {
 $real_content = $content

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fc26b00f2314bc27fb2d1ba7110ba1040439ef1
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
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] integration/config[master]: integration-composer-check-php55 to Nodepool and Jessie

2017-09-12 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377478 )

Change subject: integration-composer-check-php55 to Nodepool and Jessie
..

integration-composer-check-php55 to Nodepool and Jessie

Delete integration-composer-check-php55
Create integration-composer-check-php55-jessie

Bug: T161882
Change-Id: Ida75ed8fd839e0017287778eed0782bafc32391a
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 12 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/78/377478/1

diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index f965667..634da60 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -134,8 +134,8 @@
 
 # Super basic sanity check for integration/composer repo
 - job-template:
-name: 'integration-composer-check-{phpflavor}'
-node: contintLabsSlave && phpflavor-{phpflavor}
+name: 'integration-composer-check-{phpflavor}-{image}'
+node: ci-{image}-wikimedia
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 triggers:
@@ -143,6 +143,14 @@
 builders:
  - shell: |
 ./vendor/bin/composer --version
+
+- project:
+name: 'integration-composer'
+jobs:
+ - 'integration-composer-check-{phpflavor}-{image}':
+ phpflavor:
+ - php55:
+ image: jessie
 
 - job:
 name: integration-config-qa
@@ -214,10 +222,3 @@
 name: 'integration-docroot'
 jobs:
  - 'integration-docroot-deploy'
-
-- project:
-name: 'integration-composer'
-jobs:
- - 'integration-composer-check-{phpflavor}':
- phpflavor:
- - php55
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 44ae7cb..9d6f728 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1282,9 +1282,9 @@
 
   - name: integration/composer
 test:
-  - integration-composer-check-php55
+  - integration-composer-check-php55-jessie
 gate-and-submit:
-  - integration-composer-check-php55
+  - integration-composer-check-php55-jessie
 
   - name: integration/commit-message-validator
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida75ed8fd839e0017287778eed0782bafc32391a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer-validate jobs to Jessie

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377477 )

Change subject: Migrate composer-validate jobs to Jessie
..


Migrate composer-validate jobs to Jessie

Update:
composer-package-validate
composer-validate
mwgate-composer-validate

Bug: T161882
Change-Id: Ib00d0eaf5a81b15034c479b141dd7f5b07faf037
---
M jjb/php.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/jjb/php.yaml b/jjb/php.yaml
index 78f1c3f..7fefde1 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -34,7 +34,7 @@
 # Includes full validation that packagist.org requires.
 - job:
 name: composer-package-validate
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 
@@ -50,7 +50,7 @@
 # published on packagist.org.
 - job: &job_composer-validate
 name: composer-validate
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib00d0eaf5a81b15034c479b141dd7f5b07faf037
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer-validate jobs to Jessie

2017-09-12 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377477 )

Change subject: Migrate composer-validate jobs to Jessie
..

Migrate composer-validate jobs to Jessie

Update:
composer-package-validate
composer-validate
mwgate-composer-validate

Bug: T161882
Change-Id: Ib00d0eaf5a81b15034c479b141dd7f5b07faf037
---
M jjb/php.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/77/377477/1

diff --git a/jjb/php.yaml b/jjb/php.yaml
index 78f1c3f..7fefde1 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -34,7 +34,7 @@
 # Includes full validation that packagist.org requires.
 - job:
 name: composer-package-validate
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 
@@ -50,7 +50,7 @@
 # published on packagist.org.
 - job: &job_composer-validate
 name: composer-validate
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib00d0eaf5a81b15034c479b141dd7f5b07faf037
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: dib: remove Ubuntu Trusty

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377475 )

Change subject: dib: remove Ubuntu Trusty
..


dib: remove Ubuntu Trusty

Leave an OS variant to have php5.5 on jessie.

Bug: T175696
Change-Id: If91bb7dd356739700f406bbc55c679974fb10c0c
---
M dib/README.md
M dib/build_image.sh
M dib/puppet/ciimage.pp
3 files changed, 84 insertions(+), 100 deletions(-)

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



diff --git a/dib/README.md b/dib/README.md
index 9a86b83..47797f0 100644
--- a/dib/README.md
+++ b/dib/README.md
@@ -14,9 +14,5 @@
 
 And maybe you will have a qcow2 image build!
 
-To build an Ubuntu Trusty image:
-
-   ./build_image.sh ubuntu
-
 See upstream documentation:
 http://docs.openstack.org/developer/diskimage-builder/
diff --git a/dib/build_image.sh b/dib/build_image.sh
index cf2b812..72ed724 100755
--- a/dib/build_image.sh
+++ b/dib/build_image.sh
@@ -21,14 +21,9 @@
# base::service_unit from installing services. T129320
export FACTER_initsystem='systemd'
;;
-   ubuntu)
-   distribution_elements=('ubuntu')
-   export DIB_RELEASE=${DIB_RELEASE:-trusty}
-   export FACTER_initsystem='upstart'
-   ;;
* | 0)
echo "Fatal: Linux distribution not recognized."
-   echo "Usage: $0 "
+   echo "Usage: $0 "
exit 1
 esac
 DIB_DISTRIBUTION=$1
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 7c2450b..db1dc84 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -30,10 +30,8 @@
 package { 'cron':
 ensure => present,
 }
-if os_version('debian >= jessie') {
-class { '::contint::hhvm':
-require => Package['cron'],
-}
+class { '::contint::hhvm':
+require => Package['cron'],
 }
 
 include contint::packages::javascript
@@ -105,15 +103,13 @@
 include contint::packages::ruby
 
 # Install from gem
-if os_version('debian >= jessie') {
-package { 'jsduck':
-ensure   => present,
-provider => 'gem',
-require  => [
-Class['::contint::packages::ruby'],
-Package['build-essential'],
-],
-}
+package { 'jsduck':
+ensure   => present,
+provider => 'gem',
+require  => [
+Class['::contint::packages::ruby'],
+Package['build-essential'],
+],
 }
 
 # Overrides
@@ -135,75 +131,74 @@
   command => '/bin/chmod +x /usr/sbin/apache2',
   }
 }
-if os_version('debian >= jessie') {
-include contint::packages::doxygen
-include contint::packages::java
-include contint::packages::python
 
-# Qunit/Selenium related
-include contint::browsers
+include contint::packages::doxygen
+include contint::packages::java
+include contint::packages::python
+
+# Qunit/Selenium related
+include contint::browsers
 
 
-# FIXME: hack, our manifests no more ship libapache2-mod-php5
-# See T144802
-include ::apache::mod::php5
+# FIXME: hack, our manifests no more ship libapache2-mod-php5
+# See T144802
+include ::apache::mod::php5
 
-# For Selenium jobs video recording (T113520)
-require_package('libav-tools')
+# For Selenium jobs video recording (T113520)
+require_package('libav-tools')
 
-class { 'contint::worker_localhost':
-owner => 'jenkins',
-}
-
-# Augeas rule deals with /etc/logrotate.d/apache2
-# Sent to puppet.git https://gerrit.wikimedia.org/r/#/c/291024/
-Package['apache2'] ~> Augeas['Apache2 logs']
-
-# Nasty workaround when running inside a chroot...
-exec { 'prevent apache2 from executing':
-  refreshonly => true,
-  command => '/bin/chmod -x /usr/sbin/apache2',
-  onlyif  => '/bin/bash -c "export | grep DIB_"',
-  subscribe   => Package['apache2'],
-  before  => [
-Service['apache2'],
-Exec['apache2_hard_restart'],
-  ],
-  require => [
-Exec['apache2_test_config_and_restart'],
-  ],
-}
-
-stage { 'last': }
-Stage['main'] -> Stage['last']
-
-class { 'apache2_allow_execution':
-stage => last,
-}
-
-# services packages and -dev packages for npm modules compilation and test
-# run.
-# Used to be in services::packages but that is no more supported until a
-# solution is found in operations/puppet.git
-
-# graphoid
-require_package([
-'libcairo2', 'libgif4', 'libjpeg62-turbo', 'libpango1.0-0',
-'libcairo2-dev', 'libgif-dev', 'libpango1.0-dev', 
'libjpeg62-turbo-dev',
-])
-
-# mathoid
-require_package([
-'librsvg2-2',
-'librsvg2-dev',
-])
-
-# trendingedits
-require_package([
-'librdkafka++1', 'librdkafka1',
-'librdkafka-dev',
-])
+class { 'contint::worker_localhost':
+owner => 'jenkins',
 }
+
+# Augeas rule deals with /etc/logrotate.d/apache2
+# Sen

[MediaWiki-commits] [Gerrit] operations/puppet[production]: grafana: quote 'type' as the class' parameter

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377444 )

Change subject: grafana: quote 'type' as the class' parameter
..


grafana: quote 'type' as the class' parameter

As type is a reserved word in the future parser and can't appear as a
bareword.

Change-Id: Ifbb9a3b91222e00dca8fabe7208b12585ce64564
---
M modules/role/manifests/grafana/base.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/grafana/base.pp 
b/modules/role/manifests/grafana/base.pp
index 8df412a..ba5c255 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/role/manifests/grafana/base.pp
@@ -40,8 +40,8 @@
 # Grafana needs a database to store users and dashboards.
 # sqlite3 is the default, and it's perfectly adequate.
 'database'   => {
-type => 'sqlite3',
-path => 'grafana.db',
+'type' => 'sqlite3',
+'path' => 'grafana.db',
 },
 
 'security'   => {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbb9a3b91222e00dca8fabe7208b12585ce64564
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
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] mediawiki/core[master]: Update padding of mw-ui-input to match OOUI

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377466 )

Change subject: Update padding of mw-ui-input to match OOUI
..


Update padding of mw-ui-input to match OOUI

Change-Id: I85c7044666be41a9baa52e8f7ba019a96dac4a6b
---
M resources/src/mediawiki.ui/components/inputs.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.ui/components/inputs.less 
b/resources/src/mediawiki.ui/components/inputs.less
index cc9c65a..74dc0b7 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -29,7 +29,7 @@
width: 100%;
border: 1px solid @colorFieldBorder;
border-radius: @borderRadius;
-   padding: 0.625em 0.546875em 0.546875em;
+   padding: 0.625em 0.625em 0.546875em;
// necessary for smooth transition
box-shadow: inset 0 0 0 0.1em #fff;
font-family: inherit;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85c7044666be41a9baa52e8f7ba019a96dac4a6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nodepool: remove trusty image

2017-09-12 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377476 )

Change subject: nodepool: remove trusty image
..

nodepool: remove trusty image

We no more use it. The last use was for the PHP 5.5 jobs which are now
running on Jessie.

Bug: T175696
Change-Id: I0653636060d29f70039516be37eb05a842816444
---
M modules/nodepool/templates/nodepool.yaml.erb
1 file changed, 0 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/377476/1

diff --git a/modules/nodepool/templates/nodepool.yaml.erb 
b/modules/nodepool/templates/nodepool.yaml.erb
index 99e1885..e4aa398 100644
--- a/modules/nodepool/templates/nodepool.yaml.erb
+++ b/modules/nodepool/templates/nodepool.yaml.erb
@@ -66,12 +66,6 @@
 min-ready: 12
 providers:
   - name: wmflabs-eqiad
-  - name: ci-trusty-wikimedia
-image: snapshot-ci-trusty
-ready-script: ready.sh
-min-ready: 2
-providers:
-  - name: wmflabs-eqiad
 
 providers:
   - name: wmflabs-eqiad
@@ -94,13 +88,6 @@
   # RelEng manually build and upload the images to Glance
   - name: snapshot-ci-jessie
 base-image: image-ci-jessie
-min-ram: 0
-name-filter: 'm1.medium'
-setup: setup_node.sh
-username: jenkins
-private-key: /var/lib/nodepool/.ssh/id_rsa
-  - name: snapshot-ci-trusty
-base-image: image-ci-trusty
 min-ram: 0
 name-filter: 'm1.medium'
 setup: setup_node.sh

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: move $ssl_settings near the template

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377442 )

Change subject: openstack: move $ssl_settings near the template
..


openstack: move $ssl_settings near the template

As passing it down from role::labs::openstack::nova::manager to
openstack::openstack_manager without scoping it is not supported in the
future parser.

Change-Id: I1b96beef7b18bad3ff2d008e83cf307cf9ebecec
---
M modules/openstack/manifests/openstack_manager.pp
M modules/role/manifests/labs/openstack/nova/manager.pp
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/modules/openstack/manifests/openstack_manager.pp 
b/modules/openstack/manifests/openstack_manager.pp
index 247993c..3e026c7 100644
--- a/modules/openstack/manifests/openstack_manager.pp
+++ b/modules/openstack/manifests/openstack_manager.pp
@@ -59,6 +59,7 @@
 'wikitech.wikimedia.org'=> '208.80.154.136',
 'labtestwikitech.wikimedia.org' => '208.80.153.14'
 }
+$ssl_settings = ssl_ciphersuite('apache', 'compat', true)
 apache::site { $webserver_hostname:
 content => template('openstack/common/wikitech.wikimedia.org.erb'),
 }
diff --git a/modules/role/manifests/labs/openstack/nova/manager.pp 
b/modules/role/manifests/labs/openstack/nova/manager.pp
index 3b4e898..137d998 100644
--- a/modules/role/manifests/labs/openstack/nova/manager.pp
+++ b/modules/role/manifests/labs/openstack/nova/manager.pp
@@ -27,8 +27,6 @@
 check_command => "check_ssl_http_letsencrypt!${sitename}",
 }
 
-$ssl_settings = ssl_ciphersuite('apache', 'compat', true)
-
 ferm::service { 'wikitech_http':
 proto => 'tcp',
 port  => '80',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b96beef7b18bad3ff2d008e83cf307cf9ebecec
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Alex Monk 
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] integration/config[master]: dib: remove Ubuntu Trusty

2017-09-12 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377475 )

Change subject: dib: remove Ubuntu Trusty
..

dib: remove Ubuntu Trusty

Leave an OS variant to have php5.5 on jessie.

Bug: T175696
Change-Id: If91bb7dd356739700f406bbc55c679974fb10c0c
---
M dib/README.md
M dib/build_image.sh
M dib/puppet/ciimage.pp
3 files changed, 84 insertions(+), 100 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/75/377475/1

diff --git a/dib/README.md b/dib/README.md
index 9a86b83..47797f0 100644
--- a/dib/README.md
+++ b/dib/README.md
@@ -14,9 +14,5 @@
 
 And maybe you will have a qcow2 image build!
 
-To build an Ubuntu Trusty image:
-
-   ./build_image.sh ubuntu
-
 See upstream documentation:
 http://docs.openstack.org/developer/diskimage-builder/
diff --git a/dib/build_image.sh b/dib/build_image.sh
index cf2b812..72ed724 100755
--- a/dib/build_image.sh
+++ b/dib/build_image.sh
@@ -21,14 +21,9 @@
# base::service_unit from installing services. T129320
export FACTER_initsystem='systemd'
;;
-   ubuntu)
-   distribution_elements=('ubuntu')
-   export DIB_RELEASE=${DIB_RELEASE:-trusty}
-   export FACTER_initsystem='upstart'
-   ;;
* | 0)
echo "Fatal: Linux distribution not recognized."
-   echo "Usage: $0 "
+   echo "Usage: $0 "
exit 1
 esac
 DIB_DISTRIBUTION=$1
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 7c2450b..db1dc84 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -30,10 +30,8 @@
 package { 'cron':
 ensure => present,
 }
-if os_version('debian >= jessie') {
-class { '::contint::hhvm':
-require => Package['cron'],
-}
+class { '::contint::hhvm':
+require => Package['cron'],
 }
 
 include contint::packages::javascript
@@ -105,15 +103,13 @@
 include contint::packages::ruby
 
 # Install from gem
-if os_version('debian >= jessie') {
-package { 'jsduck':
-ensure   => present,
-provider => 'gem',
-require  => [
-Class['::contint::packages::ruby'],
-Package['build-essential'],
-],
-}
+package { 'jsduck':
+ensure   => present,
+provider => 'gem',
+require  => [
+Class['::contint::packages::ruby'],
+Package['build-essential'],
+],
 }
 
 # Overrides
@@ -135,75 +131,74 @@
   command => '/bin/chmod +x /usr/sbin/apache2',
   }
 }
-if os_version('debian >= jessie') {
-include contint::packages::doxygen
-include contint::packages::java
-include contint::packages::python
 
-# Qunit/Selenium related
-include contint::browsers
+include contint::packages::doxygen
+include contint::packages::java
+include contint::packages::python
+
+# Qunit/Selenium related
+include contint::browsers
 
 
-# FIXME: hack, our manifests no more ship libapache2-mod-php5
-# See T144802
-include ::apache::mod::php5
+# FIXME: hack, our manifests no more ship libapache2-mod-php5
+# See T144802
+include ::apache::mod::php5
 
-# For Selenium jobs video recording (T113520)
-require_package('libav-tools')
+# For Selenium jobs video recording (T113520)
+require_package('libav-tools')
 
-class { 'contint::worker_localhost':
-owner => 'jenkins',
-}
-
-# Augeas rule deals with /etc/logrotate.d/apache2
-# Sent to puppet.git https://gerrit.wikimedia.org/r/#/c/291024/
-Package['apache2'] ~> Augeas['Apache2 logs']
-
-# Nasty workaround when running inside a chroot...
-exec { 'prevent apache2 from executing':
-  refreshonly => true,
-  command => '/bin/chmod -x /usr/sbin/apache2',
-  onlyif  => '/bin/bash -c "export | grep DIB_"',
-  subscribe   => Package['apache2'],
-  before  => [
-Service['apache2'],
-Exec['apache2_hard_restart'],
-  ],
-  require => [
-Exec['apache2_test_config_and_restart'],
-  ],
-}
-
-stage { 'last': }
-Stage['main'] -> Stage['last']
-
-class { 'apache2_allow_execution':
-stage => last,
-}
-
-# services packages and -dev packages for npm modules compilation and test
-# run.
-# Used to be in services::packages but that is no more supported until a
-# solution is found in operations/puppet.git
-
-# graphoid
-require_package([
-'libcairo2', 'libgif4', 'libjpeg62-turbo', 'libpango1.0-0',
-'libcairo2-dev', 'libgif-dev', 'libpango1.0-dev', 
'libjpeg62-turbo-dev',
-])
-
-# mathoid
-require_package([
-'librsvg2-2',
-'librsvg2-dev',
-])
-
-# trendingedits
-require_package([
-'librdkafka++1', 'librdkafka1',
-'librdkafka-dev',
-])
+class { 'contint::worker_localhost':
+owner => 'jenkins',
 }
+
+# Augeas rule deals with /etc/logrotate.d/apache2
+#

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: fix class dependencies

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377441 )

Change subject: ganglia: fix class dependencies
..


ganglia: fix class dependencies

Depend on Class['::ganglia::web'] instead of Class['ganglia::web']
from role::ganglia::web, as in the current parser Class['ganglia::web']
is ambiguous and in this case, refers to role::ganglia::web.

Change-Id: I47e7727bdb05c3dfbfbc6f334f255456885c7cc5
---
M modules/role/manifests/ganglia/web.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/ganglia/web.pp 
b/modules/role/manifests/ganglia/web.pp
index dd49adc..76db02e 100644
--- a/modules/role/manifests/ganglia/web.pp
+++ b/modules/role/manifests/ganglia/web.pp
@@ -97,6 +97,6 @@
 backup::set { 'var-lib-ganglia': }
 backup::set { 'srv-ganglia': }
 
-Class['ganglia::gmetad::rrdcached'] -> Class['ganglia::gmetad']
-Class['ganglia::gmetad'] -> Class['ganglia::web']
+Class['ganglia::gmetad::rrdcached'] -> Class['::ganglia::gmetad']
+Class['ganglia::gmetad'] -> Class['::ganglia::web']
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47e7727bdb05c3dfbfbc6f334f255456885c7cc5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
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] operations/puppet[production]: mariadb: Move db1059 from mediawiki to misc (m3)

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377474 )

Change subject: mariadb: Move db1059 from mediawiki to misc (m3)
..

mariadb: Move db1059 from mediawiki to misc (m3)

Bug: T175679
Change-Id: Ib0f3012f36feaa00fb428a550c8ee3f20dc8faf2
---
D hieradata/hosts/db1059.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
M modules/role/files/prometheus/mysql-misc_eqiad.yaml
6 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/377474/1

diff --git a/hieradata/hosts/db1059.yaml b/hieradata/hosts/db1059.yaml
deleted file mode 100644
index 7db8adb..000
--- a/hieradata/hosts/db1059.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mariadb::shard: 's4'
diff --git a/manifests/site.pp b/manifests/site.pp
index b23a2af..37e2e16 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -412,7 +412,7 @@
 role(mariadb::core)
 }
 
-node /^db10(53|56|59|64|81|84|91|97)\.eqiad\.wmnet/ {
+node /^db10(53|56|64|81|84|91|97)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
@@ -600,6 +600,11 @@
 shard => 'm3',
 }
 }
+node 'db1059.eqiad.wmnet' {
+class { '::role::mariadb::misc::phabricator':
+shard => 'm3',
+}
+}
 
 node 'db2012.codfw.wmnet' {
 class { '::role::mariadb::misc::phabricator':
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 1ccc40f..1588d63 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -64,7 +64,7 @@
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
-db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \
+db1059|db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \
 db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
 deploy[12]001) echo partman/raid1-lvm-ext4-srv-noswap.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 d5a2fcc..3876171 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1091,6 +1091,8 @@
 host db1059 {
 hardware ethernet 90:B1:1C:2A:D3:AE;
 fixed-address db1059.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db1060 {
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index e91b2d5..9b10182 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -56,7 +56,6 @@
   targets:
   - db1053:9104
   - db1056:9104
-  - db1059:9104
   - db1064:9104
   - db1081:9104
   - db1084:9104
diff --git a/modules/role/files/prometheus/mysql-misc_eqiad.yaml 
b/modules/role/files/prometheus/mysql-misc_eqiad.yaml
index 7da08c5..9ea7d6e 100644
--- a/modules/role/files/prometheus/mysql-misc_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-misc_eqiad.yaml
@@ -20,13 +20,14 @@
 shard: m3
 role: master
   targets:
-  - db1048:9104
+  - db1043:9104
 
 - labels:
 shard: m3
 role: slave
   targets:
-  - db1043:9104
+  - db1048:9104
+  - db1059:9104
 
 - labels:
 shard: m4

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: New 'abusefilter-helper' configuration for en.wikipedia

2017-09-12 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377473 )

Change subject: New 'abusefilter-helper' configuration for en.wikipedia
..

New 'abusefilter-helper' configuration for en.wikipedia

* Create a new 'abusefilter-helper' user right.
* Add permissions: abusefilter-view-private and spamblacklistlog
* Can be granted and removed by administrators

AbuseFilter permissions are managed at abusefilter.php file, and all
others on InitialiseSettings.php.

Bug: T175684
Change-Id: Ifda84cb74ff81e710cb8660dc8aa8caccf244455
---
M wmf-config/InitialiseSettings.php
M wmf-config/abusefilter.php
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/73/377473/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9db6fd7..89d603a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8278,6 +8278,7 @@
],
'founder' => [ 'userrights' => true ],
'rollbacker' => [ 'rollback' => true ],
+   'abusefilter-helper' => [ 'spamblacklistlog' => true ], // 
T175684
'accountcreator' => [
'override-antispoof' => true,
'tboverride-account' => true,
@@ -9873,7 +9874,7 @@
],
'+enwiki' => [
'bureaucrat' => [ 'accountcreator', 'flow-bot' ],
-   'sysop' => [ 'abusefilter', 'accountcreator', 'autoreviewer', 
'confirmed', 'filemover', 'reviewer', 'rollbacker', 'templateeditor', 
'massmessage-sender', 'extendedconfirmed', 'extendedmover', 'patroller' ], // 
T126607, T133981, T149019
+   'sysop' => [ 'abusefilter', 'abusefilter-helper', 
'accountcreator', 'autoreviewer', 'confirmed', 'filemover', 'reviewer', 
'rollbacker', 'templateeditor', 'massmessage-sender', 'extendedconfirmed', 
'extendedmover', 'patroller' ], // T126607, T133981, T149019, T175684
],
'+enwikibooks' => [
'sysop' => [ 'transwiki', 'uploader' ],
@@ -10618,7 +10619,7 @@
],
'+enwiki' => [
'bureaucrat' => [ 'ipblock-exempt', 'accountcreator', 'sysop', 
'flow-bot' ],
-   'sysop' => [ 'rollbacker', 'accountcreator', 'abusefilter', 
'autoreviewer', 'confirmed', 'reviewer', 'filemover', 'templateeditor', 
'massmessage-sender', 'extendedconfirmed', 'extendedmover', 'patroller' ], // 
T126607, T133981, T149019
+   'sysop' => [ 'rollbacker', 'accountcreator', 'abusefilter', 
'abusefilter-helper', 'autoreviewer', 'confirmed', 'reviewer', 'filemover', 
'templateeditor', 'massmessage-sender', 'extendedconfirmed', 'extendedmover', 
'patroller' ], // T126607, T133981, T149019, T175684
],
'+enwikibooks' => [
'sysop' => [ 'transwiki', 'uploader', ],
diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index fdee4c9..e8170e3 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -104,6 +104,7 @@
$wgGroupPermissions['*']['abusefilter-log-detail'] = true;
$wgGroupPermissions['sysop']['abusefilter-revert'] = true;
$wgGroupPermissions['sysop']['abusefilter-view-private'] = true;
+   
$wgGroupPermissions['abusefilter-helper']['abusefilter-view-private'] = true; 
// T175684
$wgAbuseFilterNotificationsPrivate = true; // T46045
break;
case 'enwikibooks':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda84cb74ff81e710cb8660dc8aa8caccf244455
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin::data.yaml: Set cwdent to ldap user only

2017-09-12 Thread Elukey (Code Review)

Elukey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377472 )

Change subject: admin::data.yaml: Set cwdent to ldap user only
..

admin::data.yaml: Set cwdent to ldap user only

Bug: T170878
Change-Id: Ib5c54c791d4ca99d6944b0e52eacc4df7abf74a6
---
M modules/admin/data/data.yaml
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/377472/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 9044fcc..d4e6ced 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -8,7 +8,7 @@
   manybubbles, haithams, jzerebecki, ashwinpp, robla, asherman,
   laner, declerambaul, srijan, junikowski, krenair, springle, 
jhobs, vbaranetsky,
   yurik, bsimmers, bcohn, hjiang, tomasz, csteipp, zareen, 
jgirault, ellery,
-  psinger, midom, tparscal, dworley, ironholds, moushira, 
lpintscher, gpaumier]
+  psinger, midom, tparscal, dworley, ironholds, moushira, 
lpintscher, gpaumier, cwdent]
   absent_ldap:
 description: meta group for absented users which had privileged LDAP 
access in the past
 members: [siddharth11, adavenport]
@@ -233,7 +233,7 @@
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
 members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak,
-  halfak, dr0ptp4kt, bearloga, cwdent, elukey, gwicke, ppchelko,
+  halfak, dr0ptp4kt, bearloga, elukey, gwicke, ppchelko,
   nuria, otto, deskana, zhousquared, arnad, jgonsior,
   bsitzmann, dbrant, nettrom, leila,
   ezachte, mforns, reedy, west1, phuedx, awight,
@@ -2027,11 +2027,11 @@
 uid: 2501
 email: bdziewon...@wikimedia.org
   cwdent:
-ensure: present
+ensure: absent
 gid: 500
 name: cwdent
 realname: Casey Dentinger
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDhB5NxsYxf82q8N2/xUZXRUJNlgUB8moiLxFnrS8989pXs4wiilEFpYgMIZ0V30lu7xIeHzCWdJYEq0ySeQ8Wm5BVdM8APpiLZ4YNheG+gTtRaESSjyj6x/VcCxLjiXwzuXSEikmwXKhXeVFIO8s2FaOrb3JYizaWJxbA6DAQiD3ILR8pjuJtaUkZcmVO86qjdOFGqeRMMB1kVye9JYDRYow8QM13v0TDeP+5EY+6yTG5jlGNscTwYO6Xn/BPi+LS/X1AJYQ6qmWjUky3g6TJEREDmpZBmSfl5bGWBVohOZLuQWTxXAuQ/a5tuCbF+fVsJLZv4dRlEINgxyuEbTSwN]
+ssh_keys: []
 uid: 12179
 email: cdentin...@wikimedia.org
   ema:
@@ -2605,6 +2605,10 @@
 ensure: present
 realname: Corey Floyd
 email: cfl...@wikimedia.org
+  cwdent:
+ensure: present
+realname: Casey Dentinger
+email: cdentin...@wikimedia.org
   ferdbold:
 ensure: present
 realname: Frederic Bolduc

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Remove all references of db1059 from mediawiki

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377468 )

Change subject: mariadb: Remove all references of db1059 from mediawiki
..


mariadb: Remove all references of db1059 from mediawiki

Bug: T175679
Change-Id: I07fccfe5cd9130b6fa161f41375745548a54ece0
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index cc51217..7492149 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -466,7 +466,6 @@
'db1054' => '10.64.0.206', # do not remove or comment out
'db1055' => '10.64.32.25', # do not remove or comment out
'db1056' => '10.64.32.26', # do not remove or comment out
-   'db1059' => '10.64.32.29', # do not remove or comment out
'db1060' => '10.64.32.30', # do not remove or comment out
'db1061' => '10.64.32.227', # do not remove or comment out
'db1062' => '10.64.48.15', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 37af111..3f294e8 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -476,7 +476,6 @@
'db1054' => '10.64.0.206', # do not remove or comment out
'db1055' => '10.64.32.25', # do not remove or comment out
'db1056' => '10.64.32.26', # do not remove or comment out
-   'db1059' => '10.64.32.29', # do not remove or comment out
'db1060' => '10.64.32.30', # do not remove or comment out
'db1061' => '10.64.32.227', # do not remove or comment out
'db1062' => '10.64.48.15', # do not remove or comment out

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07fccfe5cd9130b6fa161f41375745548a54ece0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: Remove db1069 & dbstore2001 from the list of...

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373309 )

Change subject: install_server: Remove db1069 & dbstore2001 from the list of 
reimaging
..


install_server: Remove db1069 & dbstore2001 from the list of reimaging

db1069 and dbstore2001 have been reimagened as jessie/stretch. Do
not reimage them again by accident.

Change-Id: I7fe42cdf3bb24d33fc4d8b49ef24433654e94bf7
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index cb3dc01..1ccc40f 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -64,8 +64,8 @@
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
-db109[6-9]|db110[0-6]|db1069) echo partman/db.cfg ;; \
-db207[1-9]|db208[0-9]|db209[0-2]|dbstore2001) echo partman/db.cfg ;; \
+db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \
+db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
 deploy[12]001) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 d-i-test) echo partman/flat.cfg virtual.cfg ;; \

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Trigger proper undo/redo when inputType=historyUndo/Redo

2017-09-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377471 )

Change subject: Trigger proper undo/redo when inputType=historyUndo/Redo
..

Trigger proper undo/redo when inputType=historyUndo/Redo

Bug: T175634
Change-Id: Ic0bcec267a021ccdc9285ec9713eb82dd2fb0c42
---
M src/ce/ve.ce.Surface.js
1 file changed, 21 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/71/377471/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 6a7fb06..693fcf5 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -280,6 +280,19 @@
 ];
 
 /**
+ * Values of InputEvent.inputType which map to a history action
+ *
+ * These are used when the user selects undo/redo from the context
+ * menu in Chrome.
+ *
+ * @type {Object}
+ */
+ve.ce.Surface.static.historyEvents = {
+   historyUndo: 'undo',
+   historyRedo: 'redo'
+};
+
+/**
  * Cursor holder template
  *
  * @static
@@ -2439,7 +2452,14 @@
  * @method
  * @param {jQuery.Event} e The input event
  */
-ve.ce.Surface.prototype.onDocumentInput = function () {
+ve.ce.Surface.prototype.onDocumentInput = function ( e ) {
+   var inputType = e.originalEvent.inputType;
+
+   if ( inputType && inputType in this.constructor.static.historyEvents ) {
+   this.getSurface().executeCommand( 
this.constructor.static.historyEvents[ inputType ] );
+   e.preventDefault();
+   return;
+   }
this.incRenderLock();
try {
this.surfaceObserver.pollOnce();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0bcec267a021ccdc9285ec9713eb82dd2fb0c42
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Move some jobs from Trusty to Jessie

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377467 )

Change subject: Move some jobs from Trusty to Jessie
..


Move some jobs from Trusty to Jessie

Update jobs that run on permanent slaves:
jsduck
mediawiki-core-jsduck
mediawiki-vendor-composer-security
mwext-CirrusSearch-whitespaces
mwext-VisualEditor-jsduck
mwgate-jsduck
operations-dns-tabs
operations-mw-config-typos

jsduck is available there and grep has a sufficient version.

Bug: T161882
Change-Id: I26d982bfc2c6eba3b1986935a9b799433dc5
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
M jjb/misc.yaml
M jjb/php.yaml
5 files changed, 7 insertions(+), 8 deletions(-)

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



diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 2f85d87..89a8bad 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -1,7 +1,7 @@
 # Generic job-templates
 - job:
 name: 'jsduck'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 triggers:
@@ -14,7 +14,7 @@
 # used as workaround.
 - job-template:
 name: '{name}-jsduck'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remoteonly-zuul
 concurrent: true
 triggers:
@@ -188,7 +188,7 @@
 name: '{name}-tabs'
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 triggers:
  - zuul
 builders:
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index dd12da0..83264c3 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -222,7 +222,7 @@
 
 - job-template:
 name: 'mwext-{name}-whitespaces'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remoteonly-zuul
 concurrent: true
 properties:
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 92a43fb..2c7ab9b 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -55,7 +55,7 @@
 
 - job-template:
 name: 'mediawiki-core-jsduck'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 properties:
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index e47bdbd..baddfaf 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -346,8 +346,7 @@
 # Find out common typos in any files based on list of typos in a /typos file
 - job-template:
 name: '{name}-typos'
-# Bound to Trusty since we need grep v2.11-8 for -r to not follow symlinks
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 
diff --git a/jjb/php.yaml b/jjb/php.yaml
index da3c1fa..78f1c3f 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -6,7 +6,7 @@
 # have reported security issues. See also T74193.
 - job-template:
 name: '{name}-composer-security'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 concurrent: true
 scm:
   - git:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26d982bfc2c6eba3b1986935a9b799433dc5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Ship the default egress policy

2017-09-12 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377470 )

Change subject: Ship the default egress policy
..

Ship the default egress policy

Have a default kubernetes egress policy based on calico, which disallows
all outgoing communication from pods aside from pre approved ones.

Add instructions on how to update the policy easily

Bug: T170111
Change-Id: I2263afb86e229261a612cd9678038fcb0c698fd8
---
A modules/calico/data/default-kubernetes-policy.yaml
1 file changed, 102 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/377470/1

diff --git a/modules/calico/data/default-kubernetes-policy.yaml 
b/modules/calico/data/default-kubernetes-policy.yaml
new file mode 100644
index 000..b1dcc48
--- /dev/null
+++ b/modules/calico/data/default-kubernetes-policy.yaml
@@ -0,0 +1,102 @@
+# This file has the default egress policy for kubernetes pods in WMF.
+# It denies everything and only allows specific outgoing communications
+# This file is meant to be fed as a ConfigMap to calico-policy-controller in a 
pretty specific way
+# To do so, first delete the old one and create the new one (faster that way)
+# $ kubectl --namespace=kube-system delete configmap wmf-default-policy
+# $ kubectl --namespace=kube-system create configmap wmf-default-policy 
--from-file=egress=default-kubernetes-policy.yaml
+#
+# Allow DNS
+- action: allow
+  dst_ports:
+- 53
+  dst_net: 208.80.153.254/32
+  protocol: udp
+- action: allow
+  dst_ports:
+- 53
+  dst_net: 208.80.154.254/32
+  protocol: udp
+  # Allow webproxy.eqiad.wmnet
+- action: allow
+  dst_ports:
+- 8080
+  dst_net: 208.80.154.22/32
+  protocol: tcp
+  # Allow url-downloaders
+- action: allow
+  dst_ports:
+- 8080
+  dst_net: 208.80.154.49/32
+  protocol: tcp
+- action: allow
+  dst_ports:
+- 8080
+  dst_net: 208.80.153.16/32
+  protocol: tcp
+- action: allow
+  dst_ports:
+- 8080
+  dst_net: 208.80.153.50/32
+  protocol: tcp
+- action: allow
+  dst_ports:
+- 8080
+  dst_net: 208.80.154.80/32
+  protocol: tcp
+  # Allow statsd
+- action: allow
+  dst_ports:
+- 8125
+  dst_net: 10.64.32.155/32
+  protocol: udp
+- action: allow
+  dst_ports:
+- 8125
+  dst_net: 10.192.16.33/32
+  protocol: udp
+  # Allow graphite
+  # Re-evaluate this at some later point in time. For now deny
+  # Allow logstash
+- action: allow
+  dst_ports:
+- 4560
+- 10514
+- 11514
+  dst_net: 10.2.2.36/32
+  protocol: tcp
+- action: allow
+  dst_ports:
+- 8324
+- 10514
+- 11514
+- 12201
+  dst_net: 10.2.2.36/32
+  protocol: udp
+  # Allow restbase
+- action: allow
+  dst_ports:
+- 7231
+  dst_net: 10.2.2.17/32
+  protocol: tcp
+- action: allow
+  dst_ports:
+- 7231
+  dst_net: 10.2.1.17/32
+  protocol: tcp
+  # Allow uncached API
+- action: allow
+  dst_ports:
+- 80
+- 443
+  dst_net: 10.2.2.22/32
+  protocol: tcp
+- action: allow
+  dst_ports:
+- 80
+- 443
+  dst_net: 10.2.1.22/32
+  protocol: tcp
+  # Allow cached API
+  # Re-evaluate this at some later point in time. For now deny
+  # Deny everything else
+- action: deny

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2263afb86e229261a612cd9678038fcb0c698fd8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Create a repository component component/ci

2017-09-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377469 )

Change subject: Create a repository component component/ci
..

Create a repository component component/ci

This will be used to co-installable PHP packages used by CI, they are not
needed outside of CI.

Change-Id: Ib0b5fbf74d5674ac1f15a30be55ef493014d9369
---
M modules/aptrepo/files/distributions-wikimedia
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/377469/1

diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index 1cc4040..de1ab98 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -20,7 +20,7 @@
 AlsoAcceptFor: jessie jessie-backports
 Version: 8
 Architectures: source amd64 i386
-Components: main backports thirdparty experimental thirdparty/cloudera
+Components: main backports thirdparty experimental thirdparty/cloudera 
component/ci
 UDebComponents: main backports thirdparty experimental
 Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent 
elastic elasticsearch-curator docker jenkins
 Description: Wikimedia packages for Debian Jessie

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0b5fbf74d5674ac1f15a30be55ef493014d9369
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] operations/mediawiki-config[master]: mariadb: Remove all references of db1059 from mediawiki

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377468 )

Change subject: mariadb: Remove all references of db1059 from mediawiki
..

mariadb: Remove all references of db1059 from mediawiki

Bug: T175679
Change-Id: I07fccfe5cd9130b6fa161f41375745548a54ece0
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/68/377468/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index cc51217..7492149 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -466,7 +466,6 @@
'db1054' => '10.64.0.206', # do not remove or comment out
'db1055' => '10.64.32.25', # do not remove or comment out
'db1056' => '10.64.32.26', # do not remove or comment out
-   'db1059' => '10.64.32.29', # do not remove or comment out
'db1060' => '10.64.32.30', # do not remove or comment out
'db1061' => '10.64.32.227', # do not remove or comment out
'db1062' => '10.64.48.15', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 37af111..3f294e8 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -476,7 +476,6 @@
'db1054' => '10.64.0.206', # do not remove or comment out
'db1055' => '10.64.32.25', # do not remove or comment out
'db1056' => '10.64.32.26', # do not remove or comment out
-   'db1059' => '10.64.32.29', # do not remove or comment out
'db1060' => '10.64.32.30', # do not remove or comment out
'db1061' => '10.64.32.227', # do not remove or comment out
'db1062' => '10.64.48.15', # do not remove or comment out

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07fccfe5cd9130b6fa161f41375745548a54ece0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use String as redis::instance's $name (noop)

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377440 )

Change subject: Use String as redis::instance's $name (noop)
..


Use String as redis::instance's $name (noop)

Replace instances of:
  redis::instance { 6379:
with:
  redis::instance { '6379':
across the tree.

The former is odd syntax even with the current parser and actually
rejected in the future parser.

Also do the same with hieradata, for profile::redis::master::instances.

Change-Id: Id70162e5b56f102bcba38c3618e7a50719401d82
---
M modules/deployment/manifests/redis.pp
M modules/role/manifests/rcstream.pp
M modules/role/manifests/xenon.pp
M modules/sentry/manifests/init.pp
M modules/toollabs/manifests/redis.pp
5 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/modules/deployment/manifests/redis.pp 
b/modules/deployment/manifests/redis.pp
index 28528ea..9b1ccbc 100644
--- a/modules/deployment/manifests/redis.pp
+++ b/modules/deployment/manifests/redis.pp
@@ -12,7 +12,7 @@
 if ($::fqdn != $deployment_server) {
 $deployment_ipv4 = ipresolve($deployment_server, 4)
 # Just a read-only slave for now
-redis::instance { 6379:
+redis::instance { '6379':
 settings => {
 daemonize   => $daemonize_redis,
 slave_read_only => true,
@@ -21,7 +21,7 @@
 },
 }
 } else {
-redis::instance{ 6379:
+redis::instance { '6379':
 settings => {
 daemonize => $daemonize_redis,
 bind  => '0.0.0.0',
diff --git a/modules/role/manifests/rcstream.pp 
b/modules/role/manifests/rcstream.pp
index 663e7e1..6c9a4fa 100644
--- a/modules/role/manifests/rcstream.pp
+++ b/modules/role/manifests/rcstream.pp
@@ -12,7 +12,7 @@
 description => 'MediaWiki Recent Changes stream',
 }
 
-redis::instance { 6379:
+redis::instance { '6379':
 settings => {
 maxmemory   => '100mb',
 maxmemory_policy=> 'volatile-lru',
diff --git a/modules/role/manifests/xenon.pp b/modules/role/manifests/xenon.pp
index dcdac19..f9e6d4c 100644
--- a/modules/role/manifests/xenon.pp
+++ b/modules/role/manifests/xenon.pp
@@ -10,7 +10,7 @@
 include ::apache::mod::proxy
 include ::apache::mod::proxy_http
 
-redis::instance { 6379:
+redis::instance { '6379':
 settings => {
 maxmemory   => '1Mb',
 stop_writes_on_bgsave_error => 'no',
diff --git a/modules/sentry/manifests/init.pp b/modules/sentry/manifests/init.pp
index dd46947..8f27816 100644
--- a/modules/sentry/manifests/init.pp
+++ b/modules/sentry/manifests/init.pp
@@ -37,7 +37,7 @@
 
 require sentry::packages
 
-redis::instance { 6379: }
+redis::instance { '6379': }
 
 git::clone { 'operations/software/sentry':
 ensure=> latest,
diff --git a/modules/toollabs/manifests/redis.pp 
b/modules/toollabs/manifests/redis.pp
index 480205a..d1bb994 100644
--- a/modules/toollabs/manifests/redis.pp
+++ b/modules/toollabs/manifests/redis.pp
@@ -27,7 +27,7 @@
 $slaveof = undef
 }
 
-redis::instance { 6379:
+redis::instance { '6379':
 settings => {
 client_output_buffer_limit  => 'slave 512mb 200mb 60',
 dbfilename  => "${::hostname}-6379.rdb",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id70162e5b56f102bcba38c3618e7a50719401d82
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Move some jobs from Trusty to Jessie

2017-09-12 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377467 )

Change subject: Move some jobs from Trusty to Jessie
..

Move some jobs from Trusty to Jessie

Update jobs that run on permanent slaves:
jsduck
mediawiki-core-jsduck
mediawiki-vendor-composer-security
mwext-CirrusSearch-whitespaces
mwext-VisualEditor-jsduck
mwgate-jsduck
operations-dns-tabs
operations-mw-config-typos

jsduck is available there and grep has a sufficient version.

Bug: T161882
Change-Id: I26d982bfc2c6eba3b1986935a9b799433dc5
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
M jjb/misc.yaml
M jjb/php.yaml
5 files changed, 7 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/67/377467/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 2f85d87..89a8bad 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -1,7 +1,7 @@
 # Generic job-templates
 - job:
 name: 'jsduck'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 triggers:
@@ -14,7 +14,7 @@
 # used as workaround.
 - job-template:
 name: '{name}-jsduck'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remoteonly-zuul
 concurrent: true
 triggers:
@@ -188,7 +188,7 @@
 name: '{name}-tabs'
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 triggers:
  - zuul
 builders:
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index dd12da0..83264c3 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -222,7 +222,7 @@
 
 - job-template:
 name: 'mwext-{name}-whitespaces'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remoteonly-zuul
 concurrent: true
 properties:
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 92a43fb..2c7ab9b 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -55,7 +55,7 @@
 
 - job-template:
 name: 'mediawiki-core-jsduck'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 properties:
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index e47bdbd..baddfaf 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -346,8 +346,7 @@
 # Find out common typos in any files based on list of typos in a /typos file
 - job-template:
 name: '{name}-typos'
-# Bound to Trusty since we need grep v2.11-8 for -r to not follow symlinks
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 
diff --git a/jjb/php.yaml b/jjb/php.yaml
index da3c1fa..78f1c3f 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -6,7 +6,7 @@
 # have reported security issues. See also T74193.
 - job-template:
 name: '{name}-composer-security'
-node: contintLabsSlave && UbuntuTrusty
+node: contintLabsSlave && DebianJessie
 concurrent: true
 scm:
   - git:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26d982bfc2c6eba3b1986935a9b799433dc5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove reading list sync call from MainFragment.onCreateView

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377325 )

Change subject: Remove reading list sync call from MainFragment.onCreateView
..


Remove reading list sync call from MainFragment.onCreateView

This results in syncing reading lists on every page view, which is
unnecessary and overly aggressive.  Move it to FeedFragment.onCreateView
instead.

Change-Id: Ie789436cd0f784af09794c051b077e1678a48dd1
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index cff839c..f43d161 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -35,6 +35,7 @@
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.offline.LocalCompilationsActivity;
 import org.wikipedia.offline.OfflineTutorialActivity;
+import org.wikipedia.readinglist.sync.ReadingListSynchronizer;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.settings.SettingsActivity;
 import org.wikipedia.util.FeedbackUtil;
@@ -151,6 +152,8 @@
 getCallback().updateToolbarElevation(shouldElevateToolbar());
 }
 
+ReadingListSynchronizer.instance().sync();
+
 return view;
 }
 
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java 
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index 51e4204..77f5ad5 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -55,7 +55,6 @@
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.page.linkpreview.LinkPreviewDialog;
 import org.wikipedia.readinglist.AddToReadingListDialog;
-import org.wikipedia.readinglist.sync.ReadingListSynchronizer;
 import org.wikipedia.search.SearchFragment;
 import org.wikipedia.search.SearchInvokeSource;
 import org.wikipedia.settings.Prefs;
@@ -117,8 +116,6 @@
 return true;
 }
 });
-
-ReadingListSynchronizer.instance().sync();
 
 if (savedInstanceState == null) {
 handleIntent(getActivity().getIntent());

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie789436cd0f784af09794c051b077e1678a48dd1
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1059, pool db1097 as api with low load

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377455 )

Change subject: mariadb: Depool db1059, pool db1097 as api with low load
..


mariadb: Depool db1059, pool db1097 as api with low load

Bug: T175679
Change-Id: I903de3dc2814647a737ed05cd94041832cf16552
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ce6c762..37af111 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -135,12 +135,11 @@
'db1068' => 0,   # D1 2.8TB 160GB, master
'db1053' => 1,   # A2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1056' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
-   'db1059' => 1,   # C2 2.8TB  96GB, api
'db1064' => 0,   # D1 2.8TB 160GB, vslow, dump #Master for 
db1095 - new sanitarium
'db1081' => 300, # A2 3.6TB 512GB, api
'db1084' => 500, # B1 3.6TB 512GB
'db1091' => 500, # D2 3.6TB 512GB
-   'db1097' => 0,   # D1 3.6TB 512GB, old master
+   'db1097' => 1,   # D1 3.6TB 512GB, api, old master
],
's5' => [
'db1063' => 0,   # C5 2.8TB 128GB, master
@@ -336,8 +335,8 @@
'db1064' => 1,
],
'api' => [
-   'db1059' => 1,
-   'db1081' => 2,
+   'db1081' => 10,
+   'db1097' => 1,
],
'watchlist' => [
'db1053' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I903de3dc2814647a737ed05cd94041832cf16552
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Version 1.4

2017-09-12 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377462 )

Change subject: Version 1.4
..


Version 1.4

Change-Id: Ib7f440119e37892974fc042262c9e3ebcf5b2197
---
M Cargo.hooks.php
M Cargo.php
M README
M extension.json
4 files changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/Cargo.hooks.php b/Cargo.hooks.php
index 3730338..1f0adc8 100755
--- a/Cargo.hooks.php
+++ b/Cargo.hooks.php
@@ -11,7 +11,7 @@
public static function registerExtension() {
global $cgScriptPath, $wgScriptPath, $wgCargoFieldTypes, 
$wgGroupPermissions;
 
-   define( 'CARGO_VERSION', '1.3.1' );
+   define( 'CARGO_VERSION', '1.4' );
 
// Script path.
$cgScriptPath = $wgScriptPath . '/extensions/Cargo';
diff --git a/Cargo.php b/Cargo.php
index 75ca3fd..4def3e0 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -25,7 +25,7 @@
 
 // All the rest is for backward compatibility, for MW 1.26 and lower.
 
-define( 'CARGO_VERSION', '1.3.1' );
+define( 'CARGO_VERSION', '1.4' );
 
 $wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
diff --git a/README b/README
index a242132..9b41295 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Cargo extension
 
-Version 1.3.1
+Version 1.4
 Yaron Koren
 
 This is free software licensed under the GNU General Public License. Please
@@ -40,7 +40,7 @@
 
 == Requirements ==
 
-This version of the Cargo extension requires MediaWiki 1.22 or higher.
+This version of the Cargo extension requires MediaWiki 1.23 or higher.
 
 == Installation ==
 
@@ -56,6 +56,9 @@
 
 Query formats were also added by Cindy Cicalese, Luis Morillas and StasR.
 
+Support for hierarchy fields was added by Feroz Ahmed as a project for
+the 2017 Google Summer of Code.
+
 Important code contributions were also made by Ad Strack van Schijndel,
 Duncan Crane, Ed Hoo, Namit Ohri, Paladox, Vivek Ghaisas and others.
 
diff --git a/extension.json b/extension.json
index 5dfea12..bd5d0d5 100755
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "Cargo",
"namemsg": "cargo-extensionname",
-   "version": "1.3.1",
+   "version": "1.4",
"author": "Yaron Koren",
"url": "https://www.mediawiki.org/wiki/Extension:Cargo";,
"descriptionmsg": "cargo-desc",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7f440119e37892974fc042262c9e3ebcf5b2197
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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] operations/puppet[production]: redis - instance names should be strings in puppet 4

2017-09-12 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369695 )

Change subject: redis - instance names should be strings in puppet 4
..


redis - instance names should be strings in puppet 4

Since the redis instances (`profile::redis::master::instances`) are used
as resource titles, they should be strings.

I found this error while checking maps for compatibility with puppet 4. OCG
is affected as well.

Change-Id: I8c65d0039d84bec38c639bfd3b25f5dbc66182a9
---
M hieradata/role/common/maps/master.yaml
M hieradata/role/common/maps/test/master.yaml
M hieradata/role/common/ocg.yaml
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/role/common/maps/master.yaml 
b/hieradata/role/common/maps/master.yaml
index 242f3f7..29ff9ed 100644
--- a/hieradata/role/common/maps/master.yaml
+++ b/hieradata/role/common/maps/master.yaml
@@ -27,6 +27,6 @@
 cassandra::metrics::blacklist:
   - .*\.metrics\.Table\..*$
 
-profile::redis::master::instances: [6379]
+profile::redis::master::instances: ['6379']
 profile::redis::master::settings:
   bind: "0.0.0.0"
diff --git a/hieradata/role/common/maps/test/master.yaml 
b/hieradata/role/common/maps/test/master.yaml
index aaedc19..bc4a6cc 100644
--- a/hieradata/role/common/maps/test/master.yaml
+++ b/hieradata/role/common/maps/test/master.yaml
@@ -24,7 +24,7 @@
 cassandra::metrics::blacklist:
   - .*\.metrics\.Table\..*$
 
-profile::redis::master::instances: [6379]
+profile::redis::master::instances: ['6379']
 profile::redis::master::settings:
   bind: "0.0.0.0"
 
diff --git a/hieradata/role/common/ocg.yaml b/hieradata/role/common/ocg.yaml
index 6740371..57ff404 100644
--- a/hieradata/role/common/ocg.yaml
+++ b/hieradata/role/common/ocg.yaml
@@ -7,7 +7,7 @@
 ocg::statsd_host: "statsd.eqiad.wmnet"
 ocg::graylog_host: "logstash1002.eqiad.wmnet"
 role::ocg::tmpfs_size: '32G'
-profile::redis::master::instances: [6379]
+profile::redis::master::instances: ['6379']
 profile::redis::master::settings:
   maxmemory: "2gb"
   save: ""

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c65d0039d84bec38c639bfd3b25f5dbc66182a9
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gehel 
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] operations/puppet[production]: statsd_proxy: use validate_numeric()

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377439 )

Change subject: statsd_proxy: use validate_numeric()
..


statsd_proxy: use validate_numeric()

Use validate_numeric() to validate the $server_port parameter as a
numeric and the $backend_ports parameter as an array of numerics,
instead of trying to validate them with regular expressions. Validating
Integers against REs breaks with the future parser and this is easier to
read anyway.

Change-Id: I9cf253bf84231767d064b39a306690f79f2f6c4b
---
M modules/statsd_proxy/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/statsd_proxy/manifests/init.pp 
b/modules/statsd_proxy/manifests/init.pp
index 0a2f98e..793c0ac 100644
--- a/modules/statsd_proxy/manifests/init.pp
+++ b/modules/statsd_proxy/manifests/init.pp
@@ -33,8 +33,8 @@
 ) {
 validate_ensure($ensure)
 validate_array($backend_ports)
-validate_re(join($backend_ports, ' '), '^\d+( \d+)*$', '$backend_ports 
must be an array of port numbers')
-validate_re($server_port, '^\d+$', '$server_port must be a port number')
+validate_numeric($backend_ports)
+validate_numeric($server_port)
 
 package { 'statsd-proxy':
 ensure => $ensure,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cf253bf84231767d064b39a306690f79f2f6c4b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
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] operations/puppet[production]: uwsgi: use validate_numeric()

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377438 )

Change subject: uwsgi: use validate_numeric()
..


uwsgi: use validate_numeric()

Use validate_numeric() to validate the $port parameter, instead of
trying to validate it with a regular expression. Validating Integers
against REs breaks with the future parser and this is easier to read
anyway.

Change-Id: Id21b3dce62db579a7e8c0df59912eeb39e9fe404
---
M modules/service/manifests/uwsgi.pp
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  Mobrovac: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/service/manifests/uwsgi.pp 
b/modules/service/manifests/uwsgi.pp
index 25c2210..1ab8148 100644
--- a/modules/service/manifests/uwsgi.pp
+++ b/modules/service/manifests/uwsgi.pp
@@ -111,9 +111,10 @@
 }
 
 # sanity check since a default port cannot be assigned
-unless $port and $port =~ /^\d+$/ {
-fail('Service port must be specified and must be a number!')
+unless $port {
+fail('Service port must be specified!')
 }
+validate_numeric($port)
 
 # the local log file name
 $local_logdir = "${service::configuration::log_dir}/${title}"

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: mwext-Wikibase-client-tests-mysql-php55 to Jessie

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377457 )

Change subject: mwext-Wikibase-client-tests-mysql-php55 to Jessie
..


mwext-Wikibase-client-tests-mysql-php55 to Jessie

Delete
mwext-Wikibase-client-tests-mysql-php55-trusty
mwext-Wikibase-client-tests-sqlite-php55-trusty

Bug: T161882
Change-Id: I72ac70abcaa2e9ca2d6005f4a13cc7a9a90c26e4
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index e9b8847..411cd03 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -91,8 +91,6 @@
   - sqlite
 phpflavor:
- php55:
-   image: trusty
-   - php55:
image: jessie
- hhvm:
image: jessie
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 345dd25..44ae7cb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6897,7 +6897,7 @@
   - name: mwgate-rake
 php5:  # 'check php5'
   - mwext-Wikibase-repo-tests-sqlite-php55-jessie
-  - mwext-Wikibase-client-tests-mysql-php55-trusty
+  - mwext-Wikibase-client-tests-mysql-php55-jessie
 test:
   - mwext-mw-selenium-composer-jessie
   - mwext-Wikibase-repo-tests-sqlite-hhvm-jessie
@@ -6905,12 +6905,11 @@
 gate-and-submit: &mediawiki-extensions-wikibase-gate-and-submit
   - mwext-mw-selenium-composer-jessie
   - mwext-Wikibase-repo-tests-sqlite-hhvm-jessie
-  - mwext-Wikibase-client-tests-mysql-php55-trusty
+  - mwext-Wikibase-client-tests-mysql-php55-jessie
   - mwext-Wikibase-client-tests-mysql-hhvm-jessie
 gate-and-submit-swat: *mediawiki-extensions-wikibase-gate-and-submit
 experimental:
   - mwext-php70-phan-jessie
-  - mwext-Wikibase-client-tests-mysql-php55-jessie
 postmerge:
   - mwext-doxygen-publish
   - mwext-jsduck-publish

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72ac70abcaa2e9ca2d6005f4a13cc7a9a90c26e4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nutcracker: use validate_numeric()

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377437 )

Change subject: nutcracker: use validate_numeric()
..


nutcracker: use validate_numeric()

Use validate_numeric() instead of validate_re() for the $verbosity
parameter. Besides being simpler to read, it is currently implicitly
defined as an Integer, and validating an RE against an Integer fails
with the future parser.

Change-Id: Ic804bb758dc9c846d5fef9e7a5ab8481e422ae89
---
M modules/nutcracker/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/nutcracker/manifests/init.pp 
b/modules/nutcracker/manifests/init.pp
index 3d6c833..d472b3a 100644
--- a/modules/nutcracker/manifests/init.pp
+++ b/modules/nutcracker/manifests/init.pp
@@ -41,7 +41,7 @@
 ) {
 validate_hash($pools)
 validate_re($ensure, '^(present|absent)$')
-validate_re($verbosity, '^(\d|10|11)$')
+validate_numeric($verbosity, 11, 0)
 
 package { 'nutcracker':
 ensure => $ensure,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic804bb758dc9c846d5fef9e7a5ab8481e422ae89
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
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] integration/config[master]: Remove some trusty jobs

2017-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377453 )

Change subject: Remove some trusty jobs
..


Remove some trusty jobs

Delete:

mediawiki-extensions-php55-trusty
mediawiki-phpunit-php55-trusty
mwext-testextension-php55-composer-trusty
mwext-testextension-php55-composer-trusty-non-voting
mwext-testextension-php55-trusty
mwext-testextension-php55-trusty-non-voting
mwgate-composer-php55-trusty

Bug: T161882
Change-Id: If30a60b4c2f13166979407095654626367a13fee
---
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
2 files changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 494f267..dd12da0 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -309,8 +309,6 @@
  - 'mwext-testextension-{phpflavor}-{image}': &phpflavor_images
  phpflavor:
  - php55:
- image: trusty
- - php55:
  image: jessie
  - hhvm:
  image: jessie
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index fecb853..92a43fb 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -267,8 +267,6 @@
   - 'mediawiki-phpunit-{phpflavor}-{image}': &phpflavor_images
   phpflavor:
   - php55:
-  image: trusty
-  - php55:
   image: jessie
   - php70:
   image: jessie

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If30a60b4c2f13166979407095654626367a13fee
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: swift: use !~ instead of ! $title =~ /.../

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377436 )

Change subject: swift: use !~ instead of ! $title =~ /.../
..


swift: use !~ instead of ! $title =~ /.../

Current form breaks with the future parser, probably due to operator
precedence.

Change-Id: I14e7f0db85c0f447b74301928d440795963f920c
---
M modules/swift/manifests/init_device.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/swift/manifests/init_device.pp 
b/modules/swift/manifests/init_device.pp
index 5d74f1f..2f1d72c 100644
--- a/modules/swift/manifests/init_device.pp
+++ b/modules/swift/manifests/init_device.pp
@@ -1,5 +1,5 @@
 define swift::init_device($partition_nr='1') {
-if (! $title =~ /^\/dev\/([hvs]d[a-z]+|md[0-9]+)$/) {
+if ($title !~ /^\/dev\/([hvs]d[a-z]+|md[0-9]+)$/) {
 fail("unable to init ${title} for swift")
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14e7f0db85c0f447b74301928d440795963f920c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
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] mediawiki/core[master]: Update padding of mw-ui-input to match OOUI

2017-09-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377466 )

Change subject: Update padding of mw-ui-input to match OOUI
..

Update padding of mw-ui-input to match OOUI

Change-Id: I85c7044666be41a9baa52e8f7ba019a96dac4a6b
---
M resources/src/mediawiki.ui/components/inputs.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/377466/1

diff --git a/resources/src/mediawiki.ui/components/inputs.less 
b/resources/src/mediawiki.ui/components/inputs.less
index cc9c65a..74dc0b7 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -29,7 +29,7 @@
width: 100%;
border: 1px solid @colorFieldBorder;
border-radius: @borderRadius;
-   padding: 0.625em 0.546875em 0.546875em;
+   padding: 0.625em 0.625em 0.546875em;
// necessary for smooth transition
box-shadow: inset 0 0 0 0.1em #fff;
font-family: inherit;

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

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

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

[MediaWiki-commits] [Gerrit] labs/private[master]: Add missing secrets

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377465 )

Change subject: Add missing secrets
..


Add missing secrets

Change-Id: Ice290396057116af0d5d5462ec360a02c89ddf85
---
A 
modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
A 
modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem
2 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git 
a/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
new file mode 100644
index 000..e69de29
--- /dev/null
+++ 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
diff --git 
a/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem
 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem
new file mode 100644
index 000..e69de29
--- /dev/null
+++ 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice290396057116af0d5d5462ec360a02c89ddf85
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Version 1.4

2017-09-12 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377462 )

Change subject: Version 1.4
..

Version 1.4

Change-Id: Ib7f440119e37892974fc042262c9e3ebcf5b2197
---
M Cargo.hooks.php
M Cargo.php
M README
M extension.json
4 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/62/377462/2

diff --git a/Cargo.hooks.php b/Cargo.hooks.php
index 3730338..1f0adc8 100755
--- a/Cargo.hooks.php
+++ b/Cargo.hooks.php
@@ -11,7 +11,7 @@
public static function registerExtension() {
global $cgScriptPath, $wgScriptPath, $wgCargoFieldTypes, 
$wgGroupPermissions;
 
-   define( 'CARGO_VERSION', '1.3.1' );
+   define( 'CARGO_VERSION', '1.4' );
 
// Script path.
$cgScriptPath = $wgScriptPath . '/extensions/Cargo';
diff --git a/Cargo.php b/Cargo.php
index 75ca3fd..4def3e0 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -25,7 +25,7 @@
 
 // All the rest is for backward compatibility, for MW 1.26 and lower.
 
-define( 'CARGO_VERSION', '1.3.1' );
+define( 'CARGO_VERSION', '1.4' );
 
 $wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
diff --git a/README b/README
index a242132..9b41295 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Cargo extension
 
-Version 1.3.1
+Version 1.4
 Yaron Koren
 
 This is free software licensed under the GNU General Public License. Please
@@ -40,7 +40,7 @@
 
 == Requirements ==
 
-This version of the Cargo extension requires MediaWiki 1.22 or higher.
+This version of the Cargo extension requires MediaWiki 1.23 or higher.
 
 == Installation ==
 
@@ -56,6 +56,9 @@
 
 Query formats were also added by Cindy Cicalese, Luis Morillas and StasR.
 
+Support for hierarchy fields was added by Feroz Ahmed as a project for
+the 2017 Google Summer of Code.
+
 Important code contributions were also made by Ad Strack van Schijndel,
 Duncan Crane, Ed Hoo, Namit Ohri, Paladox, Vivek Ghaisas and others.
 
diff --git a/extension.json b/extension.json
index 5dfea12..bd5d0d5 100755
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "Cargo",
"namemsg": "cargo-extensionname",
-   "version": "1.3.1",
+   "version": "1.4",
"author": "Yaron Koren",
"url": "https://www.mediawiki.org/wiki/Extension:Cargo";,
"descriptionmsg": "cargo-desc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7f440119e37892974fc042262c9e3ebcf5b2197
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: 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] labs/private[master]: Add missing secrets

2017-09-12 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377465 )

Change subject: Add missing secrets
..

Add missing secrets

Change-Id: Ice290396057116af0d5d5462ec360a02c89ddf85
---
A 
modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
A 
modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/65/377465/1

diff --git 
a/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
new file mode 100644
index 000..e69de29
--- /dev/null
+++ 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_privkey.pem
diff --git 
a/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem
 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem
new file mode 100644
index 000..e69de29
--- /dev/null
+++ 
b/modules/secret/secrets/puppetmaster/labtest-puppetmaster.wikimedia.org_pubkey.pem

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice290396057116af0d5d5462ec360a02c89ddf85
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Match JS and non-JS styles for navigation placeholder

2017-09-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377464 )

Change subject: Match JS and non-JS styles for navigation placeholder
..

Match JS and non-JS styles for navigation placeholder

Change-Id: I0161069fb3bea8adab86550127da09b1ae51a81b
---
M modules/styles/board/navigation.less
M modules/styles/flow/widgets/editor/mw.flow.ui.AnonWarningWidget.less
M modules/styles/flow/widgets/editor/mw.flow.ui.CanNotEditWidget.less
M modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
M modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
5 files changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/64/377464/1

diff --git a/modules/styles/board/navigation.less 
b/modules/styles/board/navigation.less
index 7d9f234..f8c189e 100644
--- a/modules/styles/board/navigation.less
+++ b/modules/styles/board/navigation.less
@@ -4,7 +4,8 @@
 
 // Top board navigation bar
 .flow-board-navigation {
-   height: 2em;
+   height: 2.55em;
+   margin-bottom: 0.5em;
position: static;
padding: 0;
white-space: nowrap;
@@ -136,6 +137,6 @@
 @media all and ( min-width: @small ) {
html .flow-board-navigation {
font-size: 1.15em;
-   padding-top: 0.5em;
+   margin-top: 0.5em;
}
 }
diff --git 
a/modules/styles/flow/widgets/editor/mw.flow.ui.AnonWarningWidget.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.AnonWarningWidget.less
index bca5402..bcaa12b 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.AnonWarningWidget.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.AnonWarningWidget.less
@@ -13,6 +13,7 @@
padding: 0.6em;
padding-left: ~'calc( 0.6em + 24px + 0.6em )';
line-height: 1.2em;
+   margin-bottom: 0.5em;
 
a {
color: #fff;
diff --git 
a/modules/styles/flow/widgets/editor/mw.flow.ui.CanNotEditWidget.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.CanNotEditWidget.less
index 23d6b8b..228a78f 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.CanNotEditWidget.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.CanNotEditWidget.less
@@ -16,6 +16,7 @@
color: #000;
display: block;
line-height: 1.2em;
+   margin-bottom: 0.5em;
 
a {
color: #fff;
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
index b8ef805..45287a5 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
@@ -3,7 +3,3 @@
display: none;
}
 }
-
-.flow-ui-editorContainerWidget-messages {
-   margin-bottom: 0.5em;
-}
diff --git a/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less 
b/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
index 2a88564..41a3fce 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
@@ -2,7 +2,6 @@
 
 .flow-ui-newTopicWidget {
clear: both;
-   margin-top: 1.5em;
 
&-title.oo-ui-textInputWidget {
// OO.ui.TextInputWidget has a max-width: 50 by default

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0161069fb3bea8adab86550127da09b1ae51a81b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: varnish::instance: fix template attributes scope

2017-09-12 Thread Ema (Code Review)

Ema has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376242 )

Change subject: varnish::instance: fix template attributes scope
..


varnish::instance: fix template attributes scope

Change-Id: Ib2723ce0145335fd22b667d6c41090835c814198
---
D modules/varnish/manifests/extra_vcl.pp
M modules/varnish/manifests/instance.pp
M modules/varnish/manifests/wikimedia_vcl.pp
3 files changed, 63 insertions(+), 27 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Ema: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/varnish/manifests/extra_vcl.pp 
b/modules/varnish/manifests/extra_vcl.pp
deleted file mode 100644
index cd26f04..000
--- a/modules/varnish/manifests/extra_vcl.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-define varnish::extra_vcl {
-$vcl = regsubst($title, '^([^ ]+) .*$', '\1')
-$filename = "/etc/varnish/${vcl}.inc.vcl"
-
-if !defined(File[$filename]) {
-file { $filename:
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-content => template("varnish/${vcl}.inc.vcl.erb"),
-}
-}
-}
diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index 922c8f2..0816492 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -31,8 +31,10 @@
 require ::varnish::common::vcl
 
 $extra_vcl_variable_to_make_puppet_parser_happy = suffix($extra_vcl, " 
${instancesuffix}")
-extra_vcl{ $extra_vcl_variable_to_make_puppet_parser_happy:
-before => Service["varnish${instancesuffix}"],
+varnish::wikimedia_vcl { $extra_vcl_variable_to_make_puppet_parser_happy:
+generate_extra_vcl => true,
+vcl_config => $vcl_config,
+before => Service["varnish${instancesuffix}"],
 }
 
 # Write the dynamic backend caches configuration, if we need it
@@ -53,12 +55,22 @@
 }
 
 varnish::wikimedia_vcl { "/etc/varnish/wikimedia-common_${vcl}.inc.vcl":
-template_path => "${module_name}/vcl/wikimedia-common.inc.vcl.erb",
+template_path   => "${module_name}/vcl/wikimedia-common.inc.vcl.erb",
+vcl_config  => $vcl_config,
+backend_caches  => $backend_caches,
+inst=> $inst,
+app_directors   => $app_directors,
+app_def_be_opts => $app_def_be_opts,
 }
 
 varnish::wikimedia_vcl { "/etc/varnish/wikimedia_${vcl}.vcl":
-require   => File["/etc/varnish/${vcl}.inc.vcl"],
-template_path => "${module_name}/vcl/wikimedia-${layer}.vcl.erb",
+require => File["/etc/varnish/${vcl}.inc.vcl"],
+template_path   => "${module_name}/vcl/wikimedia-${layer}.vcl.erb",
+vcl_config  => $vcl_config,
+backend_caches  => $backend_caches,
+vcl => $vcl,
+app_directors   => $app_directors,
+app_def_be_opts => $app_def_be_opts,
 }
 
 # These versions of wikimedia-common_${vcl}.vcl and wikimedia_${vcl}.vcl
@@ -70,23 +82,37 @@
 require => File['/usr/share/varnish/tests'],
 varnish_testing => true,
 template_path   => "${module_name}/vcl/wikimedia-common.inc.vcl.erb",
+vcl_config  => $vcl_config,
+backend_caches  => $backend_caches,
+inst=> $inst,
+app_directors   => $app_directors,
+app_def_be_opts => $app_def_be_opts,
 }
 
 varnish::wikimedia_vcl { "/usr/share/varnish/tests/wikimedia_${vcl}.vcl":
 require => File['/usr/share/varnish/tests'],
 varnish_testing => true,
 template_path   => "${module_name}/vcl/wikimedia-${layer}.vcl.erb",
+vcl_config  => $vcl_config,
+backend_caches  => $backend_caches,
+vcl => $vcl,
+app_directors   => $app_directors,
+app_def_be_opts => $app_def_be_opts,
 }
 
 varnish::wikimedia_vcl { "/etc/varnish/${vcl}.inc.vcl":
-template_path => "varnish/${vcl}.inc.vcl.erb",
-notify=> Exec["load-new-vcl-file${instancesuffix}"],
+template_path  => "varnish/${vcl}.inc.vcl.erb",
+notify => Exec["load-new-vcl-file${instancesuffix}"],
+vcl_config => $vcl_config,
+backend_caches => $backend_caches,
 }
 
 varnish::wikimedia_vcl { "/usr/share/varnish/tests/${vcl}.inc.vcl":
 require => File['/usr/share/varnish/tests'],
 varnish_testing => true,
 template_path   => "varnish/${vcl}.inc.vcl.erb",
+vcl_config  => $vcl_config,
+backend_caches  => $backend_caches,
 }
 
 # The defaults file is also parsed by /usr/share/varnish/reload-vcl,
diff --git a/modules/varnish/manifests/wikimedia_vcl.pp 
b/modules/varnish/manifests

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Fix width of non-JS reply widget

2017-09-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377463 )

Change subject: Fix width of non-JS reply widget
..

Fix width of non-JS reply widget

Bug: T175688
Change-Id: Iafb9d9b71518bc3687319475406d0de6c1d6
---
M modules/styles/mediawiki.ui/forms.less
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/styles/mediawiki.ui/forms.less 
b/modules/styles/mediawiki.ui/forms.less
index f54a592..9370af8 100644
--- a/modules/styles/mediawiki.ui/forms.less
+++ b/modules/styles/mediawiki.ui/forms.less
@@ -10,6 +10,7 @@
color: @colorGray7;
display: block;
margin: 1em 0 0 @topicIndent;
+   width: auto;
 }
 
 // FIXME: It's a shame we have to duplicate css in mw-ui-input. Need saner way 
going forward. mw-ui-textarea ?

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafb9d9b71518bc3687319475406d0de6c1d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add apache2-dev to package list

2017-09-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377461 )

Change subject: Add apache2-dev to package list
..


Add apache2-dev to package list

Provides /usr/share/perl5/Debian/Debhelper/Sequence/apache2.pm, which
is needed during source package generation in pbuilder.

Change-Id: If745f8a84deb60279426d74fa5d4898500e07701
---
M modules/package_builder/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/package_builder/manifests/init.pp 
b/modules/package_builder/manifests/init.pp
index d7be5d5..ac824f0 100644
--- a/modules/package_builder/manifests/init.pp
+++ b/modules/package_builder/manifests/init.pp
@@ -57,6 +57,7 @@
 'subversion',
 'sphinx-common',
 'scons',
+'apache2-dev',
 $php_dev,
 $dh_php,
 ])

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If745f8a84deb60279426d74fa5d4898500e07701
Gerrit-PatchSet: 1
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] operations/puppet[production]: Add apache2-dev to package list

2017-09-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377461 )

Change subject: Add apache2-dev to package list
..

Add apache2-dev to package list

Provides /usr/share/perl5/Debian/Debhelper/Sequence/apache2.pm, which
is needed during source package generation in pbuilder.

Change-Id: If745f8a84deb60279426d74fa5d4898500e07701
---
M modules/package_builder/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/377461/1

diff --git a/modules/package_builder/manifests/init.pp 
b/modules/package_builder/manifests/init.pp
index d7be5d5..ac824f0 100644
--- a/modules/package_builder/manifests/init.pp
+++ b/modules/package_builder/manifests/init.pp
@@ -57,6 +57,7 @@
 'subversion',
 'sphinx-common',
 'scons',
+'apache2-dev',
 $php_dev,
 $dh_php,
 ])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If745f8a84deb60279426d74fa5d4898500e07701
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] operations/puppet[production]: Add new m1 host db2078, enable firewall on all misc services

2017-09-12 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377460 )

Change subject: Add new m1 host db2078, enable firewall on all misc services
..

Add new m1 host db2078, enable firewall on all misc services

Bug: T175685
Bug: T104699
Change-Id: Ieb074118dd7e23ff5a154ba176e439a047b98b84
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/manifests/mariadb/misc.pp
3 files changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/377460/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 0eaddad..6fd298a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -553,21 +553,24 @@
 shard  => 'm1',
 master => true,
 }
-include ::base::firewall
 }
 
 node 'db1001.eqiad.wmnet' {
 class { '::role::mariadb::misc':
 shard  => 'm1',
 }
-include ::base::firewall
 }
 
 node 'db2010.codfw.wmnet' {
 class { '::role::mariadb::misc':
 shard => 'm1',
 }
-include ::base::firewall
+}
+
+node 'db2078.codfw.wmnet' {
+class { '::role::mariadb::misc':
+shard => 'm1',
+}
 }
 
 ## m2 shard
@@ -613,7 +616,6 @@
 shard  => 'm4',
 master => true,
 }
-include ::base::firewall
 }
 node 'db1047.eqiad.wmnet' {
 # this slave has an m4 custom replication protocol
@@ -623,7 +625,6 @@
 shard  => 'm4',
 master => false,
 }
-include ::base::firewall
 }
 
 # m5 shard
@@ -638,7 +639,6 @@
 class { '::role::mariadb::misc':
 shard => 'm5',
 }
-include ::base::firewall
 }
 
 # sanitarium
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 4c673bd..d5a2fcc 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1647,6 +1647,8 @@
 host db2078 {
 hardware ethernet 18:66:DA:F8:EE:A0;
 fixed-address db2078.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db2079 {
diff --git a/modules/role/manifests/mariadb/misc.pp 
b/modules/role/manifests/mariadb/misc.pp
index d424575..8de997c 100644
--- a/modules/role/manifests/mariadb/misc.pp
+++ b/modules/role/manifests/mariadb/misc.pp
@@ -21,6 +21,7 @@
 include ::standard
 include role::mariadb::monitor
 include passwords::misc::scripts
+include ::base::firewall
 include role::mariadb::ferm
 class { 'role::mariadb::groups':
 mysql_group => 'misc',

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

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

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

< 1 2 3 4 5 >

201 - 300 of 403 matches

Mail list logo