[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update blacklist after 8608665a
Subramanya Sastry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340144 ) Change subject: Update blacklist after 8608665a .. Update blacklist after 8608665a Change-Id: If8a352cd8247e5830786613dbbc6d315d115813b --- M tests/timedMediaHandlerParserTests-blacklist.js 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/44/340144/1 diff --git a/tests/timedMediaHandlerParserTests-blacklist.js b/tests/timedMediaHandlerParserTests-blacklist.js index 503b261..9885c03 100644 --- a/tests/timedMediaHandlerParserTests-blacklist.js +++ b/tests/timedMediaHandlerParserTests-blacklist.js @@ -54,16 +54,16 @@ // Blacklist for html2html -add("html2html", "Simple video element", ""); -add("html2html", "Simple thumbed video", "\n\n\">http://example.com/images/thumb/0/00/Video.ogv/180px--Video.ogv.jpg\"; alt=\"180px--Video.ogv.jpg\" rel=\"mw:externalImage\" data-parsoid='{\"dsr\":[978,1045,null,null]}'/>http://example.com/images/0/00/Video.ogv\"; data-parsoid='{\"targetOff\":1087,\"contentOffsets\":[1087,1170],\"dsr\":[1045,1171,42,1]}'>Play media\n\n[/wiki/File:Video.ogv]\n\n\n"); -add("html2html", "Video in a ", "\t\t* \t\t\t\">http://example.com/images/thumb/0/00/Video.ogv/120px--Video.ogv.jpg\"; alt=\"120px--Video.ogv.jpg\" rel=\"mw:externalImage\" data-parsoid='{\"dsr\":[1011,1078,null,null]}'/>http://example.com/images/0/00/Video.ogv\"; data-parsoid='{\"targetOff\":1120,\"contentOffsets\":[1120,1203],\"dsr\":[1078,1204,42,1]}'>Play media \t\t\t\t\t\t \t\t\n"); -add("html2html", "Video with thumbtime=1:25", "\n"); -add("html2html", "Video with starttime offset", "
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Hygiene: Remove checkin instrumentation
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339162 ) Change subject: Hygiene: Remove checkin instrumentation .. Hygiene: Remove checkin instrumentation The "checkin" part of the Popups schema was superseded by the ReadingDepth schema, the implementation of which is tracked by T155639. As well as removing all checkin-related code, update the Popups schema to the latest version - the version that doesn't have the checkin property. Bug: T155639 Depends-On: I762ec3fc91decf3cffa869dbd783faf62f01329a Change-Id: If764917b6e121e1f9db980a4efa30c0f7a166197 --- M extension.json M resources/dist/index.js M resources/dist/index.js.map M src/actionTypes.js M src/actions.js D src/checkin.js M src/index.js D src/pageVisibility.js M src/popups.js M src/reducers/eventLogging.js D tests/qunit/ext.popups/checkin.test.js D tests/qunit/ext.popups/pageVisibility.test.js 12 files changed, 54 insertions(+), 800 deletions(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/339162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If764917b6e121e1f9db980a4efa30c0f7a166197 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Phuedx Gerrit-Reviewer: Bmansurov Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Phuedx 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]: nova: nova-fullstack.upstart.erb proper variable reference
Rush has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340143 ) Change subject: nova: nova-fullstack.upstart.erb proper variable reference .. nova: nova-fullstack.upstart.erb proper variable reference Change-Id: I989fab2be89b4574d456e8993768afac2fb19b38 --- M modules/openstack/templates/initscripts/nova-fullstack.upstart.erb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb index ce8c9ba..0ceccee 100644 --- a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb +++ b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb @@ -19,8 +19,8 @@ export OS_USERNAME="osstackcanary" export OS_PASSWORD="<%= @password %>" /usr/local/sbin/nova-fullstack \ - --ssh-timeout <%= ssh_timeout %> \ - --creation-timeout <%= creation_timeout %> \ + --ssh-timeout <%= @ssh_timeout %> \ + --creation-timeout <%= @creation_timeout %> \ --interval <%= @interval %> \ --max-pool <%= @max_pool %> \ --project admin-monitoring \ -- To view, visit https://gerrit.wikimedia.org/r/340143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I989fab2be89b4574d456e8993768afac2fb19b38 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Rush Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nova: nova-fullstack.upstart.erb proper variable reference
Rush has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340143 ) Change subject: nova: nova-fullstack.upstart.erb proper variable reference .. nova: nova-fullstack.upstart.erb proper variable reference Change-Id: I989fab2be89b4574d456e8993768afac2fb19b38 --- M modules/openstack/templates/initscripts/nova-fullstack.upstart.erb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/43/340143/1 diff --git a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb index ce8c9ba..0ceccee 100644 --- a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb +++ b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb @@ -19,8 +19,8 @@ export OS_USERNAME="osstackcanary" export OS_PASSWORD="<%= @password %>" /usr/local/sbin/nova-fullstack \ - --ssh-timeout <%= ssh_timeout %> \ - --creation-timeout <%= creation_timeout %> \ + --ssh-timeout <%= @ssh_timeout %> \ + --creation-timeout <%= @creation_timeout %> \ --interval <%= @interval %> \ --max-pool <%= @max_pool %> \ --project admin-monitoring \ -- To view, visit https://gerrit.wikimedia.org/r/340143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I989fab2be89b4574d456e8993768afac2fb19b38 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nova: monitor for fullstack test daemon
Rush has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339651 ) Change subject: nova: monitor for fullstack test daemon .. nova: monitor for fullstack test daemon * Change max_pool to 3 * Watch for 1 proc of nova-fullstack * bump up creation timeout as we are leaking instances at 180s with sometimes crashes waiting on creation. * use image debian-8.7 * reduce loop for SSH/Puppet * add connect timeout for SSH See instances in flight: OS_TENANT_ID=admin-monitoring openstack server list Change-Id: I616edb424def0011368999ec9a0997d4db7d2a95 --- M modules/openstack/files/nova_fullstack_test.py M modules/openstack/manifests/nova/fullstack.pp M modules/openstack/templates/initscripts/nova-fullstack.upstart.erb M modules/role/manifests/labs/openstack/nova/fullstack.pp 4 files changed, 16 insertions(+), 5 deletions(-) Approvals: Rush: Verified; Looks good to me, approved diff --git a/modules/openstack/files/nova_fullstack_test.py b/modules/openstack/files/nova_fullstack_test.py index 800e1d3..9edb2fc 100644 --- a/modules/openstack/files/nova_fullstack_test.py +++ b/modules/openstack/files/nova_fullstack_test.py @@ -92,6 +92,8 @@ ssh = [ '/usr/bin/ssh', '-o', +'ConnectTimeout=5', +'-o', 'UserKnownHostsFile=/dev/null', '-o', 'StrictHostKeyChecking=no', @@ -146,7 +148,7 @@ with Timer() as vs: logging.info('SSH to {}'.format(address)) while True: -time.sleep(30) +time.sleep(10) try: run_remote(address, user, keyfile, '/bin/true') break @@ -180,7 +182,7 @@ pwait = pv.progress() if pwait > timeout: raise Exception("Puppet for {} timed out".format(address)) -time.sleep(30) +time.sleep(10) logging.debug(out) try: @@ -348,7 +350,7 @@ argparser.add_argument( '--image', -default='debian-8.6-jessie', +default='debian-8.7-jessie', help='Image to use', ) diff --git a/modules/openstack/manifests/nova/fullstack.pp b/modules/openstack/manifests/nova/fullstack.pp index a1258fd..d59aa32 100644 --- a/modules/openstack/manifests/nova/fullstack.pp +++ b/modules/openstack/manifests/nova/fullstack.pp @@ -7,6 +7,9 @@ class openstack::nova::fullstack( $password, $interval = 300, +$max_pool = 3, +$creation_timeout = 240, +$ssh_timeout = 240, ) { group { 'osstackcanary': diff --git a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb index 1798ef0..ce8c9ba 100644 --- a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb +++ b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb @@ -19,11 +19,12 @@ export OS_USERNAME="osstackcanary" export OS_PASSWORD="<%= @password %>" /usr/local/sbin/nova-fullstack \ + --ssh-timeout <%= ssh_timeout %> \ + --creation-timeout <%= creation_timeout %> \ --interval <%= @interval %> \ - --max-pool 1 \ + --max-pool <%= @max_pool %> \ --project admin-monitoring \ --prepend fullstackd \ - --image debian-8.6-jessie \ --flavor m1.small \ --keyfile <%= @keyfile %> \ --statsd statsd.eqiad.wmnet diff --git a/modules/role/manifests/labs/openstack/nova/fullstack.pp b/modules/role/manifests/labs/openstack/nova/fullstack.pp index 906eb77..4116c57d 100644 --- a/modules/role/manifests/labs/openstack/nova/fullstack.pp +++ b/modules/role/manifests/labs/openstack/nova/fullstack.pp @@ -7,4 +7,9 @@ class { '::openstack::nova::fullstack': password => $fullstack_pass, } + +nrpe::monitor_service { 'nova-fullstack': +description => 'nova instance creation test', +nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C python -a nova-fullstack', +} } -- To view, visit https://gerrit.wikimedia.org/r/339651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I616edb424def0011368999ec9a0997d4db7d2a95 Gerrit-PatchSet: 8 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Rush Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wiki
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove non-existent setting from apifeatureusage logstash te...
Gehel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338469 ) Change subject: Remove non-existent setting from apifeatureusage logstash template .. Remove non-existent setting from apifeatureusage logstash template This setting was removed quite some time ago, looks like perhaps in elasticsearch 0.90. Elasticsearch 5 is more strict than previous versions and now requires all settings to actually exist. As such remove this setting so things continue as expected. One uncertain thing is how this change makes it into elasticsearch. I havn't been able to track down if there is an automated process, or how exactly that happens. If after deploying this patch nothing updates we can use curl to update the template within the eqiad cluster as necessary. Change-Id: Id2c6ee574ca2bfdf671a91a97ceeaa50f0fc788e --- M modules/role/files/logstash/apifeatureusage-template.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, but someone else must approve jenkins-bot: Verified Gehel: Looks good to me, approved diff --git a/modules/role/files/logstash/apifeatureusage-template.json b/modules/role/files/logstash/apifeatureusage-template.json index c7cd29f..2228152 100644 --- a/modules/role/files/logstash/apifeatureusage-template.json +++ b/modules/role/files/logstash/apifeatureusage-template.json @@ -3,7 +3,6 @@ "settings" : { "number_of_shards" : 1, "number_of_replicas" : 2, -"index.cache.field.type" : "soft", "index.refresh_interval" : "5s", "analysis" : { "analyzer" : { -- To view, visit https://gerrit.wikimedia.org/r/338469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2c6ee574ca2bfdf671a91a97ceeaa50f0fc788e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: EBernhardson Gerrit-Reviewer: BryanDavis 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] mediawiki...CirrusSearch[master]: Update tests to Selenium 3
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340121 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I2a659ef38a079232c096dff1506225f5af9a076f --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) Approvals: Cindy-the-browser-test-bot: Looks good to me, but someone else must approve jenkins-bot: Verified DCausse: Looks good to me, approved diff --git a/Gemfile b/Gemfile index 1e7893c..abd796a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org"; -gem "mediawiki_selenium", "~> 1.7", ">= 1.7.2" +gem "mediawiki_selenium", "~> 1.8" gem "mimemagic", "~> 0.3.0" gem "parallel_tests", "~> 1.7.0" gem "rake", "~> 10.4", ">= 10.4.2" diff --git a/Gemfile.lock b/Gemfile.lock index bf746a8..191b71d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,56 +13,59 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) mimemagic (0.3.1) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parallel (1.8.0) parallel_tests (1.7.1) parallel @@ -86,31 +89,31 @@ ruby-progressbar (~> 1.7) tins (<= 1.6.0) ruby-progressbar (1.8.0) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) tins (1.6.0) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) mimemagic (~> 0.3.0) parallel_tests (~> 1.7.0) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.35.1) BUNDLED WITH - 1.10.6 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a659ef38a079232c096dff1506225f5af9a076f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: Cindy-the-browser-test-bot Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Gehel Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: Tjones Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: jenkins-bot <> __
[MediaWiki-commits] [Gerrit] operations/puppet[production]: swift: ignore spammy 507s from container-server
Filippo Giunchedi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340142 ) Change subject: swift: ignore spammy 507s from container-server .. swift: ignore spammy 507s from container-server Avoid spamming local logs with 507s when SSDs are broken. Remote logs are still shipped as usual. Bug: T157237 Change-Id: I130a63ee4fd0ee0ca0b25fafcc6a83aad12d0a96 --- M modules/swift/files/swift.rsyslog.conf 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/340142/1 diff --git a/modules/swift/files/swift.rsyslog.conf b/modules/swift/files/swift.rsyslog.conf index ff582f8..7f72f64 100644 --- a/modules/swift/files/swift.rsyslog.conf +++ b/modules/swift/files/swift.rsyslog.conf @@ -12,6 +12,12 @@ ($programname contains 'container-') or ($programname contains 'object-') then { +# container-server logspam with 507s when SSDs are not available - T157237 +if ($programname contains 'container-server') and + (re_match($msg, '(PUT|DELETE|HEAD) [^[:space:]]+ 507 -')) then { +stop +} + if ($programname contains '-server') then { action(type="omfile" file="/var/log/swift/server.log") stop -- To view, visit https://gerrit.wikimedia.org/r/340142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I130a63ee4fd0ee0ca0b25fafcc6a83aad12d0a96 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [WikiShare] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340141 ) Change subject: [WikiShare] Add npm job .. [WikiShare] Add npm job Needed for If932cd0df4143ce93fa17e64d70e8fbdf07b3cf1 Change-Id: I262b310e393d90e6da3e79b9214f9d35bc345057 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/41/340141/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 85518ff..b90b7f7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7352,6 +7352,7 @@ template: - name: extension-unittests-generic - name: jsonlint + - name: npm - name: mediawiki/extensions/WikiTextLoggedInOut template: -- To view, visit https://gerrit.wikimedia.org/r/340141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I262b310e393d90e6da3e79b9214f9d35bc345057 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiShare[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340140 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: If932cd0df4143ce93fa17e64d70e8fbdf07b3cf1 --- A .gitignore A Gruntfile.js A package.json 3 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiShare refs/changes/40/340140/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..7e5da87 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +vendor/ diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/340140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If932cd0df4143ce93fa17e64d70e8fbdf07b3cf1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiShare Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: lvs: fix icinga hostname for ms-fe in eqiad
Filippo Giunchedi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340138 ) Change subject: lvs: fix icinga hostname for ms-fe in eqiad .. lvs: fix icinga hostname for ms-fe in eqiad Change-Id: I40bba7eea28af5d0861ce81a040d1c7f92502d70 --- M hieradata/common/lvs/configuration.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Filippo Giunchedi: Looks good to me, approved diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index b417bb2..1547c55 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -627,7 +627,7 @@ codfw: hostname: ms-fe.svc.codfw.wmnet eqiad: - hostname: ms-fe.svc.codfw.wmnet + hostname: ms-fe.svc.eqiad.wmnet parsoid: description: "Parsoid wikitext parser for VisualEditor (%{::site})" class: low-traffic -- To view, visit https://gerrit.wikimedia.org/r/340138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40bba7eea28af5d0861ce81a040d1c7f92502d70 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi 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] mediawiki/core[master]: Fix StatusValue::setResult phpdoc typo
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340139 ) Change subject: Fix StatusValue::setResult phpdoc typo .. Fix StatusValue::setResult phpdoc typo Change-Id: If727e357d4deb138ec4e391f231b074677ec2437 --- M includes/libs/StatusValue.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/39/340139/1 diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php index db085da..63e34c2 100644 --- a/includes/libs/StatusValue.php +++ b/includes/libs/StatusValue.php @@ -154,7 +154,7 @@ } /** -* Change operation resuklt +* Change operation result * * @param bool $ok Whether the operation completed * @param mixed $value -- To view, visit https://gerrit.wikimedia.org/r/340139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If727e357d4deb138ec4e391f231b074677ec2437 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: lvs: fix icinga hostname for ms-fe in eqiad
Filippo Giunchedi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340138 ) Change subject: lvs: fix icinga hostname for ms-fe in eqiad .. lvs: fix icinga hostname for ms-fe in eqiad Change-Id: I40bba7eea28af5d0861ce81a040d1c7f92502d70 --- M hieradata/common/lvs/configuration.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/340138/1 diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index b417bb2..1547c55 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -627,7 +627,7 @@ codfw: hostname: ms-fe.svc.codfw.wmnet eqiad: - hostname: ms-fe.svc.codfw.wmnet + hostname: ms-fe.svc.eqiad.wmnet parsoid: description: "Parsoid wikitext parser for VisualEditor (%{::site})" class: low-traffic -- To view, visit https://gerrit.wikimedia.org/r/340138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40bba7eea28af5d0861ce81a040d1c7f92502d70 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move modules loaded from DAT.init/TargetLoader to ResourceLo...
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340137 ) Change subject: Move modules loaded from DAT.init/TargetLoader to ResourceLoader .. Move modules loaded from DAT.init/TargetLoader to ResourceLoader This will make it easier for third parties to load the required modules for an article-like target. Change-Id: Idb75e2bd99d8cf2c298e101cf92e8af4f85f5ad5 --- M extension.json M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js 3 files changed, 27 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/37/340137/1 diff --git a/extension.json b/extension.json index 5a4a5ea..c32ff8f 100644 --- a/extension.json +++ b/extension.json @@ -380,6 +380,7 @@ "ext.visualEditor.core.desktop", "ext.visualEditor.articleTarget", "ext.visualEditor.desktopTarget", + "ext.visualEditor.mwextensions.desktop", "jquery.cookie", "mediawiki.jqueryMsg", "mediawiki.util" @@ -514,7 +515,8 @@ "dependencies": [ "ext.visualEditor.mediawiki", "ext.visualEditor.core", - "ext.visualEditor.mwcore" + "ext.visualEditor.mwcore", + "ext.visualEditor.mwextensions" ], "messages": [ "accesskey-diff", @@ -1309,6 +1311,25 @@ "mobile" ] }, + "ext.visualEditor.mwextensions": { + "dependencies": [ + "ext.visualEditor.mwlink", + "ext.visualEditor.mwformatting", + "ext.visualEditor.data", + "ext.visualEditor.mwtransclusion", + "ext.visualEditor.mwgallery", + "ext.visualEditor.mwalienextension", + "ext.visualEditor.language", + "ext.visualEditor.icons" + ] + }, + "ext.visualEditor.mwextensions.desktop": { + "dependencies": [ + "ext.visualEditor.mwextensions", + "ext.visualEditor.mwimage", + "ext.visualEditor.mwmeta" + ] + }, "ext.visualEditor.mwformatting": { "scripts": [ "modules/ve-mw/dm/nodes/ve.dm.MWHeadingNode.js", diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js index 985da16..86eb89a 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js @@ -141,13 +141,10 @@ // and mobile are already added by TargetLoader) // Note: it's safe to use .forEach() (ES5) here, because this code will // never be called if the browser doesn't support ES5 - [ - 'ext.visualEditor.desktopArticleTarget', - 'ext.visualEditor.mwimage', - 'ext.visualEditor.mwmeta' - ].forEach( mw.libs.ve.targetLoader.addPlugin ); - // Add requested plugins - plugins.forEach( mw.libs.ve.targetLoader.addPlugin ); + [ 'ext.visualEditor.desktopArticleTarget' ] + // Add requested plugins + .concat( plugins ) + .forEach( mw.libs.ve.targetLoader.addPlugin ); plugins = []; return mw.libs.ve.targetLoader.loadModules(); } ) diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js index 2959e77..929dc31 100644 --- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js +++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js @@ -19,1
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Tests: Migrate actions.test.js to node qunit
Jhernandez has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340136 ) Change subject: Tests: Migrate actions.test.js to node qunit .. Tests: Migrate actions.test.js to node qunit Additional changes: * Fix FIXMEs about actions.js using the global mw.popups.wait instead of the require one. * Fix the unit tests to use require mocking for wait.js instead of global variable mocking Change-Id: I8e3e87b158bd11c9620e77d0a73e611cf9e82183 --- M resources/dist/index.js M resources/dist/index.js.map M src/actions.js A tests/node-qunit/actions.test.js D tests/qunit/ext.popups/actions.test.js 5 files changed, 433 insertions(+), 423 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/36/340136/1 -- To view, visit https://gerrit.wikimedia.org/r/340136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e3e87b158bd11c9620e77d0a73e611cf9e82183 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Jhernandez ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix broken DatabaseUpdater::dropExtensionTable call
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340129 ) Change subject: Fix broken DatabaseUpdater::dropExtensionTable call .. Fix broken DatabaseUpdater::dropExtensionTable call The issue was introduced in I9f6d4041b16c6d1d0414ee8e81536a59d0aba3d4 Ib901dd95ddd77f6a1fc700499f9f3815c0ae01d0 made it worse, I'm afraid. Bug: T157651 Change-Id: I6a50bf86cf2a44688877d16a77d1545ecdef7527 --- M Hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved WMDE-Fisch: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/Hooks.php b/Hooks.php index 29de2c5..bb87919 100644 --- a/Hooks.php +++ b/Hooks.php @@ -201,7 +201,7 @@ if ( $updater->getDB()->indexExists( 'echo_event', 'type_page', __METHOD__ ) ) { $updater->addExtensionIndex( 'echo_event', 'event_type', "$dir/db_patches/patch-alter-type_page-index.sql" ); } - $updater->dropExtensionTable( 'echo_subscription' ); + $updater->dropExtensionTable( 'echo_subscription', "$dir/db_patches/patch-drop-echo_subscription.sql" ); $updater->dropExtensionField( 'echo_event', 'event_timestamp', "$dir/db_patches/patch-drop-echo_event-event_timestamp.sql" ); $updater->addExtensionField( 'echo_email_batch', 'eeb_event_hash', "$dir/db_patches/patch-email_batch-new-field.sql" ); -- To view, visit https://gerrit.wikimedia.org/r/340129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a50bf86cf2a44688877d16a77d1545ecdef7527 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) Gerrit-Reviewer: Bsitu Gerrit-Reviewer: Catrope Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Kaldari Gerrit-Reviewer: Reedy Gerrit-Reviewer: WMDE-Fisch 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...Wikibase[master]: Fix TermView components assuming all entities have labels/de...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337849 ) Change subject: Fix TermView components assuming all entities have labels/descriptions .. Fix TermView components assuming all entities have labels/descriptions I found two places in the code that still assumed all entity types implement the Labels/DescriptionsProvider interfaces. This is the most minimal patch I could do to fix this. What this patch basically does is replacing Labels/DescriptionProviders with TermLists, and AliasesProvider with AliasGroupLists. I am *not* lifting the limitation that the term views only work if they get labels and descriptions. It may make sense to make descriptions optional, but I want to do this in a later patch. With this patch labels and descriptions fall back to empty lists if an entity type does not support them. I tried to minify this patch or split it into multiple smaller patches but failed. If you have a specific suggestion, please tell me or (better) create a patch and let me rebase mine on top of yours. Bug: T134735 Change-Id: Icbee448c0fee7fbf66f68456d637fb1aeecee9f8 --- M repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php M repo/includes/ParserOutput/EntityParserOutputGenerator.php M repo/includes/ParserOutput/EntityViewPlaceholderExpander.php M repo/includes/ParserOutput/PlaceholderEmittingEntityTermsView.php M repo/tests/phpunit/includes/ParserOutput/EntityViewPlaceholderExpanderTest.php M repo/tests/phpunit/includes/ParserOutput/PlaceholderEmittingEntityTermsViewTest.php M view/src/EntityTermsView.php M view/src/EntityView.php M view/src/SimpleEntityTermsView.php M view/src/TermsListView.php M view/tests/phpunit/SimpleEntityTermsViewTest.php M view/tests/phpunit/TermsListViewTest.php 12 files changed, 186 insertions(+), 211 deletions(-) Approvals: WMDE-leszek: Looks good to me, approved Aleksey Bekh-Ivanov (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php b/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php index 6a86e34..fd9eb4c 100644 --- a/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php +++ b/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php @@ -6,7 +6,6 @@ use User; use Wikibase\DataModel\Entity\EntityDocument; use Wikibase\DataModel\Entity\EntityId; -use Wikibase\DataModel\Term\AliasesProvider; use Wikibase\EntityFactory; use Wikibase\EntityRevision; use Wikibase\Lib\ContentLanguages; @@ -235,17 +234,10 @@ array $termsListItemsHtml = null, $languageCode ) { - // FIXME: This is not necessarily true for all entity types. - $labelsProvider = $entity; - $descriptionsProvider = $entity; - $aliasesProvider = $entity instanceof AliasesProvider ? $entity : null; - return new EntityViewPlaceholderExpander( $this->templateFactory, $user, - $labelsProvider, - $descriptionsProvider, - $aliasesProvider, + $entity, array_unique( array_merge( [ $languageCode ], $termsLanguages ) ), new MediaWikiLanguageDirectionalityLookup(), $this->languageNameLookup, diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php b/repo/includes/ParserOutput/EntityParserOutputGenerator.php index b921264..41108e7 100644 --- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php +++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php @@ -12,6 +12,7 @@ use Wikibase\DataModel\Term\AliasesProvider; use Wikibase\DataModel\Term\DescriptionsProvider; use Wikibase\DataModel\Term\LabelsProvider; +use Wikibase\DataModel\Term\TermList; use Wikibase\LanguageFallbackChain; use Wikibase\Lib\LanguageNameLookup; use Wikibase\Lib\Store\EntityInfo; @@ -352,9 +353,9 @@ 'wikibase-terms-list-items', $entityTermsView->getTermsListItems( $this->languageCode, - $entity, - $entity, - $entity instanceof AliasesProvider ? $entity : null + $entity instanceof LabelsProvider ? $entity->getLabels() : new TermList(), + $entity instanceof DescriptionsProvider ? $entity->getDescriptions() : new TermList(), + $entity instanceof AliasesProvider ? $entity->getAliasGroups() : null ) ); } diff --git a/repo/includes/ParserOutput/EntityViewPlaceholderExpander.php b/repo/includes/ParserOutput/EntityViewPlaceholderExpander.php index a967bd0..78556ca 100644 --- a
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1051 for maintenance
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340134 ) Change subject: mariadb: Depool db1051 for maintenance .. mariadb: Depool db1051 for maintenance Bug: T147747 Change-Id: Ic0601c8ae3dadf66a7331f3c4f75ebb10ddc3e26 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 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 e14afd4..3e808d1 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -95,7 +95,7 @@ 's1' => [ 'db1052' => 0, # B3 2.8TB 96GB, master # 'db1057' => 0, # C2 2.8TB 96GB, old master - 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager +# 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 50, # D1 2.8TB 160GB, api @@ -238,23 +238,23 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'recentchanges' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'recentchangeslinked' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'contributions' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'logpager' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'dump' => [ -- To view, visit https://gerrit.wikimedia.org/r/340134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0601c8ae3dadf66a7331f3c4f75ebb10ddc3e26 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo Gerrit-Reviewer: Florianschmidtwelzow 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...Wikibase[master]: Remove unused code from TermView components and tests
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340135 ) Change subject: Remove unused code from TermView components and tests .. Remove unused code from TermView components and tests Clean ups for all the comments in Icbee448. Bug: T134735 Change-Id: Ie802ef9ba0ac90bbcc1421ef230d9c8b55e91eda --- M repo/tests/phpunit/includes/ParserOutput/EntityViewPlaceholderExpanderTest.php M view/src/SimpleEntityTermsView.php M view/tests/phpunit/SimpleEntityTermsViewTest.php 3 files changed, 18 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/35/340135/1 diff --git a/repo/tests/phpunit/includes/ParserOutput/EntityViewPlaceholderExpanderTest.php b/repo/tests/phpunit/includes/ParserOutput/EntityViewPlaceholderExpanderTest.php index e3d2ce7..6625c74 100644 --- a/repo/tests/phpunit/includes/ParserOutput/EntityViewPlaceholderExpanderTest.php +++ b/repo/tests/phpunit/includes/ParserOutput/EntityViewPlaceholderExpanderTest.php @@ -6,7 +6,6 @@ use User; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; -use Wikibase\DataModel\Term\AliasesProvider; use Wikibase\Lib\LanguageNameLookup; use Wikibase\Repo\ParserOutput\EntityViewPlaceholderExpander; use Wikibase\View\DummyLocalizedTextProvider; @@ -31,12 +30,10 @@ /** * @param User $user * @param Item $item -* @param ItemId $itemId -* @param AliasesProvider|null $aliasesProvider * * @return EntityViewPlaceholderExpander */ - private function newExpander( User $user, Item $item, ItemId $itemId, AliasesProvider $aliasesProvider = null ) { + private function newExpander( User $user, Item $item ) { $templateFactory = TemplateFactory::getDefaultInstance(); $termsLanguages = [ 'de', 'en', 'ru' ]; @@ -54,23 +51,14 @@ ); } - public function provideEntityAndAliases() { + public function provideEntity() { $item = new Item( new ItemId( 'Q23' ) ); - $item->setLabel( 'en', 'Moskow' ); $item->setLabel( 'de', 'Moskau' ); - $item->setDescription( 'de', 'Hauptstadt Russlands' ); return [ - [ - $item, - $item - ], - [ - $item, - null - ] + [ $item ], ]; } @@ -94,20 +82,20 @@ } /** -* @dataProvider provideEntityAndAliases +* @dataProvider provideEntity */ - public function testGetHtmlForPlaceholder( Item $item, AliasesProvider $aliasesProvider = null ) { - $expander = $this->newExpander( $this->newUser(), $item, $item->getId(), $aliasesProvider ); + public function testGetHtmlForPlaceholder( Item $item ) { + $expander = $this->newExpander( $this->newUser(), $item ); $html = $expander->getHtmlForPlaceholder( 'termbox' ); $this->assertInternalType( 'string', $html ); } /** -* @dataProvider provideEntityAndAliases +* @dataProvider provideEntity */ - public function testRenderTermBox( Item $item, AliasesProvider $aliasesProvider = null ) { - $expander = $this->newExpander( $this->newUser(), $item, $item->getId(), $aliasesProvider ); + public function testRenderTermBox( Item $item ) { + $expander = $this->newExpander( $this->newUser(), $item ); // According to the mock objects, this should generate a term box for // 'de' and 'ru', since 'en' is already covered by the interface language. diff --git a/view/src/SimpleEntityTermsView.php b/view/src/SimpleEntityTermsView.php index e38a30f..4c759aa 100644 --- a/view/src/SimpleEntityTermsView.php +++ b/view/src/SimpleEntityTermsView.php @@ -99,7 +99,7 @@ $mainLanguageCode, $labels, $descriptions, - $aliasGroups ?: new AliasGroupList() + $aliasGroups ) ), '', @@ -150,7 +150,7 @@ * title and header section. Not necessarily identical to the interface language. * @param TermList $labels * @param TermList $descriptions -* @param AliasGroupList $aliasGroups +* @param AliasGroupList|null $aliasGroups * * @return string[] */ @@ -158,7 +158,7 @@ $mainLanguageCode,
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1051 for maintenance
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340134 ) Change subject: mariadb: Depool db1051 for maintenance .. mariadb: Depool db1051 for maintenance Bug: T147747 Change-Id: Ic0601c8ae3dadf66a7331f3c4f75ebb10ddc3e26 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/34/340134/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index e14afd4..3e808d1 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -95,7 +95,7 @@ 's1' => [ 'db1052' => 0, # B3 2.8TB 96GB, master # 'db1057' => 0, # C2 2.8TB 96GB, old master - 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager +# 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 50, # D1 2.8TB 160GB, api @@ -238,23 +238,23 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'recentchanges' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'recentchangeslinked' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'contributions' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'logpager' => [ - 'db1051' => 1, +# 'db1051' => 1, 'db1055' => 1, ], 'dump' => [ -- To view, visit https://gerrit.wikimedia.org/r/340134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0601c8ae3dadf66a7331f3c4f75ebb10ddc3e26 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] mediawiki...WikiLove[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340133 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I880dadcefbd5628848f747e89f9f5f310175f30e --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove refs/changes/33/340133/1 diff --git a/Gemfile b/Gemfile index f4fee4f..d9068b3 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '0.33.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index f6c2b2a..4e64097 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,55 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -81,28 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 10.4, >= 10.4.2) rubocop (= 0.33.0) BUNDLED WITH - 1.11.2 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340133 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I880dadcefbd5628848f747e89f9f5f310175f30e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLove Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: portals: cleanup Apache configuration template
Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340132 ) Change subject: portals: cleanup Apache configuration template .. portals: cleanup Apache configuration template The portals Apache configuration had quite a bit of duplication, which make it hard to understand exactly what is specific to each portal. This change factorize the most common code, but let's the portals that diverge from the common template as they are. Change-Id: Ie8fb234bcc12961897ad2b9fc6e5fd6aceda4d45 --- A modules/mediawiki/manifests/web/portals.pp M modules/mediawiki/manifests/web/sites.pp A modules/mediawiki/templates/apache/sites/wikivoyage-additional.conf.erb M modules/mediawiki/templates/apache/sites/wwwportals.conf.erb 4 files changed, 39 insertions(+), 203 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/340132/1 diff --git a/modules/mediawiki/manifests/web/portals.pp b/modules/mediawiki/manifests/web/portals.pp new file mode 100644 index 000..7e08ef0 --- /dev/null +++ b/modules/mediawiki/manifests/web/portals.pp @@ -0,0 +1,23 @@ +class mediawiki::web::portals ( +$portal_dir, +) { + +$rewrite_portal = $portal_dir != 'portal' + +$additional_portals = { +'wikibooks' => { }, +'wikinews'=> { }, +'wikiquote' => { }, +'wikiversity' => { }, +'wikivoyage' => { +'additional_config' => template('mediawiki/apache/sites/wikivoyage-additional.conf.erb') +}, +'wiktionary' => { }, +} + +apache::site { 'wwwportals': +content => template('mediawiki/apache/sites/wwwportals.conf.erb'), +priority => 1, +} + +} \ No newline at end of file diff --git a/modules/mediawiki/manifests/web/sites.pp b/modules/mediawiki/manifests/web/sites.pp index 92d7a07..607cf74 100644 --- a/modules/mediawiki/manifests/web/sites.pp +++ b/modules/mediawiki/manifests/web/sites.pp @@ -40,9 +40,8 @@ priority => 0, } -$rewrite_portal = $portal_dir != 'portal' -apache::site { 'wwwportals': -content => template('mediawiki/apache/sites/wwwportals.conf.erb'), -priority => 1, +class { 'mediawiki::web::portals': +portal_dir => $portal_dir, } + } diff --git a/modules/mediawiki/templates/apache/sites/wikivoyage-additional.conf.erb b/modules/mediawiki/templates/apache/sites/wikivoyage-additional.conf.erb new file mode 100644 index 000..e97f774 --- /dev/null +++ b/modules/mediawiki/templates/apache/sites/wikivoyage-additional.conf.erb @@ -0,0 +1,4 @@ +# Old /de +RewriteRule ^/de/(.*)$ %{ENV:RW_PROTO}://de.wikivoyage.<%= @domain_suffix %>/wiki/$1 [R=301,L] +# Old /it +RewriteRule ^/it/(.*)$ %{ENV:RW_PROTO}://it.wikivoyage.<%= @domain_suffix %>/wiki/$1 [R=301,L] diff --git a/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb b/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb index 98f9157..ce414a7 100644 --- a/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb +++ b/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb @@ -91,15 +91,15 @@ RewriteRule ^/$ /w/mobilelanding.php [L] +<% @additional_portals.keys.sort.each do |portal| -%> -ServerName www.wiktionary.<%= @domain_suffix %> -ServerAlias m.wiktionary.<%= @domain_suffix %> +ServerName www.<%= portal %>.<%= @domain_suffix %> +ServerAlias m.<%= portal %>.<%= @domain_suffix %> DocumentRoot /srv/mediawiki/docroot/wwwportal php_admin_flag engine on - RewriteEngine On RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}] @@ -107,7 +107,7 @@ RewriteRule . - [E=RW_PROTO:http] # Front page... -RewriteRule ^/$ /<%= @portal_dir %>/wiktionary.org/index.html [L] +RewriteRule ^/$ /<%= @portal_dir %>/<%= portal %>.org/index.html [L] <%- if @rewrite_portal -%> RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L] <%- end -%> @@ -124,204 +124,14 @@ # search-redirect.php, let it through RewriteRule ^/search-redirect.php /w/search-redirect.php [L] -# Everything else -RewriteCond %{REQUEST_URI} !=/w/404.php -RewriteRule ^(.*)$ %{ENV:RW_PROTO}://en.wiktionary.<%= @domain_suffix %>$1 [R=301,L] - - - -ServerName www.wikinews.<%= @domain_suffix %> -ServerAlias m.wikinews.<%= @domain_suffix %> - -DocumentRoot /srv/mediawiki/docroot/wwwportal - -php_admin_flag engine on - - - -RewriteEngine On -RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}] -RewriteCond %{ENV:RW_PROTO} !=https -RewriteRule . - [E=RW_PROTO:http] - -# Front page... -RewriteRule ^/$ /<%= @portal_dir %>/wikinews.org/index.html [L] -<%- if @rewrite_portal -%> -RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L] -<%- end -%> - -# We need to be able to update HTML on short notice - -Header set Cache-C
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix broken DatabaseUpdater::dropExtensionTable call
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340129 ) Change subject: Fix broken DatabaseUpdater::dropExtensionTable call .. Fix broken DatabaseUpdater::dropExtensionTable call The issue was introduced in I9f6d4041b16c6d1d0414ee8e81536a59d0aba3d4 Ib901dd95ddd77f6a1fc700499f9f3815c0ae01d0 made it worse, I'm afraid. Bug: T157651 Change-Id: I6a50bf86cf2a44688877d16a77d1545ecdef7527 --- M Hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/29/340129/1 diff --git a/Hooks.php b/Hooks.php index 29de2c5..bb87919 100644 --- a/Hooks.php +++ b/Hooks.php @@ -201,7 +201,7 @@ if ( $updater->getDB()->indexExists( 'echo_event', 'type_page', __METHOD__ ) ) { $updater->addExtensionIndex( 'echo_event', 'event_type', "$dir/db_patches/patch-alter-type_page-index.sql" ); } - $updater->dropExtensionTable( 'echo_subscription' ); + $updater->dropExtensionTable( 'echo_subscription', "$dir/db_patches/patch-drop-echo_subscription.sql" ); $updater->dropExtensionField( 'echo_event', 'event_timestamp', "$dir/db_patches/patch-drop-echo_event-event_timestamp.sql" ); $updater->addExtensionField( 'echo_email_batch', 'eeb_event_hash', "$dir/db_patches/patch-email_batch-new-field.sql" ); -- To view, visit https://gerrit.wikimedia.org/r/340129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a50bf86cf2a44688877d16a77d1545ecdef7527 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340131 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I784fc7bb85f32d5e50b5abb500c51493839ccebe --- M Gemfile M Gemfile.lock 2 files changed, 30 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/31/340131/1 diff --git a/Gemfile b/Gemfile index b798dce..3f10f1d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' gem 'commons_upload', '~> 1.0', '>= 1.0.1' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.32.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 4e581c1..e67ecc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.3.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) commons_upload (1.0.1) mediawiki_api (~> 0.7.0) @@ -15,13 +15,13 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) +diff-lcs (1.3) domain_name (0.5.20160615) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -30,40 +30,43 @@ http-cookie (~> 1.0.0) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) +headless (2.3.1) http-cookie (1.0.2) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) +i18n (0.8.1) +json (2.0.3) mediawiki_api (0.7.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.3.1.2) ast (~> 2.2) powerpack (0.1.1) @@ -83,19 +86,19 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.8.1) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS @@ -103,9 +106,9 @@ DEPENDENCIES commons_upload (~> 1.0, >= 1.0.1) - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.32.1) BUNDLED WITH - 1.12.5 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I784fc7bb85f32d5e50b5abb500c51493839ccebe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: production.my.cnf: Enable gtid_domaid_id
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340130 ) Change subject: production.my.cnf: Enable gtid_domaid_id .. production.my.cnf: Enable gtid_domaid_id We have been testing gtid_domain_id for a long time now, first on misc servers, then on s6 and on s2. So far there have been no issues, so I would like to enable it on all the servers in production. We have only seen issues with GTID+multisource, and we are not planning to enable GTID on multisource slaves until we have found a way to do so safely (or MariaDB has solved the bug). Bug: T149418 Change-Id: I906585acbb04d82ab5b0aee18f55637f781d9995 --- M modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/340130/1 diff --git a/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb b/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb index 1346ad2..8635145 100644 --- a/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb +++ b/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb @@ -30,14 +30,12 @@ datadir= <%= @datadir %> tmpdir = <%= @tmpdir %> server_id = <%= @server_id %> -<% if @shard == 's6' || @shard == 's2' -%> # gtid_domain_id flag is needed for multisource replication and GTID. # Strictly it is only needed on masters or servers that can potentially be # masters but for consistency it should be set in all of them. # https://mariadb.com/kb/en/mariadb/gtid/ gtid_domain_id = <%= @gtid_domain_id %> -<% end -%> skip-external-locking skip-name-resolve -- To view, visit https://gerrit.wikimedia.org/r/340130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I906585acbb04d82ab5b0aee18f55637f781d9995 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340128 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I2554a33ea3f7d2583bbedd857d925b33ddbe497e --- M Gemfile M Gemfile.lock 2 files changed, 38 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles refs/changes/28/340128/1 diff --git a/Gemfile b/Gemfile index 267bb50..151b7c2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.29.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 23219ab..6b20477 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,55 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.3) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.10) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.1.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.3.0) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -81,25 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.0) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.1) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.29.1) + +BUNDLED WITH + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2554a33ea3f7d2583bbedd857d925b33ddbe497e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RelatedArticles Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...QuickSurveys[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340127 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I235423081288fae86ea9d565fb5df4e163ea8f62 --- M Gemfile M Gemfile.lock 2 files changed, 38 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys refs/changes/27/340127/1 diff --git a/Gemfile b/Gemfile index 9e0d360..35c7f03 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.34.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 0e4175c..7809458 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,55 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -81,25 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.34.1) + +BUNDLED WITH + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I235423081288fae86ea9d565fb5df4e163ea8f62 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340126 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I3d837bfb97c0fefcfd84672c43843de6d76a3765 --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage refs/changes/26/340126/1 diff --git a/Gemfile b/Gemfile index c7d0f7c..0f4ba53 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.35.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 72b1de6..6d89e7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,55 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.3.0) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -82,29 +85,29 @@ ruby-progressbar (~> 1.7) tins (<= 1.6.0) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) tins (1.6.0) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 11.1, >= 11.1.1) rubocop (~> 0.35.1) BUNDLED WITH - 1.11.2 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340126 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d837bfb97c0fefcfd84672c43843de6d76a3765 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340125 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: Ie939cecfadd014fd69110a2f985516c753c2ee69 --- M Gemfile M Gemfile.lock 2 files changed, 41 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/25/340125/1 diff --git a/Gemfile b/Gemfile index 130a3aa..a815a01 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 10.5' gem 'rubocop', '~> 0.33.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index b2c8c82..6d959ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,52 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160310) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.3) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -ffi (1.9.10) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.6.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) -mediawiki_selenium (1.7.1) + faraday_middleware (~> 0.10, >= 0.10.0) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) - mediawiki_api (~> 0.6, >= 0.6.0) - page-object (~> 1.0) + json (~> 2.0, >= 2.0.2) + mediawiki_api (~> 0.7, >= 0.7.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.1.1) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -78,25 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.0) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) -syntax (1.2.0) -thor (0.19.1) +syntax (1.2.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.1) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.1) + mediawiki_selenium (~> 1.8) rake (~> 10.5) rubocop (~> 0.33.0) + +BUNDLED WITH + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie939cecfadd014fd69110a2f985516c753c2ee69 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GettingStarted[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340124 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I80124f9d3cb28861551854c1c9b42970af3bedd9 --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted refs/changes/24/340124/1 diff --git a/Gemfile b/Gemfile index 7bad052..f3acc08 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.34.2', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 4fc94b0..8fcd52c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,55 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -81,28 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 11.1, >= 11.1.1) rubocop (~> 0.34.2) BUNDLED WITH - 1.11.2 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80124f9d3cb28861551854c1c9b42970af3bedd9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GettingStarted Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool-data: add first discovery objects
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339674 ) Change subject: conftool-data: add first discovery objects .. conftool-data: add first discovery objects Bug: T149617 Change-Id: I117e94dd813b5b631da571e7d5123a5671c9ecc9 --- A conftool-data/discovery/mediawiki.yaml A conftool-data/discovery/services.yaml 2 files changed, 46 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/conftool-data/discovery/mediawiki.yaml b/conftool-data/discovery/mediawiki.yaml new file mode 100644 index 000..72016e8 --- /dev/null +++ b/conftool-data/discovery/mediawiki.yaml @@ -0,0 +1,14 @@ +appserver: + apache2: [eqiad, codfw] + nginx: [eqiad, codfw] +api_appserver: + apache2: [eqiad, codfw] + nginx: [eqiad, codfw] +imagescaler: + apache2: [eqiad, codfw] + nginx: [eqiad, codfw] +swift: + swift-fe: [eqiad, codfw] + nginx: [eqiad, codfw] +thumbor: + thumbor: [eqiad] diff --git a/conftool-data/discovery/services.yaml b/conftool-data/discovery/services.yaml new file mode 100644 index 000..9240bd7 --- /dev/null +++ b/conftool-data/discovery/services.yaml @@ -0,0 +1,32 @@ +parsoid: + parsoid: [eqiad, codfw] +elasticsearch: + elasticsearch: [eqiad, codfw] + elasticsearch-ssl: [eqiad, codfw] +pdf: + ocg: [eqiad] +sca: + zotero: [eqiad, codfw] +scb: + mobileapps: [eqiad, codfw] + eventstreams: [eqiad, codfw] + mathoid: [eqiad, codfw] + graphoid: [eqiad, codfw] + citoid: [eqiad, codfw] + apertium: [eqiad, codfw] + cxserver: [eqiad, codfw] + ores: [eqiad, codfw] + pdfrender: [eqiad, codfw] + trendingedits: [eqiad, codfw] +restbase: + restbase: [eqiad, codfw] +maps: + kartotherian: [eqiad, codfw] +aqs: + aqs: [eqiad] +eventbus: + eventbus: [eqiad, codfw] +wdqs: + wdqs: [eqiad, codfw] +logstash: + kibana: [eqiad] -- To view, visit https://gerrit.wikimedia.org/r/339674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I117e94dd813b5b631da571e7d5123a5671c9ecc9 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Volans 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...Flow[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340123 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I2bc97d47e7d9c225bd55489048bad925b6169349 --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/23/340123/1 diff --git a/Gemfile b/Gemfile index c3bedf3..b5a3497 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org"; gem "csscss", "~> 1.3.3" -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 11.1', '>= 11.1.1' gem "rubocop", "~> 0.32.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index ad509cd..5e814ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,8 +5,8 @@ astrolabe (1.3.1) parser (~> 2.2) blankslate (3.1.3) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) colorize (0.7.7) csscss (1.3.3) @@ -18,55 +18,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) parslet (1.7.1) @@ -88,19 +91,19 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS @@ -108,9 +111,9 @@ DEPENDENCIES csscss (~> 1.3.3) - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 11.1, >= 11.1.1) rubocop (~> 0.32.1) BUNDLED WITH - 1.11.2 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bc97d47e7d9c225bd55489048bad925b6169349 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340122 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I8fd811c69d55c3d787356b905a6add1c1cd289c4 --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/22/340122/1 diff --git a/Gemfile b/Gemfile index e9351eb..5bad5f1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' gem 'csscss', '~> 1.3.3' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.34.2', require: false diff --git a/Gemfile.lock b/Gemfile.lock index dbc5c29..b735c2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,8 +5,8 @@ astrolabe (1.3.1) parser (~> 2.2) blankslate (3.1.3) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) colorize (0.7.7) csscss (1.3.3) @@ -18,55 +18,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) parslet (1.7.1) @@ -88,19 +91,19 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS @@ -108,9 +111,9 @@ DEPENDENCIES csscss (~> 1.3.3) - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 11.1, >= 11.1.1) rubocop (~> 0.34.2) BUNDLED WITH - 1.11.2 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fd811c69d55c3d787356b905a6add1c1cd289c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340121 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: I2a659ef38a079232c096dff1506225f5af9a076f --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/21/340121/1 diff --git a/Gemfile b/Gemfile index 1e7893c..db08bbe 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org"; -gem "mediawiki_selenium", "~> 1.7", ">= 1.7.2" +gem 'mediawiki_selenium', '~> 1.8' gem "mimemagic", "~> 0.3.0" gem "parallel_tests", "~> 1.7.0" gem "rake", "~> 10.4", ">= 10.4.2" diff --git a/Gemfile.lock b/Gemfile.lock index bf746a8..191b71d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,56 +13,59 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) mimemagic (0.3.1) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parallel (1.8.0) parallel_tests (1.7.1) parallel @@ -86,31 +89,31 @@ ruby-progressbar (~> 1.7) tins (<= 1.6.0) ruby-progressbar (1.8.0) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) tins (1.6.0) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) mimemagic (~> 0.3.0) parallel_tests (~> 1.7.0) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.35.1) BUNDLED WITH - 1.10.6 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a659ef38a079232c096dff1506225f5af9a076f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Hygiene: Rename isSendBeaconCapable
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339190 ) Change subject: Hygiene: Rename isSendBeaconCapable .. Hygiene: Rename isSendBeaconCapable isSendBeaconCapable -> supportsBeacon for consistency with supportsNavigationTiming. Bug: T155639 Change-Id: I4ca13e44b3c091da732d4728ec4e2aa667e93226 --- M modules/ext.wikimediaEvents.readingDepth.js 1 file changed, 7 insertions(+), 10 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified Phuedx: Looks good to me, approved diff --git a/modules/ext.wikimediaEvents.readingDepth.js b/modules/ext.wikimediaEvents.readingDepth.js index 2b5392d..74efae6 100644 --- a/modules/ext.wikimediaEvents.readingDepth.js +++ b/modules/ext.wikimediaEvents.readingDepth.js @@ -151,14 +151,11 @@ } /** -* Checks whether the current browser supports sendBeacon feature. -* -* FIXME: Rename this to be consistent with `supportsNavigationTiming`, which -* itself is consistent with the wording used in `isEnabled`. +* Checks whether the UA supports the Beacon API. * * @return {boolean} */ - function isSendBeaconCapable() { + function supportsBeacon() { return $.isFunction( navigator.sendBeacon ); } @@ -173,17 +170,17 @@ } /** -* Checks whether the browser is capable and should track reading depth. -* A browser is considered capable if it supports send beacon and navigationTiming -* It should track if the user is in the sampling group and the schema has been enabled -* by a sysadmin. +* Checks whether the browser is capable and should track reading depth. A +* browser is considered capable if it supports the Beacon APIs and the +* Navigation Timing API. It should track if the user is in the sampling group +* and the schema has been enabled by a sysadmin. * * @return {boolean} */ function isEnabled() { return config.get( 'wgWMEReadingDepthEnabled' ) && supportsNavigationTiming() && - isSendBeaconCapable() && + supportsBeacon() && isInSample( config.get( 'wgWMEReadingDepthSamplingRate', 0 ) ); } -- To view, visit https://gerrit.wikimedia.org/r/339190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ca13e44b3c091da732d4728ec4e2aa667e93226 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: master Gerrit-Owner: Phuedx Gerrit-Reviewer: Bmansurov Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Phuedx 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...CentralNotice[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340120 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: Ibdc6cce05aef7f1c8d4fe3cc2e75b51587dcc52f --- M Gemfile M Gemfile.lock 2 files changed, 41 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/20/340120/1 diff --git a/Gemfile b/Gemfile index 242f608..35c7f03 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.34.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 50752de..7809458 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,52 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160310) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.3) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -ffi (1.9.10) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.6.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) -mediawiki_selenium (1.7.1) + faraday_middleware (~> 0.10, >= 0.10.0) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) - mediawiki_api (~> 0.6, >= 0.6.0) - page-object (~> 1.0) + json (~> 2.0, >= 2.0.2) + mediawiki_api (~> 0.7, >= 0.7.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.1.1) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -78,25 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.0) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) -syntax (1.2.0) -thor (0.19.1) +syntax (1.2.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.1) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.1) + mediawiki_selenium (~> 1.8) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.34.1) + +BUNDLED WITH + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdc6cce05aef7f1c8d4fe3cc2e75b51587dcc52f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Allow LDAP access to corp mirrors from terbium
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340119 ) Change subject: Allow LDAP access to corp mirrors from terbium .. Allow LDAP access to corp mirrors from terbium terbium runs the daily account check and I'd like to extend it with a new check which checks WMF accounts against the corp LDAP mirror, so add terbium to the list of allowed hosts. Change-Id: Ie7b123c8cd08d80ea5530d908156ba9139a2fbb5 --- M modules/role/manifests/openldap/corp.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/19/340119/1 diff --git a/modules/role/manifests/openldap/corp.pp b/modules/role/manifests/openldap/corp.pp index d53cd5b..6ca0ffb 100644 --- a/modules/role/manifests/openldap/corp.pp +++ b/modules/role/manifests/openldap/corp.pp @@ -34,7 +34,7 @@ ferm::service { 'corp_ldap': proto => 'tcp', port => '389', # Yes, explicitly not supporting LDAPS (port 636) -srange => '@resolve((dubnium.wikimedia.org pollux.wikimedia.org mx1001.wikimedia.org mx2001.wikimedia.org))', +srange => '@resolve((dubnium.wikimedia.org pollux.wikimedia.org mx1001.wikimedia.org mx2001.wikimedia.org terbium.eqiad.wmnet))', } monitoring::service { 'corp_ldap_mirror': -- To view, visit https://gerrit.wikimedia.org/r/340119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7b123c8cd08d80ea5530d908156ba9139a2fbb5 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] mediawiki...CentralAuth[master]: Update tests to Selenium 3
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340118 ) Change subject: Update tests to Selenium 3 .. Update tests to Selenium 3 Bug: T158074 Change-Id: Icee0ec91520e6f30e7a414dba09b5942cacfcf66 --- M Gemfile M Gemfile.lock 2 files changed, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/18/340118/1 diff --git a/Gemfile b/Gemfile index 5504568..612e0b1 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' +gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.34.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 770b0b0..241df73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) -builder (3.2.2) -childprocess (0.5.9) +builder (3.2.3) +childprocess (0.6.2) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,55 +13,58 @@ gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) -data_magic (0.22) +data_magic (1.0) faker (>= 1.1.2) yml_reader (>= 0.6) -diff-lcs (1.2.5) -domain_name (0.5.20160615) +diff-lcs (1.3) +domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) -faker (1.6.6) +faker (1.7.3) i18n (~> 0.5) -faraday (0.9.2) +faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) -ffi (1.9.14) +faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) +ffi (1.9.17) gherkin (2.12.2) multi_json (~> 1.3) -headless (2.2.3) -http-cookie (1.0.2) +headless (2.3.1) +http-cookie (1.0.3) domain_name (~> 0.5) -i18n (0.7.0) -json (1.8.3) -mediawiki_api (0.7.0) +i18n (0.8.1) +json (2.0.3) +mediawiki_api (0.7.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.7.2) +mediawiki_selenium (1.8.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) - json (~> 1.8, >= 1.8.1) + json (~> 2.0, >= 2.0.2) mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 1.0) + page-object (~> 2.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) + selenium-webdriver (~> 3.1.0) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) -mime-types (2.99.2) +mime-types (2.99.3) multi_json (1.12.1) multi_test (0.1.2) multipart-post (2.0.0) +net-http-persistent (2.9.4) netrc (0.11.0) -page-object (1.2.0) +page-object (2.0.0) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) -page_navigation (0.9) - data_magic (>= 0.14) + selenium-webdriver (~> 3.0) + watir (~> 6.0) +page_navigation (0.10) + data_magic (>= 0.22) parser (2.2.2.6) ast (>= 1.1, < 3.0) powerpack (0.1.1) @@ -81,28 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) -rubyzip (1.2.0) -selenium-webdriver (2.53.4) +rubyzip (1.2.1) +selenium-webdriver (3.1.0) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.1) -thor (0.19.1) +thor (0.19.4) unf (0.1.4) unf_ext unf_ext (0.0.7.2) -watir-webdriver (0.9.3) - selenium-webdriver (>= 2.46.2) -websocket (1.2.3) +watir (6.2.0) + selenium-webdriver (~> 3.0) +websocket (1.2.4) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.2) + mediawiki_selenium (~> 1.8) rake (~> 11.1, >= 11.1.1) rubocop (~> 0.34.1) BUNDLED WITH - 1.12.4 + 1.14.5 -- To view, visit https://gerrit.wikimedia.org/r/340118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icee0ec91520e6f30e7a414dba09b5942cacfcf66 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Use explicit groups for file resources
Rush has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/324729 ) Change subject: labstore: Use explicit groups for file resources .. labstore: Use explicit groups for file resources Currently, the file resources for /usr/local/sbin/block-for-export and /usr/local/sbin/nfs-mount-manager have no group attributes causing Puppet to take the (numerical) group the source file has on the puppetmaster, i. e. gitpuppet in the case of a newly launched puppetmaster. This change adds explicit group attributes for those file resources. Bug: T152095 Change-Id: I94d170931870be88802a299348e1d0fe962108bd --- M modules/labstore/manifests/nfs_mount.pp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/labstore/manifests/nfs_mount.pp b/modules/labstore/manifests/nfs_mount.pp index 6c1d02a..99e2890 100644 --- a/modules/labstore/manifests/nfs_mount.pp +++ b/modules/labstore/manifests/nfs_mount.pp @@ -100,6 +100,7 @@ file { '/usr/local/sbin/nfs-mount-manager': ensure => present, owner => 'root', +group => 'root', mode => '0655', source => 'puppet:///modules/labstore/nfs-mount-manager', } @@ -135,6 +136,7 @@ file { '/usr/local/sbin/block-for-export': ensure => present, owner => 'root', +group => 'root', mode => '0555', source => 'puppet:///modules/labstore/block-for-export', } -- To view, visit https://gerrit.wikimedia.org/r/324729 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I94d170931870be88802a299348e1d0fe962108bd Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Chasemp Gerrit-Reviewer: Madhuvishy Gerrit-Reviewer: Rush 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] operations/mediawiki-config[master]: New namespace aliases for itwikiversity
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339348 ) Change subject: New namespace aliases for itwikiversity .. New namespace aliases for itwikiversity NS_USER: U NS_USER_TALK: UT NS_PROJECT: WV NS_PROJECT_TALK: DWV NS_TEMPLATE: T NS_TEMPLATE_TALK: DT NS_HELP: H NS_HELP_TALK: DH NS_CATEGORY: CAT NS_CATEGORY_TALK: DCAT Discussioni area: DAREA Discussioni corso: DC Materia: MA Discussioni materia: DMA Dipartimento: DIP Discussioni dipartimento: DDIP Bug: T158775 Change-Id: Ibd91b809854783038fda5cf6fa6541b1b3fa6db3 --- M wmf-config/InitialiseSettings.php 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index cb124a6..87c2a1f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -3306,7 +3306,23 @@ ], '+itwikiversity' => [ 'Facoltà' => 100, - 'Discussioni_facoltà' => 101 + 'Discussioni_facoltà' => 101, + 'U' => NS_USER, // T158775 + 'UT' => NS_USER_TALK, // T158775 + 'WV' => NS_PROJECT, // T158775 + 'DWV' => NS_PROJECT_TALK, // T158775 + 'T' => NS_TEMPLATE, // T158775 + 'DT' => NS_TEMPLATE_TALK, // T158775 + 'H' => NS_HELP, // T158775 + 'DH' => NS_HELP_TALK, // T158775 + 'CAT' => NS_CATEGORY, // T158775 + 'DCAT' => NS_CATEGORY_TALK, // T158775 + 'DAREA' => 101, // T158775 + 'DC' => 103, // T158775 + 'MA' => 104, // T158775 + 'DMA' => 105, // T158775 + 'DIP' => 106, // T158775 + 'DDIP' => 107, // T158775 ], '+itwiktionary' => [ 'WZ' => NS_PROJECT, -- To view, visit https://gerrit.wikimedia.org/r/339348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd91b809854783038fda5cf6fa6541b1b3fa6db3 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hashar Gerrit-Reviewer: MarcoAurelio 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...Collection[master]: Switching to eslint and fixing issues
WMDE-Fisch has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340117 ) Change subject: Switching to eslint and fixing issues .. Switching to eslint and fixing issues Mostly done by eslint auto fixer. Exceptions added for issues not fixed. Change-Id: I1830b0494e443915da8990f3230e33017b604d87 --- A .eslintrc.json D .jscsrc D .jshintignore D .jshintrc M Gruntfile.js M modules/bookcreator.css M modules/bookcreator.js M modules/check_load_from_localstorage.js M modules/collection.js M modules/suggest.js M package.json 11 files changed, 420 insertions(+), 434 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection refs/changes/17/340117/1 diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 000..b0518cf --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,17 @@ +{ + "extends": "wikimedia", + "env": { + "browser": true, + "jquery": true + }, + "globals": { + "mediaWiki": false + }, + "rules": { + "camelcase": 0, + // TODO: + "no-use-before-define": 0, + "vars-on-top": 0, + "one-var": 0 + } +} diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index 7cc5602..000 --- a/.jscsrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "preset": "wikimedia", - // allow some slop to account for legacy code - "requireCamelCaseOrUpperCaseIdentifiers": null, - "requireMultipleVarDecl": true, - "disallowQuotedKeysInObjects": null, - - "excludeFiles": [ - "node_modules/**" - ] -} diff --git a/.jshintignore b/.jshintignore deleted file mode 100644 index 3c3629e..000 --- a/.jshintignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 61e5732..000 --- a/.jshintrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - // Enforcing - "bitwise": true, - "eqeqeq": true, - "es3": true, - "freeze": true, - "latedef": true, - "noarg": true, - "nonew": true, - "undef": true, - "unused": true, - - // Environment - "browser": true, - - "globals": { - "jQuery": false, - "mw": false, - "OO": false, - "JSON": false - } -} diff --git a/Gruntfile.js b/Gruntfile.js index a3c49a8..4cd76d7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,33 +1,35 @@ -/*jshint node:true */ +/* eslint-env node */ module.exports = function ( grunt ) { - grunt.loadNpmTasks( 'grunt-jsonlint' ); - grunt.loadNpmTasks( 'grunt-contrib-jshint' ); - grunt.loadNpmTasks( 'grunt-jscs' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); + grunt.loadNpmTasks( 'grunt-eslint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-stylelint' ); grunt.initConfig( { - jshint: { - options: { - jshintrc: true - }, + eslint: { all: [ - 'modules/*.js' + '*.js', + 'modules/**/*.js' ] }, - jscs: { - src: '<%= jshint.all %>' - }, - jsonlint: { + stylelint: { all: [ - '**/*.json', + 'modules/**/*.css', '!node_modules/**' ] }, banana: { all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] } } ); - grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'stylelint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/modules/bookcreator.css b/modules/bookcreator.css index 5e745f5..3d9e660 100644 --- a/modules/bookcreator.css +++ b/modules/bookcreator.css @@ -5,7 +5,7 @@ z-index: ; display: inline; font-size: 10pt; - background: white; + background: #fff; } /* @@ -46,7 +46,7 @@ .collection-create-chapter-list { padding: 10px 20px; - border: 1px solid rgb(170, 170, 170); + border: 1px solid rgb( 170, 170, 170 ); } .collection-create-chapter-list-text { @@ -60,7 +60,7 @@ } .collection-create-chapter-list .chapter { - margin-top:0.3em; + margin-top: 0.3em;
[MediaWiki-commits] [Gerrit] mediawiki/selenium[master]: Release minor version 1.8.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340112 ) Change subject: Release minor version 1.8.0 .. Release minor version 1.8.0 Bug: T158074 Change-Id: Ibf4ffd87c42559e55a3925895a49dfaf7e0b7330 --- M RELEASES.md M lib/mediawiki_selenium/version.rb 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: Zfilipin: Looks good to me, approved Hashar: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/RELEASES.md b/RELEASES.md index 315f006..1e271af 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,5 +1,23 @@ ## Release notes +### 1.8.0 2017-02-27 +* Remove raita entirely +* Major updates in dependencies: + * page-object updated to version 2 + * Watir updated to version 6 + * Selenium updated to version 3 +* Major changes caused by upgrade to Selenium 3: + * default browser is Chrome, instead of Firefox + * geckodriver needs to be installed when driving Firefox +* For more information about upstream changes: + * Selenium: +* Blog: https://seleniumhq.wordpress.com/ +* Release notes: https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES + * Watir: +* Blog: http://watir.github.io/blog/ +* Release notes: https://github.com/watir/watir/blob/master/CHANGES.md + * page-object release notes: https://github.com/cheezy/page-object/blob/master/ChangeLog + ### 1.7.4 2016-12-28 * Update JSON gem to version 2 diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 12107fc..4bb1406 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -1,3 +1,3 @@ module MediawikiSelenium - VERSION = '1.7.4' + VERSION = '1.8.0' end -- To view, visit https://gerrit.wikimedia.org/r/340112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf4ffd87c42559e55a3925895a49dfaf7e0b7330 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: DCausse Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Hashar Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Mattflaschen Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Physikerwelt Gerrit-Reviewer: Sbisson Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: WMDE-Fisch Gerrit-Reviewer: Zfilipin 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]: Disallow geo-shape data type on wikidata for now
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339446 ) Change subject: Disallow geo-shape data type on wikidata for now .. Disallow geo-shape data type on wikidata for now until it has been announced, with chance for tool and bot developers to adapt their things, and to try it on test.wikidata. Bug: T158849 Change-Id: I88f7923dfe8bfdeb9a61afd706fe64a2f239d17a --- M wmf-config/Wikibase-production.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Aude: Looks good to me, approved Hoo man: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/Wikibase-production.php b/wmf-config/Wikibase-production.php index 7255b16..6fc320b 100644 --- a/wmf-config/Wikibase-production.php +++ b/wmf-config/Wikibase-production.php @@ -41,6 +41,11 @@ 'Q20748093' => 'wb-badge-validated', 'Q28064618' => 'wb-badge-digitaldocument', // T153186 ]; + + $wgWBRepoSettings['disabledDataTypes'] = [ + 'geo-shape' + ]; + $wgWBRepoSettings['preferredGeoDataProperties'] = [ 'P625', ]; -- To view, visit https://gerrit.wikimedia.org/r/339446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88f7923dfe8bfdeb9a61afd706fe64a2f239d17a Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude Gerrit-Reviewer: Aude Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hoo man 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: Add gtid_domain_id to s2
Marostegui has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338734 ) Change subject: mariadb: Add gtid_domain_id to s2 .. mariadb: Add gtid_domain_id to s2 Enable gtid_domain_id on s2. After a few days letting it run on s6 It has been running for for weeks on the misc shards so it is time to slowly deploy it on production shards. Bug: T149418 Change-Id: Iacfd9cab8535e34e40e29d3afa9fda3310f9d8f0 --- M modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb b/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb index a856935..1346ad2 100644 --- a/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb +++ b/modules/role/templates/mariadb/mysqld_config/production.my.cnf.erb @@ -30,7 +30,7 @@ datadir= <%= @datadir %> tmpdir = <%= @tmpdir %> server_id = <%= @server_id %> -<% if @shard == 's6' -%> +<% if @shard == 's6' || @shard == 's2' -%> # gtid_domain_id flag is needed for multisource replication and GTID. # Strictly it is only needed on masters or servers that can potentially be # masters but for consistency it should be set in all of them. -- To view, visit https://gerrit.wikimedia.org/r/338734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacfd9cab8535e34e40e29d3afa9fda3310f9d8f0 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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]: Don't crash when system WebView is being updated.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340115 ) Change subject: Don't crash when system WebView is being updated. .. Don't crash when system WebView is being updated. This patch makes PageActivity catch exception(s) related to inflation of the WebView, meaning that we will now handle the condition when the app is launched at the precise moment when the system WebView is being updated. The behavior will be to show the user a brief message and immediately close PageActivity. (but it's better than crashing.) Change-Id: I6b2e2821f1df1117b90a5661901063a4b488895e --- M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/res/values-qq/strings.xml M app/src/main/res/values/strings.xml 3 files changed, 27 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/15/340115/1 diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java b/app/src/main/java/org/wikipedia/page/PageActivity.java index 42e833d..cdce475 100644 --- a/app/src/main/java/org/wikipedia/page/PageActivity.java +++ b/app/src/main/java/org/wikipedia/page/PageActivity.java @@ -31,6 +31,7 @@ import android.view.View; import android.view.WindowManager; import android.widget.ProgressBar; +import android.widget.Toast; import com.squareup.otto.Bus; import com.squareup.otto.Subscribe; @@ -93,12 +94,12 @@ @BindView(R.id.page_progress_bar) ProgressBar progressBar; @BindView(R.id.page_toolbar_container) View toolbarContainerView; @BindView(R.id.page_toolbar) Toolbar toolbar; -private Unbinder unbinder; +@Nullable private Unbinder unbinder; private PageFragment pageFragment; private WikipediaApp app; -private Bus bus; +@Nullable private Bus bus; private EventBusMethods busMethods; private CompatActionMode currentActionMode; @@ -127,7 +128,22 @@ } PreferenceManager.setDefaultValues(this, R.xml.preferences, false); -setContentView(R.layout.activity_page); + +try { +setContentView(R.layout.activity_page); +} catch (Exception e) { +if (e.getMessage().contains("WebView")) { +// If the system failed to inflate our activity because of the WebView (which could +// be one of several types of exceptions), it likely means that the system WebView +// is in the process of being updated. In this case, show the user a message and +// bail immediately. +Toast.makeText(app, R.string.error_webview_updating, Toast.LENGTH_LONG).show(); +finish(); +return; +} +throw e; +} + unbinder = ButterKnife.bind(this); busMethods = new EventBusMethods(); @@ -702,7 +718,9 @@ @Override public void onDestroy() { -unbinder.unbind(); +if (unbinder != null) { +unbinder.unbind(); +} unregisterBus(); super.onDestroy(); } @@ -753,7 +771,9 @@ } private void unregisterBus() { -bus.unregister(busMethods); +if (bus != null) { +bus.unregister(busMethods); +} bus = null; L.d("Unregistered bus."); } diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml index 95353d7..5edbeef 100644 --- a/app/src/main/res/values-qq/strings.xml +++ b/app/src/main/res/values-qq/strings.xml @@ -362,6 +362,7 @@ Message shown when trying to use location services but they are unavailable Button label for enabling location services {{Identical|Enable}} + Error informing the user that the System WebView is being updated, meaning that the app cannot be launched right now, and that the user should try again in a moment. Title of the dialog that pops up when the app crashes, asking user to send a report Text asking the user to send us a crash report In the dialog that pops up when the app crashes, text for button that doesn\'t send a crash report. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 52dd73d..ecfc3f2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -247,6 +247,7 @@ Sorry, voice recognition is not available. Location services are disabled. Enable +The Android System WebView is currently being updated. Please try again in a moment. Sorry, app crashed last time -- To view, visit https://gerrit.wikimedia.org/r/340115 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b2e2821f1df1117b90a5661901063a4b488895e Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant __
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Reorder check for timesyncd or ntpd
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338364 ) Change subject: Reorder check for timesyncd or ntpd .. Reorder check for timesyncd or ntpd More compact/readable, as suggested by Faidon in 337009 (PS5) Change-Id: Iab17bf50c364d82d9e344b079bd9e2dd77e166fd --- M modules/standard/manifests/init.pp 1 file changed, 3 insertions(+), 7 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/standard/manifests/init.pp b/modules/standard/manifests/init.pp index cc06107..d6c3a2d 100644 --- a/modules/standard/manifests/init.pp +++ b/modules/standard/manifests/init.pp @@ -13,14 +13,10 @@ include ::profile::cumin::target } -if hiera('use_timesyncd', false) or (os_version('debian >= stretch')) { -unless $::fqdn in $::standard::ntp::wmf_peers[$::site] { +unless $::fqdn in $::standard::ntp::wmf_peers[$::site] { +if hiera('use_timesyncd', false) or (os_version('debian >= stretch')) { include ::standard::ntp::timesyncd -} -} -else -{ -unless $::fqdn in $::standard::ntp::wmf_peers[$::site] { +} else { include ::standard::ntp::client } } -- To view, visit https://gerrit.wikimedia.org/r/338364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab17bf50c364d82d9e344b079bd9e2dd77e166fd Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: 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/dns[master]: Kill ubuntu.wikimedia.org legacy hostname
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339653 ) Change subject: Kill ubuntu.wikimedia.org legacy hostname .. Kill ubuntu.wikimedia.org legacy hostname See the equivalent commit in puppet for the rationale, c7504f68d67c4a2e4a7e4f4a3b8da7beca7d03b8 & I7ef45c8cc3f2096a3193c2278623df62e2fc21f9. Change-Id: I244f35f03824d57f2fce357ebe496312cbda4aaf --- M templates/wikimedia.org 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 8008f82..786e8f1 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -721,7 +721,6 @@ techblog 600 IN DYNA geoip!text-addrs ticket 600 IN DYNA geoip!misc-addrs tor-eqiad-1 1H IN CNAMEradium -ubuntu 1H IN CNAMEsodium mirrors 1H IN CNAMEsodium yarn 600 IN DYNA geoip!misc-addrs wikitech 1H IN CNAMEsilver -- To view, visit https://gerrit.wikimedia.org/r/339653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I244f35f03824d57f2fce357ebe496312cbda4aaf Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Kill ubuntu.wikimedia.org legacy hostname
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339652 ) Change subject: Kill ubuntu.wikimedia.org legacy hostname .. Kill ubuntu.wikimedia.org legacy hostname Our Ubuntu mirror moved to the more generic mirrors.wikimedia.org in early 2015. All of our internal use cases were migrated long ago, as was Ubuntu's mirror listing. There was plenty of time for users to migrate to the new hostname and those that didn't, realistically won't until the old hostname breaks. Change-Id: I7ef45c8cc3f2096a3193c2278623df62e2fc21f9 --- M modules/mirrors/manifests/serve.pp M modules/mirrors/templates/mirrors.wikimedia.org.conf.erb 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mirrors/manifests/serve.pp b/modules/mirrors/manifests/serve.pp index 8215b2d..e79b3eb 100644 --- a/modules/mirrors/manifests/serve.pp +++ b/modules/mirrors/manifests/serve.pp @@ -3,7 +3,7 @@ include ::nginx letsencrypt::cert::integrated { 'mirrors': -subjects => 'mirrors.wikimedia.org,ubuntu.wikimedia.org', +subjects => 'mirrors.wikimedia.org', puppet_svc => 'nginx', system_svc => 'nginx', } diff --git a/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb b/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb index 7092503..00f8a73 100644 --- a/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb +++ b/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - server_name mirrors.wikimedia.org ubuntu.wikimedia.org; + server_name mirrors.wikimedia.org; root /srv/mirrors; @@ -23,7 +23,7 @@ server { listen 443 ssl; listen [::]:443 ssl; - server_name mirrors.wikimedia.org ubuntu.wikimedia.org; + server_name mirrors.wikimedia.org; ssl_certificate /etc/acme/cert/mirrors.chained.crt; ssl_certificate_key /etc/acme/key/mirrors.key; -- To view, visit https://gerrit.wikimedia.org/r/339652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ef45c8cc3f2096a3193c2278623df62e2fc21f9 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make test methods of ChangeOpDeserializerTests reusable.
Jakob has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340114 ) Change subject: Make test methods of ChangeOpDeserializerTests reusable. .. Make test methods of ChangeOpDeserializerTests reusable. Adds the following traits to be reused in entity ChangeOpDeserializer tests as well as in tests of each of the field's ChangeOpDeserializers respectively: * AliasChangeOpDeserializationTest * ClaimsChangeOpDeserializationTest * DescriptionsChangeOpDeserializationTest * DescriptionsChangeOpDeserializationTest Change-Id: I5b3dc0eddea5a6e236cb14885d65e63d5866a310 --- A repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasChangeOpDeserializationTest.php M repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php A repo/tests/phpunit/includes/ChangeOp/Deserialization/ChangeOpDeserializerTest.php A repo/tests/phpunit/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializationTest.php M repo/tests/phpunit/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializerTest.php A repo/tests/phpunit/includes/ChangeOp/Deserialization/DescriptionsChangeOpDeserializationTest.php M repo/tests/phpunit/includes/ChangeOp/Deserialization/DescriptionsChangeOpDeserializerTest.php M repo/tests/phpunit/includes/ChangeOp/Deserialization/ItemChangeOpDeserializerTest.php A repo/tests/phpunit/includes/ChangeOp/Deserialization/LabelsChangeOpDeserialization.php M repo/tests/phpunit/includes/ChangeOp/Deserialization/LabelsChangeOpDeserializerTest.php 10 files changed, 380 insertions(+), 292 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/14/340114/1 diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasChangeOpDeserializationTest.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasChangeOpDeserializationTest.php new file mode 100644 index 000..a9807c3 --- /dev/null +++ b/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasChangeOpDeserializationTest.php @@ -0,0 +1,78 @@ +getItemWithoutAliases(); + $alias = 'foo'; + $changeOp = $this->getChangeOpDeserializer()->createEntityChangeOp( [ + 'aliases' => [ 'en' => [ 'language' => 'en', 'value' => $alias ] ] + ] ); + + $changeOp->apply( $item, new Summary() ); + $this->assertSame( $item->getAliasGroups()->getByLanguage( 'en' )->getAliases(), [ $alias ] ); + } + + public function testGivenChangeRequestSettingAliases_overridesExistingAliases() { + $item = $this->getItemWithExistingAliases(); + $newAlias = 'foo'; + $changeOp = $this->getChangeOpDeserializer()->createEntityChangeOp( [ + 'aliases' => [ 'en' => [ 'language' => 'en', 'value' => $newAlias ] ] + ] ); + + $changeOp->apply( $item, new Summary() ); + $this->assertSame( $item->getAliasGroups()->getByLanguage( 'en' )->getAliases(), [ $newAlias ] ); + } + + public function testGivenChangeRequestRemovingAllExistingEnAliases_enAliasGroupDoesNotExist() { + $item = $this->getItemWithExistingAliases(); + $existingAliases = $item->getAliasGroups()->getByLanguage( 'en' )->getAliases(); + $changeOp = $this->getChangeOpDeserializer()->createEntityChangeOp( [ + 'aliases' => array_map( function( $alias ) { + return [ 'language' => 'en', 'value' => $alias, 'remove' => '' ]; + }, $existingAliases ) + ] ); + + $changeOp->apply( $item, new Summary() ); + $this->assertFalse( $item->getAliasGroups()->hasGroupForLanguage( 'en' ) ); + } + + public function testGivenChangeRequestAddingAlias_addsAlias() { + $item = $this->getItemWithExistingAliases(); + $newAlias = 'foo'; + $existingAliases = $item->getAliasGroups()->getByLanguage( 'en' )->getAliases(); + $changeOp = $this->getChangeOpDeserializer()->createEntityChangeOp( [ + 'aliases' => [ + 'en' => [ 'language' => 'en', 'value' => $newAlias, 'add' => '' ] + ] + ] ); + + $changeOp->apply( $item, new Summary() ); + $this->assertSame( + array_merge( $existingAliases, [ $newAlias ] ), + $item->getAliasGroups()->getByLanguage( 'en' )->getAliases() + ); + } + + private function getItemWithoutAliases() { + return new Item(); + } + + private function getItemWithExistingAliases() { + $existingEnAliases = [ 'en-existingAlias1', 'en-existingAlias2' ]; + $item = new Item(); + $
[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: update .gitignore
WMDE-Fisch has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340113 ) Change subject: update .gitignore .. update .gitignore Change-Id: I82505ec63d4f13bb9fc401f957d5f7fe48599438 --- M .gitignore 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection refs/changes/13/340113/1 diff --git a/.gitignore b/.gitignore index 93f1361..6bcc782 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ -node_modules +.*.swp +/.project +/.idea +/composer.lock +/vendor +/node_modules npm-debug.log -- To view, visit https://gerrit.wikimedia.org/r/340113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82505ec63d4f13bb9fc401f957d5f7fe48599438 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: WMDE-Fisch ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::conftool::client: add default schema
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339673 ) Change subject: profile::conftool::client: add default schema .. profile::conftool::client: add default schema This first schema is for just discovery objects tjat will be used by our DNS discovery interface and by MediaWiki to populate ProductionService.php in mediawiki-config. Bug: T149617 Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a --- A modules/profile/files/conftool/schema.yaml M modules/profile/manifests/conftool/client.pp 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified Volans: Looks good to me, but someone else must approve diff --git a/modules/profile/files/conftool/schema.yaml b/modules/profile/files/conftool/schema.yaml new file mode 100644 index 000..73ee72c --- /dev/null +++ b/modules/profile/files/conftool/schema.yaml @@ -0,0 +1,13 @@ +# Discovery objects. they will represent a sequence of cluster/service/dc combinations +discovery: + path: "discovery" + tags: +- cluster +- service + schema: +pooled: + type: "bool" + default: false +url: + type: "string" + default: "" diff --git a/modules/profile/manifests/conftool/client.pp b/modules/profile/manifests/conftool/client.pp index 2a1fcb3..1e617ff 100644 --- a/modules/profile/manifests/conftool/client.pp +++ b/modules/profile/manifests/conftool/client.pp @@ -40,4 +40,13 @@ tcpircbot_port => $tcpircbot_port, hosts => [], } + +# Conftool schema. Let's assume we will only have one. +file { '/etc/conftool/schema.yaml': +ensure => present, +source => 'puppet:///modules/profile/conftool/schema.yaml', +owner => 'root', +group => 'root', +mode => '0444', +} } -- To view, visit https://gerrit.wikimedia.org/r/339673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Volans 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/selenium[master]: WIP Release minor version 1.8.0
Zfilipin has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340112 ) Change subject: WIP Release minor version 1.8.0 .. WIP Release minor version 1.8.0 Bug: T158074 Change-Id: Ibf4ffd87c42559e55a3925895a49dfaf7e0b7330 --- M RELEASES.md M lib/mediawiki_selenium/version.rb 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/12/340112/1 diff --git a/RELEASES.md b/RELEASES.md index 315f006..ebb6ff5 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,5 +1,13 @@ ## Release notes +### 1.8.0 2017-02-27 +* Major updates in dependencies: + * page-object updated to version 2 + * Watir updated to version 6 + * Selenium updated to version 3 +* Selenium 3 default browser is Chrome, instead of Firefox. +* Selenium 3 requires geckodriver when driving Firefox. + ### 1.7.4 2016-12-28 * Update JSON gem to version 2 diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 12107fc..4bb1406 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -1,3 +1,3 @@ module MediawikiSelenium - VERSION = '1.7.4' + VERSION = '1.8.0' end -- To view, visit https://gerrit.wikimedia.org/r/340112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf4ffd87c42559e55a3925895a49dfaf7e0b7330 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add consistency check for nda and wmf LDAP groups based on d...
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339656 ) Change subject: Add consistency check for nda and wmf LDAP groups based on data.yaml .. Add consistency check for nda and wmf LDAP groups based on data.yaml Every account in the privileged "wmf" group should be registered in data.yaml with a wikimedia.org address, every member in the "nda" without one Bug: T142836 Change-Id: I6148273bf49b96b844926f6335048cddbce8dc60 --- M modules/openldap/files/cross-validate-accounts.py 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openldap/files/cross-validate-accounts.py b/modules/openldap/files/cross-validate-accounts.py index 0dc93d9..e22697c 100644 --- a/modules/openldap/files/cross-validate-accounts.py +++ b/modules/openldap/files/cross-validate-accounts.py @@ -145,6 +145,25 @@ return "" +# Every account in the wmf group should be registered in data.yaml with a wikimedia.org address +# Google account and every member in the nda group with a non-wikimedia.org address +def validate_privileged_ldap_groups_memberships(users): +log = "" + +for member in get_ldap_group_members('wmf'): +if member in users.keys(): # flagged via different account check +if 'email' in users[member].keys(): +if not users[member]['email'].endswith('wikimedia.org'): +log += member + " is in wmf group, but not registered with a WMF account\n" + +for member in get_ldap_group_members('nda'): +if member in users.keys(): # flagged via different account check +if 'email' in users[member].keys(): +if users[member]['email'].endswith('wikimedia.org'): +log += member + " is in nda group, but registered with a WMF account\n" +return log + + # Make sure that all group members are defined in the YAML file def validate_all_yaml_group_members_are_defined(known_users, yamldata): log = "" @@ -237,6 +256,7 @@ run_test(validate_all_ldap_group_members_are_defined(known_users)) run_test(validate_duplicated_ops_permissions(users)) run_test(print_pending_account_expirys(users)) +run_test(validate_privileged_ldap_groups_memberships(users)) if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/339656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6148273bf49b96b844926f6335048cddbce8dc60 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: Volans 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...MediaWikiFarm[master]: Fix bug when autoloading Composer without MediaWikiFarm
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/335789 ) Change subject: Fix bug when autoloading Composer without MediaWikiFarm .. Fix bug when autoloading Composer without MediaWikiFarm Sometimes MediaWiki loads Composer’s autoloader but MediaWikiFarm is not called through, e.g. when one directly call /mw-config/index.php (although there could be a MediaWikiFarm wrapper, to be decided); in these cases the object MediaWikiFarm does not exist and Composer’s autoloader is crashing, so check if MediaWikiFarm object exists. Change-Id: I8713c896e0255480a564932bb225ef2506eab0c1 --- M src/MediaWikiFarmComposerAutoloader.php 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Seb35: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/src/MediaWikiFarmComposerAutoloader.php b/src/MediaWikiFarmComposerAutoloader.php index cd58e20..41a8752 100644 --- a/src/MediaWikiFarmComposerAutoloader.php +++ b/src/MediaWikiFarmComposerAutoloader.php @@ -3,9 +3,8 @@ // autoload.php @generated by MediaWikiFarm // @codeCoverageIgnoreStart -$extensions = $GLOBALS['wgMediaWikiFarm']->getConfiguration( 'composer' ); - -if( count( $extensions ) ) { +if( array_key_exists( 'wgMediaWikiFarm', $GLOBALS ) ) { + $extensions = $GLOBALS['wgMediaWikiFarm']->getConfiguration( 'composer' ); foreach( $extensions as $extension ) { require_once __DIR__ . '/composer' . substr( md5( $extension ), 0, 8 ) . '/autoload_real.php'; @@ -15,7 +14,6 @@ unset( $extension ); return; } -unset( $extensions ); require_once __DIR__ . '/composer' . '/autoload_real.php'; ComposerAutoloaderInitDEFAULT::getLoader(); -- To view, visit https://gerrit.wikimedia.org/r/335789 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8713c896e0255480a564932bb225ef2506eab0c1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiFarm Gerrit-Branch: master Gerrit-Owner: Seb35 Gerrit-Reviewer: Hashar Gerrit-Reviewer: Seb35 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]: Fixing search results percentage width
Jdrewniak has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340111 ) Change subject: Fixing search results percentage width .. Fixing search results percentage width The width of search results on SpecialSearch page was set to 60% to accomodate the interwiki results sidebar. As seen on: https://phabricator.wikimedia.org/T149806 This modification should be moved to the interwikiwidget.styles.less file so it doesn't interfere with results when the intwiki widget is not active. Bug: T149806 Change-Id: Ib9bdc501c8b0eccbcc84abe399a38d10c9a5d20f --- M resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less M resources/src/mediawiki.special/mediawiki.special.search.styles.css 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/11/340111/1 diff --git a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less index 8d63902..735eb3c 100644 --- a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less +++ b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less @@ -6,6 +6,10 @@ width: 30%; } +.searchresults .mw-search-results { + max-width: 60%; +} + .iw-headline { font-weight: bold; font-size: 1rem; diff --git a/resources/src/mediawiki.special/mediawiki.special.search.styles.css b/resources/src/mediawiki.special/mediawiki.special.search.styles.css index 89f5132..ab0b033 100644 --- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css +++ b/resources/src/mediawiki.special/mediawiki.special.search.styles.css @@ -33,7 +33,7 @@ .mw-search-results { margin: 0; float: left; - max-width: 60%; + max-width: 38em; } .mw-search-visualclear { clear: both; -- To view, visit https://gerrit.wikimedia.org/r/340111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9bdc501c8b0eccbcc84abe399a38d10c9a5d20f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jdrewniak ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cacert::certificates: new cert for etcd
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340110 ) Change subject: cacert::certificates: new cert for etcd .. cacert::certificates: new cert for etcd Change-Id: I1afcb8f1fcfa6fc175f9e243f588fe161334e14c --- M files/ssl/etcd.codfw.wmnet.crt 1 file changed, 22 insertions(+), 21 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/files/ssl/etcd.codfw.wmnet.crt b/files/ssl/etcd.codfw.wmnet.crt index b998804..8c67128 100644 --- a/files/ssl/etcd.codfw.wmnet.crt +++ b/files/ssl/etcd.codfw.wmnet.crt @@ -1,26 +1,27 @@ -BEGIN CERTIFICATE- -MIIEejCCAmKgAwIBAgICCZkwDQYJKoZIhvcNAQELBQAwKzEpMCcGA1UEAwwgUHVw -cGV0IENBOiBwYWxsYWRpdW0uZXFpYWQud21uZXQwHhcNMTcwMTI1MTUzMDM0WhcN -MjIwMTI1MTUzMDM0WjB6MRkwFwYDVQQDDBBldGNkLmNvZGZ3LndtbmV0MSMwIQYD +MIIEkDCCAnigAwIBAgICCnYwDQYJKoZIhvcNAQELBQAwKzEpMCcGA1UEAwwgUHVw +cGV0IENBOiBwYWxsYWRpdW0uZXFpYWQud21uZXQwHhcNMTcwMjI2MTIyMzU1WhcN +MjIwMjI2MTIyMzU1WjB6MRkwFwYDVQQDDBBldGNkLmNvZGZ3LndtbmV0MSMwIQYD VQQKDBpXaWtpbWVkaWEgRm91bmRhdGlvbiwgSW5jLjELMAkGA1UEBhMCVVMxEzAR BgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28wWTATBgcq -hkjOPQIBBggqhkjOPQMBBwNCAAQ12OYeE2H7UZ36pI6PFLqAMCedpzVOuV8v3RSp -SAm2dCUe5X0AUT6+LCENOYaWbQ+m27Vb4xwGKkcyi75TSW34o4IBIjCCAR4wNQYJ +hkjOPQIBBggqhkjOPQMBBwNCAAQTHckm6Pp35GrLydIfCaQybCXrxaesQ2ntHYdA +nKoaBZE8Lb+z01HiOI30TEHjRRuc+5NZ3O2EQg0940+XdVXbo4IBODCCATQwNQYJ YIZIAYb4QgENBChQdXBwZXQgUnVieS9PcGVuU1NMIEludGVybmFsIENlcnRpZmlj -YXRlMGUGA1UdEQReMFyCFGNvbmYyMDAyLmNvZGZ3LndtbmV0ghRjb25mMjAwMy5j -b2Rmdy53bW5ldIIIY29uZjIwMDGCCGNvbmYyMDAygghjb25mMjAwM4IQZXRjZC5j -b2Rmdy53bW5ldDAOBgNVHQ8BAf8EBAMCBaAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH -AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFOTZFl14zfdXDFDZ -u2AJ0fm5/khHMB8GA1UdIwQYMBaAFFnkhjB+Aq8NAKZ07Zr2DheubK66MA0GCSqG -SIb3DQEBCwUAA4ICAQAIEz7XDAjbnQxlJOJuLlvftsdfQFS2St5Yw+aV8tTFI6Pl -Dy+N0escyUKGXDz+O5liaAIX3jio1tWa75qXFaVS1TrWl0vHaMzB9SsuTM5zIPuH -f4bQ853jtKeyl7x01KCiHP4rkBkXqYL/8lOgIcIEMY1BAaMYwwl/IgpdVUJfXPqE -tzRnVhs3GpwkTGaJW67TV414rRyYHuu53zXF9/d3q1RLUyQf90U3o75aS1p8okL5 -BRhfgxP8lW9kHnqnKGznLPnYF1V3EtmoHiJlFyTfZDx3ZkdaHGJxB6bUBNf6EeGb -mYUN678iPvq8TKZTdEussspuTXDaQATxPIDu2V+Ux38YQOvsKE+2rg7m6i9BQJv6 -FcIUADb2FudvEDtmrm3StN2JrytMTN2IT+XwWis1CZGDSvz0SiI1Gi1fo8iYZSuk -lnhSbeSLfCG9TCjQd7ZyxmJq+n1H+l8rMqYz1Z/IMwt1iQQQpsMFfivS1uQNy3FL -N/lAAWXVAIBErGvDEoGOKycbT1XwaYC5ZpbgaxTjBZDjZA7Y2bPIsavnpWOURMKL -1tiWbE9CWfGemC4gOcHXiq9YruToWlhZHyBE3+7JRYeY7H/zWvkSOZXDycYECYr8 -BuDb/18PEZDVQU5twXEytbzAV+yDOQmzaBtjIxZgCYgsbHJd2yr7Tr+tCxk0Dw== +YXRlMHsGA1UdEQR0MHKCFGNvbmYyMDAxLmNvZGZ3LndtbmV0ghRjb25mMjAwMi5j +b2Rmdy53bW5ldIIUY29uZjIwMDMuY29kZncud21uZXSCCGNvbmYyMDAxgghjb25m +MjAwMoIIY29uZjIwMDOCEGV0Y2QuY29kZncud21uZXQwDgYDVR0PAQH/BAQDAgWg +MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA +MB0GA1UdDgQWBBSxU83k8hDRlctnnwog++RS3xYauTAfBgNVHSMEGDAWgBRZ5IYw +fgKvDQCmdO2a9g4XrmyuujANBgkqhkiG9w0BAQsFAAOCAgEAFz4tI+JArrsPrSXi +4iX9A2iIaweAzqepd0hORoeGinN89bcShh/jiZcbQyP7RHruae3s2AfiYctPsP7G +KfO2t9hdiUBLlwjvgrDBgAOLOLi5a3EFFNfnOAcGG7VeOyidtPkI9uTI2E39jIpW +IlPZcsGITmtJmfcxGLGN9StRHHtG1hiZyq820VnKl55SsMbdkp1Tyk8vKXSscHRp +nIFb499w0s6ZROt+0N9c10p8pRMwgoDTxi6H/EUK3JPAJGv+zlkXze4O+YmYCI94 +phjb63y3p8qCKGfIcxUSwqHn9OHekgbR1M9v4kPRmFu+ydPLODTRld5VvGKrTWFz +n8Mg7VItqvHmf9TQFj3tDWt67cbieusoyC2jw0fvtHzyhbNpKjlIi9IZMOjQjTgc +BVu1V+qUWfkI9lOQPwUXbTKHnCTnMLy4RaGLeQZ4mIKZ6lsXaWZVLeT3c7rtRJzP +384ijQgANajNEl3aTBNtCZtubOVUp1y0id7JRt1P8MMF29sw5NVDaF18q8MKhVz9 +cbwnY9sWlJ4BSoN5nl5t3nvRbWM9ws+bDeHHa3T0Vpc5c2Joxi5OWWZ0dreTtwQG +L4it+vELPAOcnjAY//tlIjJ5lt5ZR4W60/MINEtjfzwbCsJrg75JPn1+u2Yfpi36 +M5grfVHiJx8HAa009mtJRIIXjMM= -END CERTIFICATE- -- To view, visit https://gerrit.wikimedia.org/r/340110 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1afcb8f1fcfa6fc175f9e243f588fe161334e14c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cacert::certificates: new cert for etcd
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340110 ) Change subject: cacert::certificates: new cert for etcd .. cacert::certificates: new cert for etcd Change-Id: I1afcb8f1fcfa6fc175f9e243f588fe161334e14c --- M files/ssl/etcd.codfw.wmnet.crt 1 file changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/340110/1 diff --git a/files/ssl/etcd.codfw.wmnet.crt b/files/ssl/etcd.codfw.wmnet.crt index b998804..8c67128 100644 --- a/files/ssl/etcd.codfw.wmnet.crt +++ b/files/ssl/etcd.codfw.wmnet.crt @@ -1,26 +1,27 @@ -BEGIN CERTIFICATE- -MIIEejCCAmKgAwIBAgICCZkwDQYJKoZIhvcNAQELBQAwKzEpMCcGA1UEAwwgUHVw -cGV0IENBOiBwYWxsYWRpdW0uZXFpYWQud21uZXQwHhcNMTcwMTI1MTUzMDM0WhcN -MjIwMTI1MTUzMDM0WjB6MRkwFwYDVQQDDBBldGNkLmNvZGZ3LndtbmV0MSMwIQYD +MIIEkDCCAnigAwIBAgICCnYwDQYJKoZIhvcNAQELBQAwKzEpMCcGA1UEAwwgUHVw +cGV0IENBOiBwYWxsYWRpdW0uZXFpYWQud21uZXQwHhcNMTcwMjI2MTIyMzU1WhcN +MjIwMjI2MTIyMzU1WjB6MRkwFwYDVQQDDBBldGNkLmNvZGZ3LndtbmV0MSMwIQYD VQQKDBpXaWtpbWVkaWEgRm91bmRhdGlvbiwgSW5jLjELMAkGA1UEBhMCVVMxEzAR BgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28wWTATBgcq -hkjOPQIBBggqhkjOPQMBBwNCAAQ12OYeE2H7UZ36pI6PFLqAMCedpzVOuV8v3RSp -SAm2dCUe5X0AUT6+LCENOYaWbQ+m27Vb4xwGKkcyi75TSW34o4IBIjCCAR4wNQYJ +hkjOPQIBBggqhkjOPQMBBwNCAAQTHckm6Pp35GrLydIfCaQybCXrxaesQ2ntHYdA +nKoaBZE8Lb+z01HiOI30TEHjRRuc+5NZ3O2EQg0940+XdVXbo4IBODCCATQwNQYJ YIZIAYb4QgENBChQdXBwZXQgUnVieS9PcGVuU1NMIEludGVybmFsIENlcnRpZmlj -YXRlMGUGA1UdEQReMFyCFGNvbmYyMDAyLmNvZGZ3LndtbmV0ghRjb25mMjAwMy5j -b2Rmdy53bW5ldIIIY29uZjIwMDGCCGNvbmYyMDAygghjb25mMjAwM4IQZXRjZC5j -b2Rmdy53bW5ldDAOBgNVHQ8BAf8EBAMCBaAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH -AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFOTZFl14zfdXDFDZ -u2AJ0fm5/khHMB8GA1UdIwQYMBaAFFnkhjB+Aq8NAKZ07Zr2DheubK66MA0GCSqG -SIb3DQEBCwUAA4ICAQAIEz7XDAjbnQxlJOJuLlvftsdfQFS2St5Yw+aV8tTFI6Pl -Dy+N0escyUKGXDz+O5liaAIX3jio1tWa75qXFaVS1TrWl0vHaMzB9SsuTM5zIPuH -f4bQ853jtKeyl7x01KCiHP4rkBkXqYL/8lOgIcIEMY1BAaMYwwl/IgpdVUJfXPqE -tzRnVhs3GpwkTGaJW67TV414rRyYHuu53zXF9/d3q1RLUyQf90U3o75aS1p8okL5 -BRhfgxP8lW9kHnqnKGznLPnYF1V3EtmoHiJlFyTfZDx3ZkdaHGJxB6bUBNf6EeGb -mYUN678iPvq8TKZTdEussspuTXDaQATxPIDu2V+Ux38YQOvsKE+2rg7m6i9BQJv6 -FcIUADb2FudvEDtmrm3StN2JrytMTN2IT+XwWis1CZGDSvz0SiI1Gi1fo8iYZSuk -lnhSbeSLfCG9TCjQd7ZyxmJq+n1H+l8rMqYz1Z/IMwt1iQQQpsMFfivS1uQNy3FL -N/lAAWXVAIBErGvDEoGOKycbT1XwaYC5ZpbgaxTjBZDjZA7Y2bPIsavnpWOURMKL -1tiWbE9CWfGemC4gOcHXiq9YruToWlhZHyBE3+7JRYeY7H/zWvkSOZXDycYECYr8 -BuDb/18PEZDVQU5twXEytbzAV+yDOQmzaBtjIxZgCYgsbHJd2yr7Tr+tCxk0Dw== +YXRlMHsGA1UdEQR0MHKCFGNvbmYyMDAxLmNvZGZ3LndtbmV0ghRjb25mMjAwMi5j +b2Rmdy53bW5ldIIUY29uZjIwMDMuY29kZncud21uZXSCCGNvbmYyMDAxgghjb25m +MjAwMoIIY29uZjIwMDOCEGV0Y2QuY29kZncud21uZXQwDgYDVR0PAQH/BAQDAgWg +MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA +MB0GA1UdDgQWBBSxU83k8hDRlctnnwog++RS3xYauTAfBgNVHSMEGDAWgBRZ5IYw +fgKvDQCmdO2a9g4XrmyuujANBgkqhkiG9w0BAQsFAAOCAgEAFz4tI+JArrsPrSXi +4iX9A2iIaweAzqepd0hORoeGinN89bcShh/jiZcbQyP7RHruae3s2AfiYctPsP7G +KfO2t9hdiUBLlwjvgrDBgAOLOLi5a3EFFNfnOAcGG7VeOyidtPkI9uTI2E39jIpW +IlPZcsGITmtJmfcxGLGN9StRHHtG1hiZyq820VnKl55SsMbdkp1Tyk8vKXSscHRp +nIFb499w0s6ZROt+0N9c10p8pRMwgoDTxi6H/EUK3JPAJGv+zlkXze4O+YmYCI94 +phjb63y3p8qCKGfIcxUSwqHn9OHekgbR1M9v4kPRmFu+ydPLODTRld5VvGKrTWFz +n8Mg7VItqvHmf9TQFj3tDWt67cbieusoyC2jw0fvtHzyhbNpKjlIi9IZMOjQjTgc +BVu1V+qUWfkI9lOQPwUXbTKHnCTnMLy4RaGLeQZ4mIKZ6lsXaWZVLeT3c7rtRJzP +384ijQgANajNEl3aTBNtCZtubOVUp1y0id7JRt1P8MMF29sw5NVDaF18q8MKhVz9 +cbwnY9sWlJ4BSoN5nl5t3nvRbWM9ws+bDeHHa3T0Vpc5c2Joxi5OWWZ0dreTtwQG +L4it+vELPAOcnjAY//tlIjJ5lt5ZR4W60/MINEtjfzwbCsJrg75JPn1+u2Yfpi36 +M5grfVHiJx8HAa009mtJRIIXjMM= -END CERTIFICATE- -- To view, visit https://gerrit.wikimedia.org/r/340110 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1afcb8f1fcfa6fc175f9e243f588fe161334e14c 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] mediawiki...Wikibase[master]: Make ChangeRow::getInfo public
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340109 ) Change subject: Make ChangeRow::getInfo public .. Make ChangeRow::getInfo public This is only one step in a series of many more patches. The plan is to remove this method later in favor of dedicated setters and getters for each individual field. But for now I'm focusing on the problematic setField(s) and getField(s). Change-Id: I5d1ec960fc2870eb88a8b441c6500a56b3b37a4a --- M client/includes/Changes/ChangeHandler.php M client/includes/Changes/ChangeRunCoalescer.php M client/includes/RecentChanges/RecentChangeFactory.php M lib/includes/Changes/ChangeRow.php M lib/tests/phpunit/Changes/TestChanges.php M repo/includes/Store/Sql/SqlChangeStore.php 6 files changed, 11 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/09/340109/1 diff --git a/client/includes/Changes/ChangeHandler.php b/client/includes/Changes/ChangeHandler.php index 14c7b52..8f98809 100644 --- a/client/includes/Changes/ChangeHandler.php +++ b/client/includes/Changes/ChangeHandler.php @@ -286,9 +286,8 @@ * @return string */ private function getChangeIdForLog( Change $change ) { - if ( $change instanceof EntityChange && $change->hasField( 'info' ) ) { - //@todo: add getFields() to the Change interface, or provide getters! - $info = $change->getField( 'info' ); + if ( $change instanceof EntityChange ) { + $info = $change->getInfo(); if ( isset( $info['change-ids'] ) ) { return implode( '|', $info['change-ids'] ); diff --git a/client/includes/Changes/ChangeRunCoalescer.php b/client/includes/Changes/ChangeRunCoalescer.php index 5195404..b6df856 100644 --- a/client/includes/Changes/ChangeRunCoalescer.php +++ b/client/includes/Changes/ChangeRunCoalescer.php @@ -187,7 +187,7 @@ //FIXME: size before & size after ) ); - $info = $change->hasField( 'info' ) ? $change->getField( 'info' ) : array(); + $info = $change->getInfo(); $info['change-ids'] = $ids; $info['changes'] = $changes; $change->setField( 'info', $info ); diff --git a/client/includes/RecentChanges/RecentChangeFactory.php b/client/includes/RecentChanges/RecentChangeFactory.php index dce50f1..8f1c5ee 100644 --- a/client/includes/RecentChanges/RecentChangeFactory.php +++ b/client/includes/RecentChanges/RecentChangeFactory.php @@ -180,12 +180,9 @@ $changesForComment = [ $change ]; - if ( $change->hasField( 'info' ) ) { - $info = $change->getField( 'info' ); - - if ( isset( $info['changes'] ) ) { - $changesForComment = $info['changes']; - } + $info = $change->getInfo(); + if ( isset( $info['changes'] ) ) { + $changesForComment = $info['changes']; } return $this->getEditCommentMulti( $changesForComment, $target ); diff --git a/lib/includes/Changes/ChangeRow.php b/lib/includes/Changes/ChangeRow.php index e917ad8..68d3b3f 100644 --- a/lib/includes/Changes/ChangeRow.php +++ b/lib/includes/Changes/ChangeRow.php @@ -112,7 +112,7 @@ * * @return array */ - protected function getInfo( $cache = 'no' ) { + public function getInfo( $cache = 'no' ) { $info = $this->hasField( 'info' ) ? $this->getField( 'info' ) : []; if ( $cache === 'cache' ) { diff --git a/lib/tests/phpunit/Changes/TestChanges.php b/lib/tests/phpunit/Changes/TestChanges.php index 96795d3..8f64cb5 100644 --- a/lib/tests/phpunit/Changes/TestChanges.php +++ b/lib/tests/phpunit/Changes/TestChanges.php @@ -205,13 +205,9 @@ /* @var ChangeRow $change */ foreach ( $changes as $change ) { - if ( $change->hasField( 'info' ) ) { - $info = $change->getField( 'info' ); - - $info = array_intersect_key( $info, $infoFilter ); - - $change->setField( 'info', $info ); - } + $info = $change->getInfo(); + $info = array_intersect_key( $info, $infoFilter ); + $change->setField( 'info', $info ); $filteredChanges[] = $change; } diff --git a/repo/includes/Store/Sql/SqlChangeStore.php b/repo/includes/Store/Sql/SqlChangeStore.php index ebbd745..e2c0448 100644 --- a/repo/includes/Store/Sql/
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cacert::certificates: new cert for etcd
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340108 ) Change subject: cacert::certificates: new cert for etcd .. cacert::certificates: new cert for etcd Change-Id: Iedc31ea8cffbbc41cb6043e98e8aa8b88b31fc50 --- M files/ssl/etcd.codfw.wmnet.crt 1 file changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/08/340108/1 diff --git a/files/ssl/etcd.codfw.wmnet.crt b/files/ssl/etcd.codfw.wmnet.crt index b998804..5824dc3 100644 --- a/files/ssl/etcd.codfw.wmnet.crt +++ b/files/ssl/etcd.codfw.wmnet.crt @@ -1,26 +1,27 @@ -BEGIN CERTIFICATE- -MIIEejCCAmKgAwIBAgICCZkwDQYJKoZIhvcNAQELBQAwKzEpMCcGA1UEAwwgUHVw -cGV0IENBOiBwYWxsYWRpdW0uZXFpYWQud21uZXQwHhcNMTcwMTI1MTUzMDM0WhcN -MjIwMTI1MTUzMDM0WjB6MRkwFwYDVQQDDBBldGNkLmNvZGZ3LndtbmV0MSMwIQYD +MIIEpTCCAo2gAwIBAgICCnUwDQYJKoZIhvcNAQELBQAwKzEpMCcGA1UEAwwgUHVw +cGV0IENBOiBwYWxsYWRpdW0uZXFpYWQud21uZXQwHhcNMTcwMjI2MTIxNjM1WhcN +MjIwMjI2MTIxNjM1WjB6MRkwFwYDVQQDDBBldGNkLmNvZGZ3LndtbmV0MSMwIQYD VQQKDBpXaWtpbWVkaWEgRm91bmRhdGlvbiwgSW5jLjELMAkGA1UEBhMCVVMxEzAR BgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28wWTATBgcq -hkjOPQIBBggqhkjOPQMBBwNCAAQ12OYeE2H7UZ36pI6PFLqAMCedpzVOuV8v3RSp -SAm2dCUe5X0AUT6+LCENOYaWbQ+m27Vb4xwGKkcyi75TSW34o4IBIjCCAR4wNQYJ +hkjOPQIBBggqhkjOPQMBBwNCAART+0AtU3E4C+m5sA/yuHFUEvV2KpYq19K5X+57 +D2pS3EQdRs0gdspF8p/Wcifg13z9XCM4dPHKO8xePILV/p/jo4IBTTCCAUkwNQYJ YIZIAYb4QgENBChQdXBwZXQgUnVieS9PcGVuU1NMIEludGVybmFsIENlcnRpZmlj -YXRlMGUGA1UdEQReMFyCFGNvbmYyMDAyLmNvZGZ3LndtbmV0ghRjb25mMjAwMy5j -b2Rmdy53bW5ldIIIY29uZjIwMDGCCGNvbmYyMDAygghjb25mMjAwM4IQZXRjZC5j -b2Rmdy53bW5ldDAOBgNVHQ8BAf8EBAMCBaAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH -AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFOTZFl14zfdXDFDZ -u2AJ0fm5/khHMB8GA1UdIwQYMBaAFFnkhjB+Aq8NAKZ07Zr2DheubK66MA0GCSqG -SIb3DQEBCwUAA4ICAQAIEz7XDAjbnQxlJOJuLlvftsdfQFS2St5Yw+aV8tTFI6Pl -Dy+N0escyUKGXDz+O5liaAIX3jio1tWa75qXFaVS1TrWl0vHaMzB9SsuTM5zIPuH -f4bQ853jtKeyl7x01KCiHP4rkBkXqYL/8lOgIcIEMY1BAaMYwwl/IgpdVUJfXPqE -tzRnVhs3GpwkTGaJW67TV414rRyYHuu53zXF9/d3q1RLUyQf90U3o75aS1p8okL5 -BRhfgxP8lW9kHnqnKGznLPnYF1V3EtmoHiJlFyTfZDx3ZkdaHGJxB6bUBNf6EeGb -mYUN678iPvq8TKZTdEussspuTXDaQATxPIDu2V+Ux38YQOvsKE+2rg7m6i9BQJv6 -FcIUADb2FudvEDtmrm3StN2JrytMTN2IT+XwWis1CZGDSvz0SiI1Gi1fo8iYZSuk -lnhSbeSLfCG9TCjQd7ZyxmJq+n1H+l8rMqYz1Z/IMwt1iQQQpsMFfivS1uQNy3FL -N/lAAWXVAIBErGvDEoGOKycbT1XwaYC5ZpbgaxTjBZDjZA7Y2bPIsavnpWOURMKL -1tiWbE9CWfGemC4gOcHXiq9YruToWlhZHyBE3+7JRYeY7H/zWvkSOZXDycYECYr8 -BuDb/18PEZDVQU5twXEytbzAV+yDOQmzaBtjIxZgCYgsbHJd2yr7Tr+tCxk0Dw== +YXRlMIGPBgNVHREEgYcwgYSCEGV0Y2QuY29kZncud21uZXSCFGNvbmYyMDAxLmNv +ZGZ3LndtbmV0ghRjb25mMjAwMi5jb2Rmdy53bW5ldIIUY29uZjIwMDMuY29kZncu +d21uZXSCCGNvbmYyMDAxgghjb25mMjAwMoIIY29uZjIwMDOCEGV0Y2QuY29kZncu +d21uZXQwDgYDVR0PAQH/BAQDAgWgMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggr +BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRS48TzIs81I31kJYEmEH17 +/swmwTAfBgNVHSMEGDAWgBRZ5IYwfgKvDQCmdO2a9g4XrmyuujANBgkqhkiG9w0B +AQsFAAOCAgEAEUFKIffaddVcNhGLisrT0ARG8AFhmvEAbV8zPKENIcXUBm54Wybl +Ih3k0NAydJ7FaPdMp5xloR7Edt+Fi1gmz0ExvB966BDKn5GB9u6/M5+audcH7V1A +FwuydSPDdZjQ3yN8ubgpBvBO7HgdQF+8HZaRNHWD3TRjmwuRb+TaA4MINEO+svVN +I7sy4FcL/1ojvRHZ4FJDD0LCVTddYmEHTBtWELZAmc8X5CQUqUMJU8lDzIHma607 +64AMqtOoBGcMAjjvNrVsM8OlND63P0hm5e45ISXEV4FJujEOgaFnagnWhfBF5ong +RyvUeUD3ihuSwnNC5bbZMeNWNUxWMQraOyqqPpeAm8tQzd1j+NZ3KJnW1YwZwM6Z +kX/1/UApDNVVcEsHez6U7ecltd6eeeh/8QadeqAo+8n/5yIToctLL64FtCMR1IfN +VHhM2q1ZZzjkSXR6ogrLWWwFhVVADHaniJFhYEOFf8e80oqiyn2QINvF4pSppm02 +NwgkMEBNP+ZDCEvm3fAWmMz5XH5Q+LZLlcxyyOJpj2BzLwRSXzEa2Q2fE19OV/7o +bDkWvggu+ELgwGivtoWvYZMRf7Fkb6su/1qG/n0mG+8XrFno4hwXG0/PdDMdlNRY +SyJf75MOI/VYbpe8ElhM+m4gHQ2rEwTTiA5etDMxjtbu0c0Wsc98uGk= -END CERTIFICATE- -- To view, visit https://gerrit.wikimedia.org/r/340108 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedc31ea8cffbbc41cb6043e98e8aa8b88b31fc50 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]: utils: add create_ecdsa_cert
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340107 ) Change subject: utils: add create_ecdsa_cert .. utils: add create_ecdsa_cert This script can be used to generate ECDSA certificates and sign them with puppet, for use for our internal services. It will add SANs to the certificate if they are listed, or just the cert name otherwise to comply with RFC2818. Change-Id: Iff996f323109d68c8081f8a5c193df1e97743d7f --- A utils/create_ecdsa_cert 1 file changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/07/340107/1 diff --git a/utils/create_ecdsa_cert b/utils/create_ecdsa_cert new file mode 100755 index 000..6660208 --- /dev/null +++ b/utils/create_ecdsa_cert @@ -0,0 +1,35 @@ +#!/bin/bash +set -e +_puppetmaster="puppetmaster1001.eqiad.wmnet" +_dir=$(cd `dirname $0` && pwd) + + +function usage { +echo "${0} CERT_NAME SAN1 [SAN2 .. SANN]" +exit 1 +} + +function commasep { local IFS=","; echo "$*"; } +# Find out the SAN list we need to sign with +if [ $# -lt 1 ]; then +usage +fi + +name=$1 +SAN=$(commasep $@) + +if ssh $_puppetmaster sudo puppet cert list $name > /dev/null 2>&1; then +echo "Skipping ${name}, already signed"; +exit 1; +fi +echo "Generating cert for ${name}" +echo "with SubjectAltNames ${SAN}" +ssh $_puppetmaster sudo /usr/local/bin/puppet-ecdsacert -a "${SAN}" "${name}"; +ssh $_puppetmaster sudo cp -ax "/var/lib/puppet/ssl/private_keys/${name}.key" \ +"/srv/private/modules/secret/secrets/ssl/${name}.key" +ssh $_puppetmaster sudo git -C /srv/private add "modules/secret/secrets/ssl/${name}.key" +echo "Private key generated and added to the private git repo. Don't forget to commit it!" +scp "$_puppetmaster:/var/lib/puppet/server/ssl/ca/signed/${name}.pem" \ +"${_dir}/../files/ssl/${name}.crt" +git add "${_dir}/../files/ssl/${name}.crt" +echo "Public key generated and added to git" -- To view, visit https://gerrit.wikimedia.org/r/340107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff996f323109d68c8081f8a5c193df1e97743d7f 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] mediawiki...Popups[master]: truncation: Fix fade direction for RTL previews
Phuedx has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340106 ) Change subject: truncation: Fix fade direction for RTL previews .. truncation: Fix fade direction for RTL previews CSSJanus v1.1.3 doesn't appear to flip the "to right" argument for the linear-gradient CSS function. As with the position of the truncating element in I0d50a8b5, the direction of the gradient doesn't vary with the text direction of the current page but that of the target page. Bug: T158858 Change-Id: I4b6fcf68bdf57722348513f12c7b19f80b2545c4 --- M resources/ext.popups/styles/ext.popups.core.less 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/06/340106/1 diff --git a/resources/ext.popups/styles/ext.popups.core.less b/resources/ext.popups/styles/ext.popups.core.less index 534e76f..4541f65 100644 --- a/resources/ext.popups/styles/ext.popups.core.less +++ b/resources/ext.popups/styles/ext.popups.core.less @@ -126,20 +126,24 @@ width: 25%; height: 24px; background-color: transparent; + } + + &[dir='ltr']:after { + /* @noflip */ + right: 0; background-image: -webkit-linear-gradient( to right, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); background-image: -moz-linear-gradient( to right, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); background-image: -o-linear-gradient( to right, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); background-image: linear-gradient( to right, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); } - &[dir='ltr']:after { - /* @noflip */ - right: 0; - } - &[dir='rtl']:after { /* @noflip */ left: 0; + background-image: -webkit-linear-gradient( to left, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); + background-image: -moz-linear-gradient( to left, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); + background-image: -o-linear-gradient( to left, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); + background-image: linear-gradient( to left, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% ); } } -- To view, visit https://gerrit.wikimedia.org/r/340106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b6fcf68bdf57722348513f12c7b19f80b2545c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Phuedx ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: new_wmf_service: fix references to conftool-data
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340105 ) Change subject: new_wmf_service: fix references to conftool-data .. new_wmf_service: fix references to conftool-data Change-Id: I255801e2561b11a6eda66fb5ee3acf7eff178e17 --- M utils/new_wmf_service.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/utils/new_wmf_service.py b/utils/new_wmf_service.py index 8de9b61..6ddd924 100755 --- a/utils/new_wmf_service.py +++ b/utils/new_wmf_service.py @@ -344,7 +344,7 @@ return False def setup_conftool_data(self): -filename = "conftool-data/services/services.yaml" +filename = "conftool-data/service/services.yaml" with open(filename, 'r') as f: data = ordered_load(f) if self.cluster not in data: @@ -458,7 +458,7 @@ if not s.setup_conftool_data(): print 'Failed to setup conftool' return False -Git.add_file('conftool-data/services/services.yaml') +Git.add_file('conftool-data/service/services.yaml') # Let's commit the third batch Git.commit('Setup LVS for %s service on %s cluster' % (s.service_name, s.cluster)) -- To view, visit https://gerrit.wikimedia.org/r/340105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I255801e2561b11a6eda66fb5ee3acf7eff178e17 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production 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] operations/puppet[production]: new_wmf_service: fix references to conftool-data
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340105 ) Change subject: new_wmf_service: fix references to conftool-data .. new_wmf_service: fix references to conftool-data Change-Id: I255801e2561b11a6eda66fb5ee3acf7eff178e17 --- M utils/new_wmf_service.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/340105/1 diff --git a/utils/new_wmf_service.py b/utils/new_wmf_service.py index 8de9b61..6ddd924 100755 --- a/utils/new_wmf_service.py +++ b/utils/new_wmf_service.py @@ -344,7 +344,7 @@ return False def setup_conftool_data(self): -filename = "conftool-data/services/services.yaml" +filename = "conftool-data/service/services.yaml" with open(filename, 'r') as f: data = ordered_load(f) if self.cluster not in data: @@ -458,7 +458,7 @@ if not s.setup_conftool_data(): print 'Failed to setup conftool' return False -Git.add_file('conftool-data/services/services.yaml') +Git.add_file('conftool-data/service/services.yaml') # Let's commit the third batch Git.commit('Setup LVS for %s service on %s cluster' % (s.service_name, s.cluster)) -- To view, visit https://gerrit.wikimedia.org/r/340105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I255801e2561b11a6eda66fb5ee3acf7eff178e17 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]: SSH keys: add new key for myself
Volans has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340098 ) Change subject: SSH keys: add new key for myself .. SSH keys: add new key for myself Change-Id: Ife59762a8944782eb3006cdc0331948bf033aaa9 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Volans: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 391cf09..260bbc1 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2099,6 +2099,7 @@ realname: Riccardo Coccioli ssh_keys: - ssh-rsa B3NzaC1yc2EDAQABAAACAQC1iu4OcsLv8Nb+sWHDs9RZ4X9mtBpyf+fhJGrbKjFjaXDRVB5h/CXrqsMz8GJH44HJPBj5Gf/4bwvqRy7MLJGwpHjDJv1xeEOc0Oq5Aa/6/k6h8h0tCDWIGw/ghTOX+u9TZBAr4UHnBHjippEi+9G/jougFjQ2Hu9P62yYU69/mqdmXfLV0JnAXZl13vrzrjLyNWvH64tpwly9HLQXFCpxCI5DKUsmeGeJ7N5+o7XKRTDF4+vtCC3Ro3+FnoIzZP8iV+MzDwt4Z51wtmDY3IDl0PBNjI1OjWBrsCaGB6t3nm/5/mq3ggffgcQIXgjYTB6lxjkbYS0tO2oroFopnaVgx65mENIsWaX/YVpI7VOWN5ylVGljkDVZ+iYX7soDOwiBafZyDdQZ9VSNZDvOnt/sbbWCyYWhcreUfXehiNPLKjxugf7LUaXOqePeyg4swKuwQXzyHssdROjNcNScQn8ze0rety9UQwmkEu8TuSSwXBRxUR8uQhtuk9cxUlRw3qs5yljMVcL33JKF7aQ9b84pV2ARqSouD/zAOQSSrjIAdctlAHR5lYmXn1f3Gz5BMgK0vwcgknGsMHAndW/yejYQi8lQGGgq3MCTMcpvf5qJLgCA/myn/C2XQ20snyJg0Ci7lZpQR0r8EZd4kPD3IiYcWlLcLy3aROcnGGZtPl/jkw== rcocci...@wikimedia.org + - ssh-ed25519 C3NzaC1lZDI1NTE5IPLPtrz3vy1SKNu4Rez8Jr+my9QhlNO0/iWLb4/cZB8V Riccardo Coccioli (volans) uid: 14150 email: rcocci...@wikimedia.org nschaaf: -- To view, visit https://gerrit.wikimedia.org/r/340098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife59762a8944782eb3006cdc0331948bf033aaa9 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Volans Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: Volans 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]: Cumin: fine tuning ssh_options
Volans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340104 ) Change subject: Cumin: fine tuning ssh_options .. Cumin: fine tuning ssh_options - reduce the connection timeout to 2s to avoid waiting hosts that might be down/unreachable - enable batch mode, we're not interactive - enable the strict host key check. A solution for new/reimaged hosts has to be investigated. Bug: T159127 Change-Id: I93e53272b9a8096588c233cc1fd694e52a514655 --- M modules/profile/templates/cumin/config.yaml.erb 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/04/340104/1 diff --git a/modules/profile/templates/cumin/config.yaml.erb b/modules/profile/templates/cumin/config.yaml.erb index c9c95c4..46678a6 100644 --- a/modules/profile/templates/cumin/config.yaml.erb +++ b/modules/profile/templates/cumin/config.yaml.erb @@ -11,3 +11,7 @@ clustershell: environment: SSH_AUTH_SOCK: /run/keyholder/proxy.sock +ssh_options: +- '-o BatchMode=yes' +- '-o ConnectTimeout=2' +- '-o StrictHostKeyChecking=yes' -- To view, visit https://gerrit.wikimedia.org/r/340104 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93e53272b9a8096588c233cc1fd694e52a514655 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Volans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Change text "Rendering finished"
Andrew-WMDE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340103 ) Change subject: Change text "Rendering finished" .. Change text "Rendering finished" Bug: T157432 Change-Id: I4c60c5047d17aee23cd2580cf25f6601e59b96cf --- M i18n/de.json M i18n/en.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection refs/changes/03/340103/1 diff --git a/i18n/de.json b/i18n/de.json index 14b2f22..bf908ae 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -96,7 +96,7 @@ "coll-rendering_finished_text": "Die Datei wurde erfolgreich erstellt.\n[$1 Dokument herunterladen].", "coll-rendering_finished_notes_heading": "Hinweise:", "coll-rendering_finished_note_not_satisfied": "Nicht zufrieden mit dem Ergebnis? Siehe [[{{MediaWiki:Coll-helppage}}|die Hilfeseite zu Büchern]] für Möglichkeiten der Verbesserung.", - "coll-rendering_finished_note_article_rdf2latex": "Derzeit enthalten einige Dokumente keine Tabellen. Eine Alternative könnte die Verwendung von $1 sein, „Drucken“ im Browsermenü auswählen und die Option „Als PDF speichern“ verwenden.", + "coll-rendering_finished_note_article_rdf2latex": "Die Layout-Option „Zwei Spalten“ erstellt Dokumente ohne Tabellen. Für PDFs mit Tabellen kann die Option „Eine Spalte“ genutzt werden.", "coll-finished_page_info_text_article": "{{MediaWiki:Coll-helppage}}/Darstellung der Seiteninformation", "coll-finished_collection_info_text_article": "{{MediaWiki:Coll-helppage}}/Darstellung des Buchs", "coll-rendering_failed_title": "Rendering fehlgeschlagen", diff --git a/i18n/en.json b/i18n/en.json index 898eb3e..fcf9f91 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -78,7 +78,7 @@ "coll-rendering_finished_text": "The document file has been generated.\n[$1 Download the file] to your computer.", "coll-rendering_finished_notes_heading": "Notes:", "coll-rendering_finished_note_not_satisfied": "Not satisfied with the output? See [[{{MediaWiki:Coll-helppage}}|the help page about books]] for possibilities to improve it.", - "coll-rendering_finished_note_article_rdf2latex": "Currently some documents do not contain tables. An alternative may be to use the $1, select \"Print\" in the browser menu, and use the \"Save as PDF\" option.", + "coll-rendering_finished_note_article_rdf2latex": "Documents made with the layout option \"two column\" do not contain tables. To generate PDFs with tables, use the layout option \"single column\".", "coll-finished_page_info_text_article": "{{MediaWiki:Coll-helppage}}/Rendering page info text", "coll-finished_collection_info_text_article": "{{MediaWiki:Coll-helppage}}/Rendering collection info text", "coll-rendering_failed_title": "Rendering failed", -- To view, visit https://gerrit.wikimedia.org/r/340103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c60c5047d17aee23cd2580cf25f6601e59b96cf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: Andrew-WMDE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: PageAssignments: added hook listener for user delete and gro...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337796 ) Change subject: PageAssignments: added hook listener for user delete and group delete/rename. .. PageAssignments: added hook listener for user delete and group delete/rename. Fix for issue ERM5343 Change-Id: I25fbd862c9e0faa8b5f6518ccc8bf607f649d315 --- M PageAssignments/extension.json M PageAssignments/includes/PageAssignmentsHooks.php 2 files changed, 61 insertions(+), 1 deletion(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/PageAssignments/extension.json b/PageAssignments/extension.json index 39666bc..dde01be 100644 --- a/PageAssignments/extension.json +++ b/PageAssignments/extension.json @@ -67,7 +67,10 @@ "ViewPAStateBarBodyElement": "includes/views/ViewPAStateBarBodyElement.php", "PageAssignmentsNotificationFormatter": "includes/notifications/PageAssignmentsNotificationFormatter.php", "PageAssignmentsEmailSingle": "includes/notifications/PageAssignmentsEmailSingle.php", - "BSPageAssignmentsMigrateRespEditors": "maintenance/BSPageAssignmentsMigrateRespEditors.php" + "BSPageAssignmentsMigrateRespEditors": "maintenance/BSPageAssignmentsMigrateRespEditors.php", + "BSUserManagerAfterDeleteUser": "PageAssignmentsHooks::onBSUserManagerAfterDeleteUser", + "BSGroupManagerGroupNameChanged": "PageAssignmentsHooks::onBSGroupManagerGroupNameChanged", + "BSGroupManagerGroupDeleted": "PageAssignmentsHooks::onBSGroupManagerGroupDeleted" }, "ResourceModules": { "ext.pageassignments.styles": { diff --git a/PageAssignments/includes/PageAssignmentsHooks.php b/PageAssignments/includes/PageAssignmentsHooks.php index 3b84f2f..53213b8 100644 --- a/PageAssignments/includes/PageAssignmentsHooks.php +++ b/PageAssignments/includes/PageAssignmentsHooks.php @@ -145,4 +145,61 @@ ); return true; } + + /** +* Deletes all page assignments on user deleted. +* @param UserManager $oUserManager +* @param User $oUser +* @param &$oStatus +* @return bool +*/ + public static function onBSUserManagerAfterDeleteUser( $oUserManager, $oUser, &$oStatus, $oPerformer ) { + $dbr = wfGetDB( DB_MASTER ); + $dbr->delete( + 'bs_pageassignments', + array( + 'pa_assignee_key' => $oUser->getName(), + 'pa_assignee_type' => 'user' + ) + ); + return true; + } + + /** +* Updates all page assignments on group name change. +* @param string $sGroup +* @param string $sNewGroup +* @return bool +*/ + public static function onBSGroupManagerGroupNameChanged( $sGroup, $sNewGroup ) { + $dbr = wfGetDB( DB_MASTER ); + $dbr->update( + 'bs_pageassignments', + array( + 'pa_assignee_key' => $sNewGroup, + ), + array( + 'pa_assignee_key' => $sGroup, + 'pa_assignee_type' => 'group' + ) + ); + return true; + } + + /** +* Deletes all page assignments on group deleted. +* @param string $sGroup +* @return bool +*/ + public static function onBSGroupManagerGroupDeleted( $sGroup) { + $dbr = wfGetDB( DB_MASTER ); + $dbr->delete( + 'bs_pageassignments', + array( + 'pa_assignee_key' => $sGroup, + 'pa_assignee_type' => 'group' + ) + ); + return true; + } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/337796 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25fbd862c9e0faa8b5f6518ccc8bf607f649d315 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Nasty Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel 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...BlueSpiceExtensions[master]: UserManager: Hook BSUserManagerAfterDeleteUser was sending a...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337786 ) Change subject: UserManager: Hook BSUserManagerAfterDeleteUser was sending an emtpy user object. .. UserManager: Hook BSUserManagerAfterDeleteUser was sending an emtpy user object. $oUser->getUserPage()->exists() was called after user was deleted. Change-Id: I68bb63a3d184a873dc4583acdf9889ed63a8627f --- M UserManager/UserManager.class.php 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Robert Vogel: Looks good to me, but someone else must approve Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/UserManager/UserManager.class.php b/UserManager/UserManager.class.php index b44a6b4..ae31139 100644 --- a/UserManager/UserManager.class.php +++ b/UserManager/UserManager.class.php @@ -390,6 +390,12 @@ } $oStatus = Status::newGood( $oUser ); + $oUser->load( User::READ_LATEST ); + if ( $oUser->getUserPage()->exists() ) { + $oUserPageArticle = new Article( $oUser->getUserPage() ); + $oUserPageArticle->doDelete( wfMessage( 'bs-usermanager-db-error' )->plain() ); + } + $dbw = wfGetDB( DB_MASTER ); $res = $dbw->delete( 'user', array( 'user_id' => $oUser->getId() ) @@ -405,11 +411,6 @@ array( 'ss_users' => $iUsers ), array( 'ss_row_id' => 1 ) ); - - if ( $oUser->getUserPage()->exists() ) { - $oUserPageArticle = new Article( $oUser->getUserPage() ); - $oUserPageArticle->doDelete( wfMessage( 'bs-usermanager-db-error' )->plain() ); - } if ( ( $res === false ) || ( $res1 === false ) || ( $res2 === false ) || ( $res3 === false ) ) { $oStatus->merge( Status::newFatal( 'bs-usermanager-db-error' ) ); -- To view, visit https://gerrit.wikimedia.org/r/337786 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68bb63a3d184a873dc4583acdf9889ed63a8627f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Nasty Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel 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...ElectronPdfService[master]: Track actions per wiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339952 ) Change subject: Track actions per wiki .. Track actions per wiki Bug: T157540 Change-Id: I1b82a285c1e290b13c93d4922a1fcd982b6be0eb --- M src/specials/SpecialElectronPdf.php 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: WMDE-Fisch: Looks good to me, approved jenkins-bot: Verified diff --git a/src/specials/SpecialElectronPdf.php b/src/specials/SpecialElectronPdf.php index 954f228..1e9d773 100644 --- a/src/specials/SpecialElectronPdf.php +++ b/src/specials/SpecialElectronPdf.php @@ -42,18 +42,22 @@ $action = $request->getVal( 'action', 'default' ); $stats = MediaWikiServices::getInstance()->getStatsdDataFactory(); + $dbName = $this->getConfig()->get( 'DBname' ); switch ( $action ) { case 'redirect-to-electron': $stats->increment( 'electronpdf.action.' . $action ); + $stats->increment( 'electronpdf.actionsPerWiki.' . $dbName . '.' . $action ); $this->redirectToElectron( $title ); return; case 'redirect-to-collection': $stats->increment( 'electronpdf.action.' . $action ); + $stats->increment( 'electronpdf.actionsPerWiki.' . $dbName . '.' . $action ); $this->redirectToCollection( $collectionDownloadUrl ); return; default: $stats->increment( 'electronpdf.action.show-selection-screen' ); + $stats->increment( 'electronpdf.actionsPerWiki.' . $dbName . '.show-selection-screen' ); $this->showRenderModeSelectionPage( $title, $collectionDownloadUrl ); } } -- To view, visit https://gerrit.wikimedia.org/r/339952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b82a285c1e290b13c93d4922a1fcd982b6be0eb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ElectronPdfService Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: WMDE-Fisch 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::mediawiki::webserver: adapt to new conftool-data struc...
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340102 ) Change subject: role::mediawiki::webserver: adapt to new conftool-data structure .. role::mediawiki::webserver: adapt to new conftool-data structure Change-Id: Iddf2fb5da6b4367ce05efea739a75825e4a1db70 --- M modules/role/manifests/mediawiki/webserver.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/manifests/mediawiki/webserver.pp b/modules/role/manifests/mediawiki/webserver.pp index c675bdf..2f10fbf 100644 --- a/modules/role/manifests/mediawiki/webserver.pp +++ b/modules/role/manifests/mediawiki/webserver.pp @@ -26,8 +26,8 @@ $lvs_service = pick($::lvs::configuration::lvs_services[$pool], {}) $conftool_config = pick($lvs_service['conftool'], {'cluster' => 'appserver'}) $module_path = get_module_path($module_name) -$site_nodes = loadyaml("${module_path}/../../conftool-data/nodes/${::site}.yaml") -$pool_nodes = keys($site_nodes[$conftool_config['cluster']]) +$site_nodes = loadyaml("${module_path}/../../conftool-data/node/${::site}.yaml") +$pool_nodes = keys($site_nodes[$::site][$conftool_config['cluster']]) if member($pool_nodes, $::fqdn) { $times = cron_splay($pool_nodes, 'daily', 'hhvm-conditional-restarts') cron { 'hhvm-conditional-restart': -- To view, visit https://gerrit.wikimedia.org/r/340102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddf2fb5da6b4367ce05efea739a75825e4a1db70 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::mediawiki::webserver: adapt to new conftool-data struc...
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340102 ) Change subject: role::mediawiki::webserver: adapt to new conftool-data structure .. role::mediawiki::webserver: adapt to new conftool-data structure Change-Id: Iddf2fb5da6b4367ce05efea739a75825e4a1db70 --- M modules/role/manifests/mediawiki/webserver.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/340102/1 diff --git a/modules/role/manifests/mediawiki/webserver.pp b/modules/role/manifests/mediawiki/webserver.pp index c675bdf..2f10fbf 100644 --- a/modules/role/manifests/mediawiki/webserver.pp +++ b/modules/role/manifests/mediawiki/webserver.pp @@ -26,8 +26,8 @@ $lvs_service = pick($::lvs::configuration::lvs_services[$pool], {}) $conftool_config = pick($lvs_service['conftool'], {'cluster' => 'appserver'}) $module_path = get_module_path($module_name) -$site_nodes = loadyaml("${module_path}/../../conftool-data/nodes/${::site}.yaml") -$pool_nodes = keys($site_nodes[$conftool_config['cluster']]) +$site_nodes = loadyaml("${module_path}/../../conftool-data/node/${::site}.yaml") +$pool_nodes = keys($site_nodes[$::site][$conftool_config['cluster']]) if member($pool_nodes, $::fqdn) { $times = cron_splay($pool_nodes, 'daily', 'hhvm-conditional-restarts') cron { 'hhvm-conditional-restart': -- To view, visit https://gerrit.wikimedia.org/r/340102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddf2fb5da6b4367ce05efea739a75825e4a1db70 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] mediawiki...Quiz[master]: Start implementing Quiz generation using TemplateParser
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339827 ) Change subject: Start implementing Quiz generation using TemplateParser .. Start implementing Quiz generation using TemplateParser As noted in T152293 TemplateParser should be used instead of raw HTML. This first commit will start using TemplateParser for a part of the Quiz element. It is still needed to transform into templates the Questions and the Setting element. As a result of this initial conversion I was able to drop the use of an addittional CSS class (hideCorrection). Bug: T152293 Change-Id: I7d1ae881d6d2c5b583509d5fa2e7f758715b13d5 --- M Quiz.class.php M modules/ext.quiz.css A templates/Quiz.mustache 3 files changed, 46 insertions(+), 33 deletions(-) Approvals: jenkins-bot: Verified Mvolz: Looks good to me, approved diff --git a/Quiz.class.php b/Quiz.class.php index a04e8a0..ff2fa0a 100755 --- a/Quiz.class.php +++ b/Quiz.class.php @@ -112,6 +112,7 @@ * @return string */ function parseQuiz( $input ) { + // Ouput the style and the script to the header once for all. if ( $this->mQuizId == 0 ) { global $wgOut; @@ -122,10 +123,8 @@ $input = $this->parseQuestions( $this->parseIncludes( $input ) ); // Generates the output. - // TODO: Use TemplateParser instead of HTML tags in code to improve code readability in the future - $classHide = ( $this->mBeingCorrected ) ? '' : ' class="hideCorrection"'; - $output = '' . "\n"; - $output .= '' . "\n"; + + $templateParser = new TemplateParser( __DIR__ . '/templates' ); // Determine the content of the settings table. $settings = array_fill( 0, 4, '' ); @@ -173,33 +172,27 @@ } } - if ( !empty( $settingsTable ) ) { - $output .= '' . "\n"; - $output .= $settingsTable . "\n"; - $output .= '' . "\n"; - } - $output .= '' . "\n"; - - $output .= '' . "\n"; - $output .= $input . "\n"; - $output .= '' . "\n"; - - $output .= ''; - if ( $this->mBeingCorrected ) { - $output .= ''; - } - $output .= '' . "\n"; - - $output .= ''; - $output .= wfMessage( 'quiz_score' )->rawParams( + $quiz_score = wfMessage( 'quiz_score' )->rawParams( '' . $this->mScore . '', - '' . $this->mTotal . '' - )->escaped(); - $output .= '' . "\n"; + '' . $this->mTotal . '')->escaped(); - $output .= '' . "\n"; - $output .= '' . "\n"; + return $templateParser->processTemplate( + 'Quiz', + array( + 'quiz' => array( + 'id' => $this->mQuizId, + 'beingCorrected' => $this->mBeingCorrected, + 'questions' => $input + ), + 'settingsTable' => $settingsTable, + 'wfMessage' => array( + 'quiz_correction' => wfMessage( 'quiz_correction' )->escaped(), + 'quiz_reset' => wfMessage( 'quiz_reset' )->escaped(), + 'quiz_score' => $quiz_score + ) + ) + ); + return $output; } diff --git a/modules/ext.quiz.css b/modules/ext.quiz.css index c03834c..2060bcb 100644 --- a/modules/ext.quiz.css +++ b/modules/ext.quiz.css @@ -10,10 +10,6 @@ background-color: transparent; } -.quiz .hideCorrection .correction { - display: none; -} - .quiz .settings td { padding: 0.1em 0.4em 0.1em 0.4em; } diff --git a/templates/Quiz.mustache b/templates/Quiz.mustache new file mode 100644 index 000..3ad1d03 --- /dev/null +++ b/templates/Quiz.mustache @@ -0,0 +1,24 @@ + + + {{#settingsTable}} + + {{{ . }}} + + {{/settingsTable}} + + + {{{ quiz.questions }}} + + + + {{#if quiz.beingCorrected }} + + {{/if}} + + {{#if quiz.beingCorrected }} + +
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove Aaron from deployment group
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340101 ) Change subject: Remove Aaron from deployment group .. Remove Aaron from deployment group He has full cluster root access anyway. Change-Id: I194cdae8e4d171f594ff9432ebf0f65dd8e02998 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/01/340101/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index ac87592..3ef2629 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -49,7 +49,7 @@ deployment: gid: 705 description: replaces 'mortals' for software deployment -members: [aaron, dr0ptp4kt, anomie, aude, awight, awjrichards, bd808, +members: [dr0ptp4kt, anomie, aude, awight, awjrichards, bd808, brion, cscott, csteipp, demon, ebernhardson, esanders, gilles, gjg, gwicke, halfak, hashar, hoo, kaldari, kartik, khorn, krinkle, maxsem, mattflaschen, marktraceur, milimetric, mlitn, andyrussg, -- To view, visit https://gerrit.wikimedia.org/r/340101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I194cdae8e4d171f594ff9432ebf0f65dd8e02998 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]: Fix absent check for users which formerly only had LDAP access
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339461 ) Change subject: Fix absent check for users which formerly only had LDAP access .. Fix absent check for users which formerly only had LDAP access Change-Id: I7c2213796c9da133d24c736f70ef6499cda1d256 --- M modules/admin/data/data.yaml M modules/openldap/files/cross-validate-accounts.py 2 files changed, 7 insertions(+), 3 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 819375a..391cf09 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -1,6 +1,6 @@ groups: absent: -description: meta group for absented users +description: meta group for absented users with previous cluster shell access members: [ananthrk, avar, bsitu, cmcmahon, csalvia, diederik, edenhill, erik, gage, handrade, howief, jdouglas, jgonera, jsahleen, mah, maryana, mglaser, mvolz, mwalker, nimishg, rainman, ssmith, swalling, sumanah, werdna, rmoen, @@ -8,6 +8,9 @@ manybubbles, haithams, jzerebecki, ashwinpp, ironholds, robla, asherman, laner, declerambaul, srijan, junikowski, krenair, springle, jhobs, vbaranetsky, yurik, bsimmers, bcohn, hjiang] + absent_ldap: +description: meta group for absented users which had privileged LDAP access in the past +members: [siddharth11] wikidev: gid: 500 description: container group for primary user groups. diff --git a/modules/openldap/files/cross-validate-accounts.py b/modules/openldap/files/cross-validate-accounts.py index 5ffb1f8..0dc93d9 100644 --- a/modules/openldap/files/cross-validate-accounts.py +++ b/modules/openldap/files/cross-validate-accounts.py @@ -52,11 +52,12 @@ def validate_absented_users(yamldata): log = "" absented_users = yamldata['groups']['absent']['members'] +absented_users += yamldata['groups']['absent_ldap']['members'] for table in ['users', 'ldap_only_users']: for username, userdata in yamldata[table].items(): if userdata['ensure'] == 'absent': if username not in absented_users: -log += username + " is absent, but missing in absent group\n" +log += username + " is absent, but missing in absent groups\n" return log @@ -148,7 +149,7 @@ def validate_all_yaml_group_members_are_defined(known_users, yamldata): log = "" for group, groupdata in yamldata['groups'].items(): -if group == "absent": +if group == "absent" or group == "absent_ldap": continue for member in groupdata['members']: if member not in known_users: -- To view, visit https://gerrit.wikimedia.org/r/339461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c2213796c9da133d24c736f70ef6499cda1d256 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: Volans 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...BlueSpiceExtendedSearch[master]: Fixed path to PHPUnit tests
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340085 ) Change subject: Fixed path to PHPUnit tests .. Fixed path to PHPUnit tests Change-Id: Ia23f3f6bda3c15efa059c8d3adc4b32bc11a4788 --- M src/Setup.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/src/Setup.php b/src/Setup.php index f004685..fb47834 100644 --- a/src/Setup.php +++ b/src/Setup.php @@ -66,7 +66,7 @@ * @return boolean */ public static function onUnitTestsList( &$paths ) { - $paths[] = __DIR__ . '/tests/phpunit/'; + $paths[] = dirname( __DIR__ ) . '/tests/phpunit/'; return true; } -- To view, visit https://gerrit.wikimedia.org/r/340085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia23f3f6bda3c15efa059c8d3adc4b32bc11a4788 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch Gerrit-Branch: master Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel 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...BlueSpiceFoundation[master]: Fixed access to deprecated method
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340100 ) Change subject: Fixed access to deprecated method .. Fixed access to deprecated method deprecated since MW 1.25 Change-Id: I459e814459cf80f383f545108adc81908b4dc2b3 --- M includes/Entity.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/00/340100/1 diff --git a/includes/Entity.php b/includes/Entity.php index 9f0e9aa..fde12ef 100644 --- a/includes/Entity.php +++ b/includes/Entity.php @@ -199,7 +199,7 @@ ); $oBSEntityContent = new JsonContent( $sText ); - $oData = (object) $oBSEntityContent->getJsonData(); + $oData = (object) $oBSEntityContent->getData()->getValue(); if( empty($oData->type) ) { return null; -- To view, visit https://gerrit.wikimedia.org/r/340100 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I459e814459cf80f383f545108adc81908b4dc2b3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool-data: purge the old directories
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340099 ) Change subject: conftool-data: purge the old directories .. conftool-data: purge the old directories Change-Id: I43b87c010e017fdc589933eada8565566d0d4857 --- D conftool-data/nodes/codfw.yaml D conftool-data/nodes/eqiad.yaml D conftool-data/nodes/esams.yaml D conftool-data/nodes/ulsfo.yaml D conftool-data/services/cache.yaml D conftool-data/services/mediawiki.yaml D conftool-data/services/misc.yaml D conftool-data/services/services.yaml 8 files changed, 0 insertions(+), 1,123 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml deleted file mode 100644 index 5019c67d..000 --- a/conftool-data/nodes/codfw.yaml +++ /dev/null @@ -1,305 +0,0 @@ -appserver: - mw2090.codfw.wmnet: [apache2,nginx] - mw2091.codfw.wmnet: [apache2,nginx] - mw2092.codfw.wmnet: [apache2,nginx] - mw2093.codfw.wmnet: [apache2,nginx] - mw2094.codfw.wmnet: [apache2,nginx] - mw2095.codfw.wmnet: [apache2,nginx] - mw2096.codfw.wmnet: [apache2,nginx] - mw2097.codfw.wmnet: [apache2,nginx] - mw2098.codfw.wmnet: [apache2,nginx] - mw2100.codfw.wmnet: [apache2,nginx] - mw2101.codfw.wmnet: [apache2,nginx] - mw2102.codfw.wmnet: [apache2,nginx] - mw2103.codfw.wmnet: [apache2,nginx] - mw2104.codfw.wmnet: [apache2,nginx] - mw2105.codfw.wmnet: [apache2,nginx] - mw2106.codfw.wmnet: [apache2,nginx] - mw2107.codfw.wmnet: [apache2,nginx] - mw2108.codfw.wmnet: [apache2,nginx] - mw2109.codfw.wmnet: [apache2,nginx] - mw2110.codfw.wmnet: [apache2,nginx] - mw2111.codfw.wmnet: [apache2,nginx] - mw2112.codfw.wmnet: [apache2,nginx] - mw2113.codfw.wmnet: [apache2,nginx] - mw2114.codfw.wmnet: [apache2,nginx] - mw2115.codfw.wmnet: [apache2,nginx] - mw2116.codfw.wmnet: [apache2,nginx] - mw2117.codfw.wmnet: [apache2,nginx] - mw2163.codfw.wmnet: [apache2,nginx] - mw2164.codfw.wmnet: [apache2,nginx] - mw2165.codfw.wmnet: [apache2,nginx] - mw2166.codfw.wmnet: [apache2,nginx] - mw2167.codfw.wmnet: [apache2,nginx] - mw2168.codfw.wmnet: [apache2,nginx] - mw2169.codfw.wmnet: [apache2,nginx] - mw2170.codfw.wmnet: [apache2,nginx] - mw2171.codfw.wmnet: [apache2,nginx] - mw2172.codfw.wmnet: [apache2,nginx] - mw2173.codfw.wmnet: [apache2,nginx] - mw2174.codfw.wmnet: [apache2,nginx] - mw2175.codfw.wmnet: [apache2,nginx] - mw2176.codfw.wmnet: [apache2,nginx] - mw2177.codfw.wmnet: [apache2,nginx] - mw2178.codfw.wmnet: [apache2,nginx] - mw2179.codfw.wmnet: [apache2,nginx] - mw2180.codfw.wmnet: [apache2,nginx] - mw2181.codfw.wmnet: [apache2,nginx] - mw2182.codfw.wmnet: [apache2,nginx] - mw2183.codfw.wmnet: [apache2,nginx] - mw2184.codfw.wmnet: [apache2,nginx] - mw2185.codfw.wmnet: [apache2,nginx] - mw2186.codfw.wmnet: [apache2,nginx] - mw2187.codfw.wmnet: [apache2,nginx] - mw2188.codfw.wmnet: [apache2,nginx] - mw2189.codfw.wmnet: [apache2,nginx] - mw2190.codfw.wmnet: [apache2,nginx] - mw2191.codfw.wmnet: [apache2,nginx] - mw2192.codfw.wmnet: [apache2,nginx] - mw2193.codfw.wmnet: [apache2,nginx] - mw2194.codfw.wmnet: [apache2,nginx] - mw2195.codfw.wmnet: [apache2,nginx] - mw2196.codfw.wmnet: [apache2,nginx] - mw2197.codfw.wmnet: [apache2,nginx] - mw2198.codfw.wmnet: [apache2,nginx] - mw2199.codfw.wmnet: [apache2,nginx] - mw2224.codfw.wmnet: [apache2,nginx] - mw2225.codfw.wmnet: [apache2,nginx] - mw2226.codfw.wmnet: [apache2,nginx] - mw2227.codfw.wmnet: [apache2,nginx] - mw2228.codfw.wmnet: [apache2,nginx] - mw2229.codfw.wmnet: [apache2,nginx] - mw2230.codfw.wmnet: [apache2,nginx] - mw2231.codfw.wmnet: [apache2,nginx] - mw2232.codfw.wmnet: [apache2,nginx] - mw2233.codfw.wmnet: [apache2,nginx] - mw2234.codfw.wmnet: [apache2,nginx] - mw2235.codfw.wmnet: [apache2,nginx] - mw2236.codfw.wmnet: [apache2,nginx] - mw2237.codfw.wmnet: [apache2,nginx] - mw2238.codfw.wmnet: [apache2,nginx] - mw2239.codfw.wmnet: [apache2,nginx] - mw2240.codfw.wmnet: [apache2,nginx] - mw2241.codfw.wmnet: [apache2,nginx] - mw2242.codfw.wmnet: [apache2,nginx] -api_appserver: - mw2120.codfw.wmnet: [apache2,nginx] - mw2121.codfw.wmnet: [apache2,nginx] - mw2122.codfw.wmnet: [apache2,nginx] - mw2123.codfw.wmnet: [apache2,nginx] - mw2124.codfw.wmnet: [apache2,nginx] - mw2125.codfw.wmnet: [apache2,nginx] - mw2126.codfw.wmnet: [apache2,nginx] - mw2127.codfw.wmnet: [apache2,nginx] - mw2128.codfw.wmnet: [apache2,nginx] - mw2129.codfw.wmnet: [apache2,nginx] - mw2130.codfw.wmnet: [apache2,nginx] - mw2131.codfw.wmnet: [apache2,nginx] - mw2132.codfw.wmnet: [apache2,nginx] - mw2133.codfw.wmnet: [apache2,nginx] - mw2134.codfw.wmnet: [apache2,nginx] - mw2135.codfw.wmnet: [apache2,nginx] - mw2136.codfw.wmnet: [apache2,nginx] - mw2137.codfw.wmnet: [apache2,nginx] - mw2138.codfw.wmnet: [apache2,nginx] - mw2139.codfw.wmnet: [apache2,nginx]
[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool-data: purge the old directories
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340099 ) Change subject: conftool-data: purge the old directories .. conftool-data: purge the old directories Change-Id: I43b87c010e017fdc589933eada8565566d0d4857 --- D conftool-data/nodes/codfw.yaml D conftool-data/nodes/eqiad.yaml D conftool-data/nodes/esams.yaml D conftool-data/nodes/ulsfo.yaml D conftool-data/services/cache.yaml D conftool-data/services/mediawiki.yaml D conftool-data/services/misc.yaml D conftool-data/services/services.yaml 8 files changed, 0 insertions(+), 1,123 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/340099/1 diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml deleted file mode 100644 index 5019c67d..000 --- a/conftool-data/nodes/codfw.yaml +++ /dev/null @@ -1,305 +0,0 @@ -appserver: - mw2090.codfw.wmnet: [apache2,nginx] - mw2091.codfw.wmnet: [apache2,nginx] - mw2092.codfw.wmnet: [apache2,nginx] - mw2093.codfw.wmnet: [apache2,nginx] - mw2094.codfw.wmnet: [apache2,nginx] - mw2095.codfw.wmnet: [apache2,nginx] - mw2096.codfw.wmnet: [apache2,nginx] - mw2097.codfw.wmnet: [apache2,nginx] - mw2098.codfw.wmnet: [apache2,nginx] - mw2100.codfw.wmnet: [apache2,nginx] - mw2101.codfw.wmnet: [apache2,nginx] - mw2102.codfw.wmnet: [apache2,nginx] - mw2103.codfw.wmnet: [apache2,nginx] - mw2104.codfw.wmnet: [apache2,nginx] - mw2105.codfw.wmnet: [apache2,nginx] - mw2106.codfw.wmnet: [apache2,nginx] - mw2107.codfw.wmnet: [apache2,nginx] - mw2108.codfw.wmnet: [apache2,nginx] - mw2109.codfw.wmnet: [apache2,nginx] - mw2110.codfw.wmnet: [apache2,nginx] - mw2111.codfw.wmnet: [apache2,nginx] - mw2112.codfw.wmnet: [apache2,nginx] - mw2113.codfw.wmnet: [apache2,nginx] - mw2114.codfw.wmnet: [apache2,nginx] - mw2115.codfw.wmnet: [apache2,nginx] - mw2116.codfw.wmnet: [apache2,nginx] - mw2117.codfw.wmnet: [apache2,nginx] - mw2163.codfw.wmnet: [apache2,nginx] - mw2164.codfw.wmnet: [apache2,nginx] - mw2165.codfw.wmnet: [apache2,nginx] - mw2166.codfw.wmnet: [apache2,nginx] - mw2167.codfw.wmnet: [apache2,nginx] - mw2168.codfw.wmnet: [apache2,nginx] - mw2169.codfw.wmnet: [apache2,nginx] - mw2170.codfw.wmnet: [apache2,nginx] - mw2171.codfw.wmnet: [apache2,nginx] - mw2172.codfw.wmnet: [apache2,nginx] - mw2173.codfw.wmnet: [apache2,nginx] - mw2174.codfw.wmnet: [apache2,nginx] - mw2175.codfw.wmnet: [apache2,nginx] - mw2176.codfw.wmnet: [apache2,nginx] - mw2177.codfw.wmnet: [apache2,nginx] - mw2178.codfw.wmnet: [apache2,nginx] - mw2179.codfw.wmnet: [apache2,nginx] - mw2180.codfw.wmnet: [apache2,nginx] - mw2181.codfw.wmnet: [apache2,nginx] - mw2182.codfw.wmnet: [apache2,nginx] - mw2183.codfw.wmnet: [apache2,nginx] - mw2184.codfw.wmnet: [apache2,nginx] - mw2185.codfw.wmnet: [apache2,nginx] - mw2186.codfw.wmnet: [apache2,nginx] - mw2187.codfw.wmnet: [apache2,nginx] - mw2188.codfw.wmnet: [apache2,nginx] - mw2189.codfw.wmnet: [apache2,nginx] - mw2190.codfw.wmnet: [apache2,nginx] - mw2191.codfw.wmnet: [apache2,nginx] - mw2192.codfw.wmnet: [apache2,nginx] - mw2193.codfw.wmnet: [apache2,nginx] - mw2194.codfw.wmnet: [apache2,nginx] - mw2195.codfw.wmnet: [apache2,nginx] - mw2196.codfw.wmnet: [apache2,nginx] - mw2197.codfw.wmnet: [apache2,nginx] - mw2198.codfw.wmnet: [apache2,nginx] - mw2199.codfw.wmnet: [apache2,nginx] - mw2224.codfw.wmnet: [apache2,nginx] - mw2225.codfw.wmnet: [apache2,nginx] - mw2226.codfw.wmnet: [apache2,nginx] - mw2227.codfw.wmnet: [apache2,nginx] - mw2228.codfw.wmnet: [apache2,nginx] - mw2229.codfw.wmnet: [apache2,nginx] - mw2230.codfw.wmnet: [apache2,nginx] - mw2231.codfw.wmnet: [apache2,nginx] - mw2232.codfw.wmnet: [apache2,nginx] - mw2233.codfw.wmnet: [apache2,nginx] - mw2234.codfw.wmnet: [apache2,nginx] - mw2235.codfw.wmnet: [apache2,nginx] - mw2236.codfw.wmnet: [apache2,nginx] - mw2237.codfw.wmnet: [apache2,nginx] - mw2238.codfw.wmnet: [apache2,nginx] - mw2239.codfw.wmnet: [apache2,nginx] - mw2240.codfw.wmnet: [apache2,nginx] - mw2241.codfw.wmnet: [apache2,nginx] - mw2242.codfw.wmnet: [apache2,nginx] -api_appserver: - mw2120.codfw.wmnet: [apache2,nginx] - mw2121.codfw.wmnet: [apache2,nginx] - mw2122.codfw.wmnet: [apache2,nginx] - mw2123.codfw.wmnet: [apache2,nginx] - mw2124.codfw.wmnet: [apache2,nginx] - mw2125.codfw.wmnet: [apache2,nginx] - mw2126.codfw.wmnet: [apache2,nginx] - mw2127.codfw.wmnet: [apache2,nginx] - mw2128.codfw.wmnet: [apache2,nginx] - mw2129.codfw.wmnet: [apache2,nginx] - mw2130.codfw.wmnet: [apache2,nginx] - mw2131.codfw.wmnet: [apache2,nginx] - mw2132.codfw.wmnet: [apache2,nginx] - mw2133.codfw.wmnet: [apache2,nginx] - mw2134.codfw.wmnet: [apache2,nginx] - mw2135.codfw.wmnet: [apache2,nginx] - mw2136.codfw.wmnet: [apache2,nginx] - mw2137.codfw.wmnet: [apache2,nginx] - mw2138.codfw.wmnet: [apache2,nginx] - mw2139.codfw.wmnet: [apache2,nginx] - m
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Set maximum JVM heap size for Zookeeper
Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337797 ) Change subject: Set maximum JVM heap size for Zookeeper .. Set maximum JVM heap size for Zookeeper Bug: T157968 Change-Id: I8be06e2bd9152d69c74e56ca063443661c204400 --- M modules/role/manifests/zookeeper/server.pp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Elukey: Looks good to me, approved jenkins-bot: Verified Gehel: Looks good to me, but someone else must approve diff --git a/modules/role/manifests/zookeeper/server.pp b/modules/role/manifests/zookeeper/server.pp index 472d584..6544fec 100644 --- a/modules/role/manifests/zookeeper/server.pp +++ b/modules/role/manifests/zookeeper/server.pp @@ -33,7 +33,8 @@ # There seems to be no elegant way to avoid the JVM spam, # so until somebody finds a better way we redirect stdout to /dev/null # and we filter out JAVA_TOOL_OPTIONS messages from stderr. -cleanup_script_args => '-n 10 2>&1 > /dev/null | grep -v JAVA_TOOL_OPTIONS' +cleanup_script_args => '-n 10 2>&1 > /dev/null | grep -v JAVA_TOOL_OPTIONS', +java_opts => '-Xms1g -Xmx1g', } ferm::service { 'zookeeper': -- To view, visit https://gerrit.wikimedia.org/r/337797 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8be06e2bd9152d69c74e56ca063443661c204400 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey Gerrit-Reviewer: Elukey Gerrit-Reviewer: Gehel Gerrit-Reviewer: Giuseppe Lavagetto 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]: SSH keys: add new key for myself
Volans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340098 ) Change subject: SSH keys: add new key for myself .. SSH keys: add new key for myself Change-Id: Ife59762a8944782eb3006cdc0331948bf033aaa9 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/340098/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 819375a..397c730 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2096,6 +2096,7 @@ realname: Riccardo Coccioli ssh_keys: - ssh-rsa B3NzaC1yc2EDAQABAAACAQC1iu4OcsLv8Nb+sWHDs9RZ4X9mtBpyf+fhJGrbKjFjaXDRVB5h/CXrqsMz8GJH44HJPBj5Gf/4bwvqRy7MLJGwpHjDJv1xeEOc0Oq5Aa/6/k6h8h0tCDWIGw/ghTOX+u9TZBAr4UHnBHjippEi+9G/jougFjQ2Hu9P62yYU69/mqdmXfLV0JnAXZl13vrzrjLyNWvH64tpwly9HLQXFCpxCI5DKUsmeGeJ7N5+o7XKRTDF4+vtCC3Ro3+FnoIzZP8iV+MzDwt4Z51wtmDY3IDl0PBNjI1OjWBrsCaGB6t3nm/5/mq3ggffgcQIXgjYTB6lxjkbYS0tO2oroFopnaVgx65mENIsWaX/YVpI7VOWN5ylVGljkDVZ+iYX7soDOwiBafZyDdQZ9VSNZDvOnt/sbbWCyYWhcreUfXehiNPLKjxugf7LUaXOqePeyg4swKuwQXzyHssdROjNcNScQn8ze0rety9UQwmkEu8TuSSwXBRxUR8uQhtuk9cxUlRw3qs5yljMVcL33JKF7aQ9b84pV2ARqSouD/zAOQSSrjIAdctlAHR5lYmXn1f3Gz5BMgK0vwcgknGsMHAndW/yejYQi8lQGGgq3MCTMcpvf5qJLgCA/myn/C2XQ20snyJg0Ci7lZpQR0r8EZd4kPD3IiYcWlLcLy3aROcnGGZtPl/jkw== rcocci...@wikimedia.org + - ssh-ed25519 C3NzaC1lZDI1NTE5IPLPtrz3vy1SKNu4Rez8Jr+my9QhlNO0/iWLb4/cZB8V Riccardo Coccioli (volans) uid: 14150 email: rcocci...@wikimedia.org nschaaf: -- To view, visit https://gerrit.wikimedia.org/r/340098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife59762a8944782eb3006cdc0331948bf033aaa9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Volans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wme: Set ReadingDepth sampling rate to 0.1%
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340095 ) Change subject: wme: Set ReadingDepth sampling rate to 0.1% .. wme: Set ReadingDepth sampling rate to 0.1% The current sampling rate, 0.5% (the default), results in a peak rate of ~2500 events/minute [0]. Since the ReadingDepth instrumentation will remain active while it's being fully defined and vetted [1], reduce the sampling rate to 0.1% to reduce the load on the EventLogging pipeline but still log a statistically significant number of events. N.B. The sampling rate for the NavigationTiming instrumentation is 0.1% [2]. [0] https://grafana.wikimedia.org/dashboard/db/eventlogging-schema?var-schema=ReadingDepth&from=148780800&to=148798079 [1] https://phabricator.wikimedia.org/T155639#3046288 [2] https://phabricator.wikimedia.org/rOMWC965747fa07afcde2da014f24a16b774b9ce78795 Bug: T155639 Change-Id: I37d4b11f8a4691984364c72e6fa5799782e179f5 --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3ce0dde..cb124a6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18075,6 +18075,16 @@ 'wikipedia' => true, ], +'wgWMEReadingDepthSamplingRate' => [ + 'default' => 0, + + // Careful! This value should not be increased without coordination with the + // Operations and/or Analytics teams. At the very least, be mindful of the + // current rate of ReadingDepth events being logged: + // https://grafana.wikimedia.org/dashboard/db/eventlogging-schema?var-schema=ReadingDepth + 'wikipedia' => 0.001, +], + ]; ### WMF Labs override # -- To view, visit https://gerrit.wikimedia.org/r/340095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37d4b11f8a4691984364c72e6fa5799782e179f5 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Phuedx Gerrit-Reviewer: Florianschmidtwelzow 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] mediawiki/core[master]: Add more Czech special page aliases
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339186 ) Change subject: Add more Czech special page aliases .. Add more Czech special page aliases "Mé"/"Moje" are synonyms, as well as "Má"/"Moje". Today, it caught me by surprise that one of them became a redlink. Change-Id: I8a477cbcf0512964a814ee76841671c95d8410ac --- M languages/messages/MessagesCs.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Urbanecm: Looks good to me, but someone else must approve jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php index 90f1128..94b0a34 100644 --- a/languages/messages/MessagesCs.php +++ b/languages/messages/MessagesCs.php @@ -106,10 +106,10 @@ 'Mostlinkedtemplates' => [ 'Nejpoužívanější_šablony', 'Nejpouzivanejsi_sablony' ], 'Mostrevisions' => [ 'Stránky_s_nejvíce_editacemi', 'Stranky_s_nejvice_editacemi', 'Stránky_s_nejvyšším_počtem_editací' ], 'Movepage' => [ 'Přesunout_stránku', 'Přejmenovat_stránku' ], - 'Mycontributions' => [ 'Mé_příspěvky', 'Me_prispevky' ], + 'Mycontributions' => [ 'Moje_příspěvky', 'Mé_příspěvky', 'Me_prispevky' ], 'MyLanguage'=> [ 'V_mém_jazyce', 'Můj_jazyk' ], - 'Mypage'=> [ 'Moje_stránka', 'Moje_stranka' ], - 'Mytalk'=> [ 'Moje_diskuse' ], + 'Mypage'=> [ 'Moje_stránka', 'Moje_stranka', 'Má_stránka' ], + 'Mytalk'=> [ 'Moje_diskuse', 'Má_diskuse' ], 'Myuploads' => [ 'Moje_soubory', 'Mé_soubory' ], 'Newimages' => [ 'Nové_obrázky', 'Galerie_nových_obrázků', 'Nove_obrazky' ], 'Newpages' => [ 'Nové_stránky', 'Nove_stranky', 'Nejnovější_stránky', 'Nejnovejsi_stranky' ], -- To view, visit https://gerrit.wikimedia.org/r/339186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a477cbcf0512964a814ee76841671c95d8410ac Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand 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...BlueSpiceExtensions[master]: UEModulePDF: Handle Display Title in Meta Data
Ljonka has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340097 ) Change subject: UEModulePDF: Handle Display Title in Meta Data .. UEModulePDF: Handle Display Title in Meta Data get title data from dom: firstHeading Change-Id: I10703130c4b4eb47074f7953be36e8df7f848619 --- M UEModulePDF/includes/PDFPageProvider.class.php 1 file changed, 28 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/97/340097/1 diff --git a/UEModulePDF/includes/PDFPageProvider.class.php b/UEModulePDF/includes/PDFPageProvider.class.php index ac00fca..10be783 100644 --- a/UEModulePDF/includes/PDFPageProvider.class.php +++ b/UEModulePDF/includes/PDFPageProvider.class.php @@ -23,7 +23,7 @@ /** * Fetches the requested pages markup, cleans it and returns a DOMDocument. * @param array $aParams Needs the 'article-id' or 'title' key to be set and valid. -* @return array +* @return array */ public static function getPage( $aParams ) { wfRunHooks( 'BSUEModulePDFbeforeGetPage', array( &$aParams ) ); @@ -36,14 +36,14 @@ $oTitle = Title::newFromID($aParams['article-id']); } if( $oTitle == null ){ - //HINT: This is probably the wrong place for urldecode(); Should be + //HINT: This is probably the wrong place for urldecode(); Should be //done by caller. I.e. BookExportModulePDF $oTitle = Title::newFromText(urldecode($aParams['title'])); } - + $oPCP = new BsPageContentProvider(); - $oPageDOM = $oPCP->getDOMDocumentContentFor( - $oTitle, + $oPageDOM = $oPCP->getDOMDocumentContentFor( + $oTitle, $aParams + array( 'follow-redirects' => true ) ); // TODO RBV (06.12.11 17:09): Follow Redirect... setting or default? @@ -58,20 +58,20 @@ $oBookmarksDOM->documentElement->appendChild( $oBookmarksDOM->importNode( $oBookmarkNode, true ) ); - + $oDOMXPath = new DOMXPath( $oPageDOM ); $oFirstHeading = $oDOMXPath->query( "//*[contains(@class, 'firstHeading')]" )->item(0); $oBodyContent = $oDOMXPath->query( "//*[contains(@class, 'bodyContent')]" )->item(0); - + // TODO RBV (01.02.12 11:28): What if no TOC? $oTOCULElement = $oDOMXPath->query( "//*[contains(@class, 'toc')]//ul" )->item(0); - + if( isset($aParams['display-title'] ) ) { $oBookmarkNode->setAttribute( 'name', $aParams['display-title'] ); $oFirstHeading->nodeValue = $aParams['display-title']; $aData['meta']['title'] = $aParams['display-title']; } - + $aPage = array( 'resources' => $aData['resources'], 'dom' => $oPageDOM, @@ -82,7 +82,7 @@ 'bookmark-element' => $oBookmarkNode, 'meta' => $aData['meta'] ); - + wfRunHooks( 'BSUEModulePDFgetPage', array( $oTitle, &$aPage, &$aParams, $oDOMXPath ) ); return $aPage; } @@ -101,7 +101,7 @@ 'STYLESHEET' => array(), 'IMAGE' => array() ); - + // TODO RBV (01.02.12 13:51): Handle oldid $aCategories = array(); if( $oTitle->exists() ) { @@ -139,23 +139,25 @@ } } */ - + //Dublin Core: $aMeta['DC.title'] = $oTitle->getPrefixedText(); $aMeta['DC.date'] = wfTimestamp( TS_ISO_8601 ); // TODO RBV (14.12.10 14:01): Check for conformity. Maybe there is a better way to acquire than wfTimestamp()? //Custom global $wgLang; + $oDOMXPath = new DOMXPath( $oPageDOM ); + $sTitle = $oDOMXPath->query( "//*[contains(@class, 'firstHeading')]" ); $sCurrentTS = $wgLang->userAdjust( wfTimestampNow() ); - $aMeta['title'] = $oTitle->getPrefixedText(); + $aMeta[ 'title' ] = empty( $sTitle ) ? $oTitle->getPrefixedText( ) : $sTitle; + $aMeta[ 'pagetitle' ] = $oTitle->getPrefixedText( ); $aMeta['exportdate'] = $wgLang->sprintfDate( 'd.m.Y', $sCurrentTS ); $aMeta['exporttime'] = $wgLang->sprintfDate( 'H:i', $sCurrentTS );
[MediaWiki-commits] [Gerrit] operations...linux44[master]: Update to 4.4.51
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340094 ) Change subject: Update to 4.4.51 .. Update to 4.4.51 Change-Id: Ib76933ecc4c6866f09ea61eaa8b4859fe90a0edb --- M debian/changelog A debian/patches/bugfix/all/stable-4.4.51.patch M debian/patches/series 3 files changed, 371 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 3474cff..a72758a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ - CVE-2017-5986 [2dcab598484185dea7ec22219c76dcdd59e3cb90] - CVE-2017-5897 [7892032cfe67f4bde6fc2ee967e45a8fbaf33756] - CVE-2017-6214 [ccf7abb93af09ad0868ae9033d1ca8108bdaec82] + * Update to 4.4.51: +https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.51 -- Moritz Muehlenhoff Mon, 16 Jan 2017 11:17:27 +0100 diff --git a/debian/patches/bugfix/all/stable-4.4.51.patch b/debian/patches/bugfix/all/stable-4.4.51.patch new file mode 100644 index 000..77732c8 --- /dev/null +++ b/debian/patches/bugfix/all/stable-4.4.51.patch @@ -0,0 +1,368 @@ +diff --git a/Makefile b/Makefile +index 10993715abb8..117357188f01 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 4 +-SUBLEVEL = 50 ++SUBLEVEL = 51 + EXTRAVERSION = + NAME = Blurry Fish Butt + +diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S +index 8ecfd15c3a02..df73914e81c8 100644 +--- a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S +@@ -67,7 +67,7 @@ ENTRY(__get_user_4) + ENDPROC(__get_user_4) + + ENTRY(__get_user_8) +- check_uaccess r0, 8, r1, r2, __get_user_bad ++ check_uaccess r0, 8, r1, r2, __get_user_bad8 + #ifdef CONFIG_THUMB2_KERNEL + 5: TUSER(ldr) r2, [r0] + 6: TUSER(ldr) r3, [r0, #4] +diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c +index 7cb2815e815e..a3b96d691ac9 100644 +--- a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c +@@ -1812,7 +1812,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) + mgr->payloads[i].num_slots = req_payload.num_slots; + } else if (mgr->payloads[i].num_slots) { + mgr->payloads[i].num_slots = 0; +- drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]); ++ drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]); + req_payload.payload_state = mgr->payloads[i].payload_state; + mgr->payloads[i].start_slot = 0; + } +diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c +index 04cec0da5d1e..8901228b5d5d 100644 +--- a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c +@@ -205,8 +205,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y) + } + + if (x <= (crtc->x - w) || y <= (crtc->y - radeon_crtc->cursor_height) || +- x >= (crtc->x + crtc->mode.crtc_hdisplay) || +- y >= (crtc->y + crtc->mode.crtc_vdisplay)) ++ x >= (crtc->x + crtc->mode.hdisplay) || ++ y >= (crtc->y + crtc->mode.vdisplay)) + goto out_of_bounds; + + x += xorigin; +diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c +index d15b33813021..ed1935f300a7 100644 +--- a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c +@@ -1232,6 +1232,7 @@ static const struct acpi_device_id elan_acpi_id[] = { + { "ELAN", 0 }, + { "ELAN0100", 0 }, + { "ELAN0600", 0 }, ++ { "ELAN0605", 0 }, + { "ELAN1000", 0 }, + { } + }; +diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h +index 6b420a55c745..c3ea03c9a1a8 100644 +--- a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h +@@ -425,7 +425,7 @@ struct cache { +* until a gc finishes - otherwise we could pointlessly burn a ton of +* cpu +*/ +- unsignedinvalidate_needs_gc:1; ++ unsignedinvalidate_needs_gc; + + booldiscard; /* Get rid of? */ + +@@ -593,8 +593,8 @@ struct cache_set { + + /* Counts how many sectors bio_insert has added to the cache */ + atomic_tsectors_to_gc; ++ wait_queue_head_t gc_wait; + +- wait_queue_head_t moving_gc_wait; + struct keybuf moving_gc_keys; + /* Number of moving GC bios in flight */ + struct semaphoremoving_in_flight; +diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c +index 22b9e34ceb75..5b815e64c1c9 100644 +--- a/drivers/
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-02-27T10:00:01+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340096 ) Change subject: New Wikidata Build - 2017-02-27T10:00:01+ .. New Wikidata Build - 2017-02-27T10:00:01+ Change-Id: I1b26dd9545c6964e8540e33165028707ffb99889 --- M composer.json M composer.lock A extensions/ExternalValidation/i18n/br.json A extensions/MediaInfo/i18n/br.json M extensions/Wikibase/client/WikibaseClient.datatypes.php M extensions/Wikibase/client/i18n/br.json M extensions/Wikibase/client/i18n/bs.json M extensions/Wikibase/client/i18n/ca.json M extensions/Wikibase/client/i18n/hr.json M extensions/Wikibase/client/i18n/ko.json M extensions/Wikibase/client/i18n/mhr.json M extensions/Wikibase/client/includes/ChangeNotificationJob.php M extensions/Wikibase/client/includes/Changes/ChangeHandler.php M extensions/Wikibase/client/resources/images/wb-otherprojects-beta-ltr.svg M extensions/Wikibase/client/resources/images/wb-otherprojects-beta-rtl.svg M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php A extensions/Wikibase/docs/change-propagation.wiki M extensions/Wikibase/lib/WikibaseLib.datatypes.php M extensions/Wikibase/lib/i18n/ar.json M extensions/Wikibase/lib/i18n/bn.json M extensions/Wikibase/lib/i18n/br.json M extensions/Wikibase/lib/i18n/de.json M extensions/Wikibase/lib/i18n/en.json M extensions/Wikibase/lib/i18n/es.json M extensions/Wikibase/lib/i18n/fr.json M extensions/Wikibase/lib/i18n/he.json M extensions/Wikibase/lib/i18n/mg.json M extensions/Wikibase/lib/i18n/qqq.json M extensions/Wikibase/lib/i18n/sr-ec.json M extensions/Wikibase/lib/i18n/sv.json M extensions/Wikibase/lib/i18n/zh-hans.json M extensions/Wikibase/repo/Wikibase.php M extensions/Wikibase/repo/WikibaseRepo.datatypes.php M extensions/Wikibase/repo/i18n/ar.json M extensions/Wikibase/repo/i18n/br.json M extensions/Wikibase/repo/i18n/de.json M extensions/Wikibase/repo/i18n/en.json M extensions/Wikibase/repo/i18n/fr.json M extensions/Wikibase/repo/i18n/gl.json M extensions/Wikibase/repo/i18n/he.json M extensions/Wikibase/repo/i18n/ka.json M extensions/Wikibase/repo/i18n/nl.json M extensions/Wikibase/repo/i18n/or.json M extensions/Wikibase/repo/i18n/qqq.json M extensions/Wikibase/repo/i18n/sv.json M extensions/Wikibase/repo/i18n/zh-hans.json M extensions/Wikibase/repo/i18n/zh-hant.json M extensions/Wikibase/repo/includes/Api/EditEntity.php M extensions/Wikibase/repo/includes/Api/RemoveReferences.php M extensions/Wikibase/repo/includes/Api/SetReference.php M extensions/Wikibase/repo/includes/ChangeDispatcher.php A extensions/Wikibase/repo/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializer.php M extensions/Wikibase/repo/includes/Hooks/LinkBeginHookHandler.php M extensions/Wikibase/repo/includes/Specials/SpecialModifyEntity.php M extensions/Wikibase/repo/includes/Specials/SpecialModifyTerm.php M extensions/Wikibase/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php M extensions/Wikibase/repo/includes/Specials/SpecialSetSiteLink.php M extensions/Wikibase/repo/includes/Store/ChangeStore.php M extensions/Wikibase/repo/includes/Store/Sql/SqlStore.php M extensions/Wikibase/repo/includes/ValidatorBuilders.php M extensions/Wikibase/repo/includes/WikibaseRepo.php M extensions/Wikibase/repo/maintenance/dispatchChanges.php M extensions/Wikibase/repo/resources/experts/getStore.js M extensions/Wikibase/repo/resources/experts/resources.php M extensions/Wikibase/repo/resources/parsers/getStore.js D extensions/Wikibase/repo/tests/browser A extensions/Wikibase/repo/tests/browser M extensions/Wikibase/repo/tests/phpunit/includes/Api/EditEntityTest.php A extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializerTest.php M extensions/Wikibase/repo/tests/phpunit/includes/Hooks/LinkBeginHookHandlerTest.php M extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialSetSiteLinkTest.php M extensions/Wikibase/repo/tests/phpunit/includes/ValidatorBuildersTest.php M extensions/Wikibase/tests/browser/features/support/modules/special_modify_entity_module.rb M extensions/Wikibase/tests/browser/features/support/modules/special_modify_term_module.rb M extensions/Wikibase/tests/browser/features/support/pages/special_set_label_page.rb A extensions/Wikidata.org/i18n/br.json M vendor/composer/LICENSE M vendor/composer/autoload_classmap.php M vendor/composer/autoload_files.php M vendor/composer/autoload_psr4.php M vendor/composer/autoload_real.php M vendor/composer/installed.json D vendor/hamcrest/hamcrest-php/.coveralls.yml D vendor/hamcrest/hamcrest-php/.gitignore D vendor/hamcrest/hamcrest-php/.gush.yml D vendor/hamcrest/hamcrest-php/.travis.yml D vendor/hamcrest/hamcrest-php/CHANGES.txt D vendor/hamcrest/hamcrest-php/LICENSE.txt D vendor/hamcrest/hamcrest-php/README.md D vendor/hamcrest/hamcrest-php/TODO.txt D vendor/hamcrest/hamcrest-php/composer.json D vendor/hamcrest/hamc
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wme: Set ReadingDepth sampling rate to 0.1%
Phuedx has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340095 ) Change subject: wme: Set ReadingDepth sampling rate to 0.1% .. wme: Set ReadingDepth sampling rate to 0.1% The current sampling rate, 0.5% (the default), results in a peak rate of ~2500 events/minute [0]. Since the ReadingDepth instrumentation will remain active while it's being fully defined and vetted [1], reduce the sampling rate to 0.1% to reduce the load on the EventLogging pipeline but still log a statistically significant number of events. N.B. The sampling rate for the NavigationTiming instrumentation is 0.1% [2]. [0] https://grafana.wikimedia.org/dashboard/db/eventlogging-schema?var-schema=ReadingDepth&from=148780800&to=148798079 [1] https://phabricator.wikimedia.org/T155639#3046288 [2] https://phabricator.wikimedia.org/rOMWC965747fa07afcde2da014f24a16b774b9ce78795 Bug: T155639 Change-Id: I37d4b11f8a4691984364c72e6fa5799782e179f5 --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/95/340095/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3ce0dde..cb124a6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18075,6 +18075,16 @@ 'wikipedia' => true, ], +'wgWMEReadingDepthSamplingRate' => [ + 'default' => 0, + + // Careful! This value should not be increased without coordination with the + // Operations and/or Analytics teams. At the very least, be mindful of the + // current rate of ReadingDepth events being logged: + // https://grafana.wikimedia.org/dashboard/db/eventlogging-schema?var-schema=ReadingDepth + 'wikipedia' => 0.001, +], + ]; ### WMF Labs override # -- To view, visit https://gerrit.wikimedia.org/r/340095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37d4b11f8a4691984364c72e6fa5799782e179f5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Phuedx ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WPtouch[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339616 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Ib5fe4d5734b90ef9ffedacd20574cc8699c09e3b --- A .gitignore A Gruntfile.js A package.json 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..7e5da87 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +vendor/ diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..472f993 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,20 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'skin.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/339616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5fe4d5734b90ef9ffedacd20574cc8699c09e3b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/WPtouch Gerrit-Branch: master Gerrit-Owner: Umherirrender 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]: labs/toollabs: Make debian-glue voting
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339914 ) Change subject: labs/toollabs: Make debian-glue voting .. labs/toollabs: Make debian-glue voting Bug: T95098 Change-Id: Ibc723c9cf0f14197a4583f25aff8b4dfbbe24405 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 80549a8..85518ff 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1635,10 +1635,11 @@ - name: labs/toollabs test: - tox-jessie - - debian-glue-non-voting + - debian-glue - php53lint gate-and-submit: - tox-jessie + - debian-glue - php53lint - name: labs/tools/crosswatch -- To view, visit https://gerrit.wikimedia.org/r/339914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc723c9cf0f14197a4583f25aff8b4dfbbe24405 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: Tim Landscheidt 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 db1045 for maintenance
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340091 ) Change subject: mariadb: Depool db1045 for maintenance .. mariadb: Depool db1045 for maintenance I skipped some changes on a previous iteration. Bug: T147747 Change-Id: I81cf3e24559cf3bba952020de5323f06a3ccddf0 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 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 2461519..e14afd4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -141,7 +141,7 @@ 's5' => [ 'db1049' => 0, # B1 2.8TB 64GB, master 'db1026' => 1, # B1 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1045' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager +# 'db1045' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1070' => 50, # D1 2.8TB 160GB, vslow, dump 'db1071' => 50, # D1 2.8TB 160GB, api 'db1082' => 300, # A2 3.6TB 512GB, api @@ -364,23 +364,23 @@ ], 'watchlist' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'recentchanges' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'recentchangeslinked' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'contributions' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'logpager' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/340091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81cf3e24559cf3bba952020de5323f06a3ccddf0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo Gerrit-Reviewer: Florianschmidtwelzow 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] integration/config[master]: [WPtouch] Add npm job
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339617 ) Change subject: [WPtouch] Add npm job .. [WPtouch] Add npm job Needed for Ib5fe4d5734b90ef9ffedacd20574cc8699c09e3b Change-Id: I6fd78d99ea0af6e8ad6d24785c22ecb0afdc5b7f --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 35c3d00..80549a8 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2048,6 +2048,7 @@ template: - name: mw-checks-test - name: skin-tests + - name: npm - name: mediawiki/tools/code-utils check-voter: -- To view, visit https://gerrit.wikimedia.org/r/339617 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fd78d99ea0af6e8ad6d24785c22ecb0afdc5b7f Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender 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] integration/config[master]: Tweak Zuul files filter for translatewiki-rake-jessie
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340092 ) Change subject: Tweak Zuul files filter for translatewiki-rake-jessie .. Tweak Zuul files filter for translatewiki-rake-jessie There are puppet manifests in submodules so we want to trigger the rake jobs in a few more specific case. Bug: T158544 Change-Id: I53830f93deb7cfefac29abecb63aca8063c14982 --- M zuul/layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c56aa70..35c3d00 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -678,6 +678,12 @@ - name: ^operations-puppet-rake-jessie$ files: - '.*' + # Ditto for translatewiki which has puppet modules under /puppet + - name: ^translatewiki-rake-jessie$ +files: + - '^\.puppet-lint\.rc$' + - '^puppet/.*' + - '(^Rakefile$|^Gemfile$)' # Experiment for analytics/kraken repository - name: analytics-kraken-maven -- To view, visit https://gerrit.wikimedia.org/r/340092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I53830f93deb7cfefac29abecb63aca8063c14982 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...linux44[master]: Update to 4.4.51
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340094 ) Change subject: Update to 4.4.51 .. Update to 4.4.51 Change-Id: Ib76933ecc4c6866f09ea61eaa8b4859fe90a0edb --- M debian/changelog A debian/patches/bugfix/all/stable-4.4.51.patch M debian/patches/series 3 files changed, 371 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux44 refs/changes/94/340094/1 diff --git a/debian/changelog b/debian/changelog index 3474cff..a72758a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ - CVE-2017-5986 [2dcab598484185dea7ec22219c76dcdd59e3cb90] - CVE-2017-5897 [7892032cfe67f4bde6fc2ee967e45a8fbaf33756] - CVE-2017-6214 [ccf7abb93af09ad0868ae9033d1ca8108bdaec82] + * Update to 4.4.51: +https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.51 -- Moritz Muehlenhoff Mon, 16 Jan 2017 11:17:27 +0100 diff --git a/debian/patches/bugfix/all/stable-4.4.51.patch b/debian/patches/bugfix/all/stable-4.4.51.patch new file mode 100644 index 000..77732c8 --- /dev/null +++ b/debian/patches/bugfix/all/stable-4.4.51.patch @@ -0,0 +1,368 @@ +diff --git a/Makefile b/Makefile +index 10993715abb8..117357188f01 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 4 +-SUBLEVEL = 50 ++SUBLEVEL = 51 + EXTRAVERSION = + NAME = Blurry Fish Butt + +diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S +index 8ecfd15c3a02..df73914e81c8 100644 +--- a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S +@@ -67,7 +67,7 @@ ENTRY(__get_user_4) + ENDPROC(__get_user_4) + + ENTRY(__get_user_8) +- check_uaccess r0, 8, r1, r2, __get_user_bad ++ check_uaccess r0, 8, r1, r2, __get_user_bad8 + #ifdef CONFIG_THUMB2_KERNEL + 5: TUSER(ldr) r2, [r0] + 6: TUSER(ldr) r3, [r0, #4] +diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c +index 7cb2815e815e..a3b96d691ac9 100644 +--- a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c +@@ -1812,7 +1812,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) + mgr->payloads[i].num_slots = req_payload.num_slots; + } else if (mgr->payloads[i].num_slots) { + mgr->payloads[i].num_slots = 0; +- drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]); ++ drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]); + req_payload.payload_state = mgr->payloads[i].payload_state; + mgr->payloads[i].start_slot = 0; + } +diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c +index 04cec0da5d1e..8901228b5d5d 100644 +--- a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c +@@ -205,8 +205,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y) + } + + if (x <= (crtc->x - w) || y <= (crtc->y - radeon_crtc->cursor_height) || +- x >= (crtc->x + crtc->mode.crtc_hdisplay) || +- y >= (crtc->y + crtc->mode.crtc_vdisplay)) ++ x >= (crtc->x + crtc->mode.hdisplay) || ++ y >= (crtc->y + crtc->mode.vdisplay)) + goto out_of_bounds; + + x += xorigin; +diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c +index d15b33813021..ed1935f300a7 100644 +--- a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c +@@ -1232,6 +1232,7 @@ static const struct acpi_device_id elan_acpi_id[] = { + { "ELAN", 0 }, + { "ELAN0100", 0 }, + { "ELAN0600", 0 }, ++ { "ELAN0605", 0 }, + { "ELAN1000", 0 }, + { } + }; +diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h +index 6b420a55c745..c3ea03c9a1a8 100644 +--- a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h +@@ -425,7 +425,7 @@ struct cache { +* until a gc finishes - otherwise we could pointlessly burn a ton of +* cpu +*/ +- unsignedinvalidate_needs_gc:1; ++ unsignedinvalidate_needs_gc; + + booldiscard; /* Get rid of? */ + +@@ -593,8 +593,8 @@ struct cache_set { + + /* Counts how many sectors bio_insert has added to the cache */ + atomic_tsectors_to_gc; ++ wait_queue_head_t gc_wait; + +- wait_queue_head_t moving_gc_wait; + struct keybuf moving_gc_keys; + /* Number of moving GC bios in flight */ + struct semaphoremoving_in_flight; +diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c +index 22b9e34ceb75..5b815e64c1c9 100644 +--- a/
[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Use v2 table in Cassandra, switch to padded day timestamp
Fdans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340093 ) Change subject: Use v2 table in Cassandra, switch to padded day timestamp .. Use v2 table in Cassandra, switch to padded day timestamp Change monthly aggregate per project hive query to export rows with timestamps with padded days. It also changes the job's properties to use the v2 keyspace in Cassandra Bug: T156312 Change-Id: Iacb6ffc356e417f3f137eb6cd3fe98acd13235a6 --- A oozie/.DS_Store A oozie/browser/.DS_Store M oozie/cassandra/coord_per_project_monthly.properties M oozie/cassandra/monthly/pageview_per_project.hql 4 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/93/340093/1 diff --git a/oozie/.DS_Store b/oozie/.DS_Store new file mode 100644 index 000..a80caa1 --- /dev/null +++ b/oozie/.DS_Store Binary files differ diff --git a/oozie/browser/.DS_Store b/oozie/browser/.DS_Store new file mode 100644 index 000..6d91504 --- /dev/null +++ b/oozie/browser/.DS_Store Binary files differ diff --git a/oozie/cassandra/coord_per_project_monthly.properties b/oozie/cassandra/coord_per_project_monthly.properties index 4fe054a..4a60f0a 100644 --- a/oozie/cassandra/coord_per_project_monthly.properties +++ b/oozie/cassandra/coord_per_project_monthly.properties @@ -88,7 +88,7 @@ hive_script = pageview_per_project.hql source_table = wmf.projectview_hourly cassandra_parallel_loaders= 1 -cassandra_keyspace= local_group_default_T_pageviews_per_project +cassandra_keyspace= local_group_default_T_pageviews_per_project_v2 cassandra_cql = UPDATE "${cassandra_keyspace}"."data" SET "v" = ? hive_fields = project,access,agent,timestamp,v hive_fields_types = text,text,text,text,bigint diff --git a/oozie/cassandra/monthly/pageview_per_project.hql b/oozie/cassandra/monthly/pageview_per_project.hql index c849db9..f2655e3 100644 --- a/oozie/cassandra/monthly/pageview_per_project.hql +++ b/oozie/cassandra/monthly/pageview_per_project.hql @@ -28,7 +28,7 @@ COALESCE(regexp_replace(project, ' ', '-'), 'all-projects'), COALESCE(regexp_replace(access_method, ' ', '-'), 'all-access'), COALESCE(agent_type, 'all-agents'), -CONCAT(LPAD(year, 4, "0"), LPAD(month, 2, "0"), ""), +CONCAT(LPAD(year, 4, "0"), LPAD(month, 2, "0"), "0100"), CAST(SUM(view_count) AS STRING)) FROM ${source_table} -- To view, visit https://gerrit.wikimedia.org/r/340093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iacb6ffc356e417f3f137eb6cd3fe98acd13235a6 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: master Gerrit-Owner: Fdans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Updating global bot wikis, closed wikis and deleted wikis
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339819 ) Change subject: Updating global bot wikis, closed wikis and deleted wikis .. Updating global bot wikis, closed wikis and deleted wikis Change-Id: I2fc4fafed73482a31f87b9c809f78770f2973ea4 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wikivoyage_family.py M pywikibot/families/wiktionary_family.py 8 files changed, 111 insertions(+), 287 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 010c97f..09dec93 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -20,102 +20,18 @@ name = 'wikibooks' closed_wikis = [ -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Afar_Wikibooks -'aa', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Akan_Wikibooks -'ak', -# https://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterwards.2C_closure_and_deletion_of_Wiktionary.2C_Wikibooks_and_Wikiquote_sites -'als', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Old_English_Wikibooks_2 -'ang', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Assamese_Wikibooks -'as', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Asturianu_Wikibooks -'ast', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Aymar_Wikibooks -'ay', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bashkir_Wikibooks -'ba', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bislama_Wikibooks -'bi', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bambara_Wikibooks -'bm', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Tibetan_Wikibooks -'bo', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Chamorro_Wikibooks -'ch', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Corsu_Wikibooks -'co', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gaeilge_Wikibooks -'ga', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gothic_Wikibooks -'got', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Guarani_Wikibooks -'gn', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gujarati_Wikibooks -'gu', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kannada_Wikibooks -'kn', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Interlingue_Wikibooks -'ie', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kashmiri_Wikibooks -'ks', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L%C3%ABtzebuergesch_Wikibooks -'lb', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Lingala_Wikibooks -'ln', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Latvian_Wikibooks -'lv', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Maori_Wikibooks -'mi', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Mongolian_Wikibooks -'mn', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Burmese_Wikibooks -'my', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Nauruan_Wikibooks -'na', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Nahuatl_Wikibooks -'nah', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Plattd%C3%BC%C3%BCtsch_Wikibooks -'nds', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pashto_Wikibooks -'ps', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Quechua_Wikibooks -'qu', -# https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Rumantsch_Wikibooks -
[MediaWiki-commits] [Gerrit] integration/config[master]: Tweak Zuul files filter for translatewiki-rake-jessie
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340092 ) Change subject: Tweak Zuul files filter for translatewiki-rake-jessie .. Tweak Zuul files filter for translatewiki-rake-jessie There are puppet manifests in submodules so we want to trigger the rake jobs in a few more specific case. Bug: T158544 Change-Id: I53830f93deb7cfefac29abecb63aca8063c14982 --- M zuul/layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/92/340092/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c56aa70..35c3d00 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -678,6 +678,12 @@ - name: ^operations-puppet-rake-jessie$ files: - '.*' + # Ditto for translatewiki which has puppet modules under /puppet + - name: ^translatewiki-rake-jessie$ +files: + - '^\.puppet-lint\.rc$' + - '^puppet/.*' + - '(^Rakefile$|^Gemfile$)' # Experiment for analytics/kraken repository - name: analytics-kraken-maven -- To view, visit https://gerrit.wikimedia.org/r/340092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53830f93deb7cfefac29abecb63aca8063c14982 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] operations/puppet[production]: Update email address for Ellery Wulczyn
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339431 ) Change subject: Update email address for Ellery Wulczyn .. Update email address for Ellery Wulczyn He'll resume work under a volunteer NDA. To be merged after the 24th. Change-Id: I6dca4b78b618872c086a5a8b35b6a2b8f5294364 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 0875044..819375a 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -1567,7 +1567,7 @@ realname: Ellery Wulczyn ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDCKFGOn5NPv0el5EtWWwffENDgrt8GKzXTUdhOOWOBemPc98MGEMkKoeAY3RAZW1xbJo+b+ZDTDORVWw3A5Lw6b8Es/fBnJR2rfChKOwj7VzeMLyIFzjgkzI+UekgfWcCsEk24ic6aJAAFLvhVV6Ib9vg1l8p+ZJFL+5+54XMt0MphZtN2w3pgv/SccJzF/kodPyu7N7jRmzweOosH7dY20cSXbnkoz8jCDs6HeLTvLErLsjYWUtwnzjhDp4lBvvZVpzkMXpp/Ju44ksypgyfzEBa/+iP1QQpls6KqRMb6wD56Z8E5BFm2s/nbff3BP3Hk7dsTLJPXYGZw48pWMwWD ellerywulc...@administorsair4.corp.wikimedia.org] uid: 10517 -email: ewulc...@wikimedia.org +email: ellerywulc...@gmail.com dduvall: ensure: present gid: 500 -- To view, visit https://gerrit.wikimedia.org/r/339431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dca4b78b618872c086a5a8b35b6a2b8f5294364 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Giuseppe Lavagetto 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/mediawiki-config[master]: mariadb: Depool db1045 for maintenance
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340091 ) Change subject: mariadb: Depool db1045 for maintenance .. mariadb: Depool db1045 for maintenance I skipped some changes on a previous iteration. Bug: T147747 Change-Id: I81cf3e24559cf3bba952020de5323f06a3ccddf0 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/340091/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2461519..e14afd4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -141,7 +141,7 @@ 's5' => [ 'db1049' => 0, # B1 2.8TB 64GB, master 'db1026' => 1, # B1 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1045' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager +# 'db1045' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1070' => 50, # D1 2.8TB 160GB, vslow, dump 'db1071' => 50, # D1 2.8TB 160GB, api 'db1082' => 300, # A2 3.6TB 512GB, api @@ -364,23 +364,23 @@ ], 'watchlist' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'recentchanges' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'recentchangeslinked' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'contributions' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], 'logpager' => [ 'db1026' => 1, - 'db1045' => 1, +# 'db1045' => 1, ], ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/340091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81cf3e24559cf3bba952020de5323f06a3ccddf0 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] integration/config[master]: Remove '{name}-puppetlint-strict'
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340090 ) Change subject: Remove '{name}-puppetlint-strict' .. Remove '{name}-puppetlint-strict' Last use was translatewiki and it has been migrated to rake. Bug: T158544 Change-Id: I7a3724904b8c8987f87b83e51ef3f1a37a97aab1 --- M jjb/job-templates.yaml M tests/test_zuul_scheduler.py 2 files changed, 0 insertions(+), 21 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index e515c99..4a5a955 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -248,26 +248,6 @@ - archive-log-allow-empty - castor-save -- job-template: -name: '{name}-puppetlint-strict' -node: contintLabsSlave && UbuntuTrusty -defaults: use-remote-zuul-no-submodules -concurrent: true -triggers: - - zuul -builders: - - shell: | - rm -f puppet-lint.log - puppet-lint --version - set -o pipefail - puppet-lint \ ---log-format '%{{path}}:%{{line}} %{{KIND}} %{{message}} (%{{check}})' \ ---fail-on-warnings \ -. | tee puppet-lint.log - set +o pipefail -publishers: - - puppet-lint - - job: name: 'php53lint' node: contintLabsSlave && phpflavor-php53 diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py index 9b39191..5cb79e5 100644 --- a/tests/test_zuul_scheduler.py +++ b/tests/test_zuul_scheduler.py @@ -319,7 +319,6 @@ '.*-(jshint|jsonlint)', '.*-(js|shell|php5[35]|)lint', '.*-(tabs|typos)', -'.*-puppetlint-strict', '.*-whitespaces', 'noop', 'composer-validate', -- To view, visit https://gerrit.wikimedia.org/r/340090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a3724904b8c8987f87b83e51ef3f1a37a97aab1 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] integration/config[master]: translatewiki: use rake as an entry point
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340089 ) Change subject: translatewiki: use rake as an entry point .. translatewiki: use rake as an entry point https://gerrit.wikimedia.org/r/#/c/339294/ introduced boilerplate to run puppet-syntax and puppet-lint checks using rake as an entry point. Promote translatewiki-rake-jessie to be used in test/gate-and-submit Drop entries from check pipeline. The pipeline will be phased out eventually. Delete: translatewiki-puppet-validate translatewiki-puppetlint-strict Bug: T158544 Change-Id: I0f9f9aaf210276378601c224619c328eef9616c6 --- M jjb/translatewiki.yaml M tests/test_zuul_scheduler.py M zuul/layout.yaml 3 files changed, 2 insertions(+), 28 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/translatewiki.yaml b/jjb/translatewiki.yaml index 9840603..b9f6717 100644 --- a/jjb/translatewiki.yaml +++ b/jjb/translatewiki.yaml @@ -1,18 +1,3 @@ -# Run whatever test we find under the `puppet` subdirectory. -- job-template: -name: 'translatewiki-puppet-validate' -defaults: use-remoteonly-zuul -node: contintLabsSlave && UbuntuTrusty -concurrent: true -triggers: - - zuul - -builders: - - shell: | - echo -n "Puppet version: " - puppet --version - find . -type f -name '*.pp' -print0 | xargs -t -n1 -0 puppet parser validate --verbose - # Run bash on each file under /bin without actually executing the script (-n) - job-template: name: 'translatewiki-shelllint' @@ -32,7 +17,5 @@ jobs: - translatewiki-composer-hhvm-jessie - - translatewiki-puppet-validate - - '{name}-puppetlint-strict' - '{name}-rake-jessie' - translatewiki-shelllint diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py index 8b28055..9b39191 100644 --- a/tests/test_zuul_scheduler.py +++ b/tests/test_zuul_scheduler.py @@ -319,7 +319,6 @@ '.*-(jshint|jsonlint)', '.*-(js|shell|php5[35]|)lint', '.*-(tabs|typos)', -'translatewiki-puppet-validate', '.*-puppetlint-strict', '.*-whitespaces', 'noop', diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c048171..c56aa70 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2462,22 +2462,14 @@ - name: tox-jessie - name: translatewiki -check: - - translatewiki-puppet-validate - - translatewiki-puppetlint-strict - - translatewiki-shelllint test: - - translatewiki-puppet-validate - - translatewiki-puppetlint-strict + - translatewiki-rake-jessie - translatewiki-shelllint - composer-hhvm-jessie gate-and-submit: - - translatewiki-puppet-validate - - translatewiki-puppetlint-strict + - translatewiki-rake-jessie - translatewiki-shelllint - composer-hhvm-jessie -experimental: - - translatewiki-rake-jessie - name: wikimedia/discovery/relevanceForge template: -- To view, visit https://gerrit.wikimedia.org/r/340089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f9f9aaf210276378601c224619c328eef9616c6 Gerrit-PatchSet: 3 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] integration/config[master]: Remove '{name}-puppetlint-strict'
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340090 ) Change subject: Remove '{name}-puppetlint-strict' .. Remove '{name}-puppetlint-strict' Last use was translatewiki and it has been migrated to rake. Bug: T158544 Change-Id: I7a3724904b8c8987f87b83e51ef3f1a37a97aab1 --- M jjb/job-templates.yaml M tests/test_zuul_scheduler.py 2 files changed, 0 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/90/340090/1 diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index e515c99..4a5a955 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -248,26 +248,6 @@ - archive-log-allow-empty - castor-save -- job-template: -name: '{name}-puppetlint-strict' -node: contintLabsSlave && UbuntuTrusty -defaults: use-remote-zuul-no-submodules -concurrent: true -triggers: - - zuul -builders: - - shell: | - rm -f puppet-lint.log - puppet-lint --version - set -o pipefail - puppet-lint \ ---log-format '%{{path}}:%{{line}} %{{KIND}} %{{message}} (%{{check}})' \ ---fail-on-warnings \ -. | tee puppet-lint.log - set +o pipefail -publishers: - - puppet-lint - - job: name: 'php53lint' node: contintLabsSlave && phpflavor-php53 diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py index 9b39191..5cb79e5 100644 --- a/tests/test_zuul_scheduler.py +++ b/tests/test_zuul_scheduler.py @@ -319,7 +319,6 @@ '.*-(jshint|jsonlint)', '.*-(js|shell|php5[35]|)lint', '.*-(tabs|typos)', -'.*-puppetlint-strict', '.*-whitespaces', 'noop', 'composer-validate', -- To view, visit https://gerrit.wikimedia.org/r/340090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a3724904b8c8987f87b83e51ef3f1a37a97aab1 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