[MediaWiki-commits] [Gerrit] Pagegenerators: Add filter for article-bodies - change (pywikibot/core)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86813
Change subject: Pagegenerators: Add filter for article-bodies
..
Pagegenerators: Add filter for article-bodies
Add a filter that matches a regex against the bodies of all pages
returned by the following generators.
Change-Id: I90d29e4762bec1f8259dbdd5ef2f2adc9bd578f9
---
M pywikibot/pagegenerators.py
1 file changed, 34 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/13/86813/1
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 5be6e16..1e1e866 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -159,6 +159,21 @@
-page Work on a single page. Argument can also be given as
-page:pagetitle.
+
+-contentregex A regular expression that needs to match the article
+ otherwise the page won't be returned. The filter works
+ for all subsequent generators.
+
+ Example:
+ pagegenerators.py \\
+ -family:wikipedia -lang:en \\
+ -recentchanges:5 \\
+ -contentregex:'.*Thor.*'
+ -cat:Thunder_gods \\
+ -cat:Sky_and_weather_gods
+ This will find the five most recently edited pages
+ and all pages in the categories 'Thunder gods' and
+ 'Sky and weather gods' that refer to 'Thor'.
docuReplacements = {'params;': parameterHelp}
@@ -178,6 +193,7 @@
self.namespaces = []
self.step = None
self.limit = None
+self.articlefilter = None
def getCombinedGenerator(self):
Return the combination of all accumulated generators.
@@ -453,12 +469,21 @@
else:
regex = arg[7:]
gen = RegexFilterPageGenerator(pywikibot.Site().allpages(), regex)
+elif arg.startswith('-contentregex'):
+if len(arg) == 13:
+self.articlefilter = pywikibot.input(u'Please enter your
filter-expression:')
+else:
+self.articlefilter = arg[14:]
+return True # No generator is returned, so just stop here.
elif arg.startswith('-yahoo'):
gen = YahooSearchPageGenerator(arg[7:])
else:
pass
if gen:
-self.gens.append(gen)
+if self.articlefilter:
+self.gens.append(RegexBodyFilterPageGenerator(gen,
self.articlefilter))
+else:
+self.gens.append(gen)
return True
else:
return False
@@ -776,6 +801,14 @@
yield page
+def RegexBodyFilterPageGenerator(generator, regex):
+Yield pages from another generator whose body matches regex with
options re.IGNORECASE|re.DOTALL.
+reg = re.compile(regex, re.IGNORECASE | re.DOTALL)
+for page in generator:
+if reg.match(page.text):
+yield page
+
+
def CombinedPageGenerator(generators):
return itertools.chain(*generators)
--
To view, visit https://gerrit.wikimedia.org/r/86813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90d29e4762bec1f8259dbdd5ef2f2adc9bd578f9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: NikiWiki mediawikidev100...@spam.game-host.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery audit and code convention fixes for mw.UWUI - change (mediawiki...UploadWizard)
MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86814
Change subject: jquery audit and code convention fixes for mw.UWUI
..
jquery audit and code convention fixes for mw.UWUI
Whitespace fixes and jquery changes.
Bug: 53245
Bug: 52900
Change-Id: I828ab90aa61614c2e940386c00ec5dc54ccd52ba
---
M resources/mw.UploadWizardUploadInterface.js
1 file changed, 221 insertions(+), 164 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/14/86814/1
diff --git a/resources/mw.UploadWizardUploadInterface.js
b/resources/mw.UploadWizardUploadInterface.js
index 174c8ce..8e89752 100644
--- a/resources/mw.UploadWizardUploadInterface.js
+++ b/resources/mw.UploadWizardUploadInterface.js
@@ -7,8 +7,23 @@
( function( mw, $ ) {
mw.UploadWizardUploadInterface = function( upload, filesDiv, providedFile ) {
- var $preview,
+ var $filenameDiv, $fileTexts,
ui = this;
+
+ // Look at how clever we are.
+ // If the browser doesn't support file inputs, it will
+ // automatically disable them. So, we can check for support
+ // easily!
+ if ( $( 'input' ).prop( 'type', 'file' ).prop( 'disabled' ) ) {
+ $( '#mwe-upwiz-stepdiv-file' ).replaceWith(
+ $( 'span' )
+ .addClass( 'mwe-error' )
+ .msg( 'mwe-upwiz-file-upload-notcapable' )
+ );
+
+ $( '#mwe-upwiz-add-file' ).hide();
+ return;
+ }
this.upload = upload;
@@ -16,58 +31,92 @@
// may need to collaborate with the particular upload type sometimes
// for the interface, as well as the uploadwizard. OY.
- this.div = $('div class=mwe-upwiz-file/div').get(0);
+ this.$div = $( 'div' )
+ .addClass( 'mwe-upwiz-file' );
+ this.div = this.$div.get( 0 );
+
this.isFilled = false;
this.previewLoaded = false;
- this.$fileInputCtrl = $( 'input size=1 class=mwe-upwiz-file-input
name=file type=file/' );
- if (mw.UploadWizard.config.enableFormData
mw.fileApi.isFormDataAvailable()
- mw.UploadWizard.config.enableMultiFileSelect
mw.UploadWizard.config.enableMultipleFiles ) {
+ this.$fileInputCtrl = $( 'input' )
+ .prop( 'size', 1 )
+ .addClass( 'mwe-upwiz-file-input' )
+ .prop( 'name', 'file' )
+ .prop( 'type', 'file' );
+
+ if ( mw.UploadWizard.config.enableFormData
+ mw.fileApi.isFormDataAvailable()
+ mw.UploadWizard.config.enableMultiFileSelect
+ mw.UploadWizard.config.enableMultipleFiles ) {
// Multiple uploads requires the FormData transport
- this.$fileInputCtrl.attr( 'multiple', '1' );
+ this.$fileInputCtrl.prop( 'multiple', true );
}
this.initFileInputCtrl();
- this.$indicator = $( 'div class=mwe-upwiz-file-indicator/div' );
+ this.$indicator = $( 'div' )
+ .addClass( 'mwe-upwiz-file-indicator' );
- this.visibleFilenameDiv = $('div
class=mwe-upwiz-visible-file/div')
- .append( this.$indicator )
+ this.$fileStatus = $( 'div' )
+ .addClass( 'mwe-upwiz-file-status' )
+ .addClass( 'mwe-upwiz-file-status-line-item' );
+
+ this.$statusLine = $( 'div' )
+ .addClass( 'mwe-upwiz-file-status-line' )
+ .html( this.$fileStatus );
+
+ this.$filenameText = $( 'div' )
+ .addClass( 'mwe-upwiz-visible-file-filename-text' );
+
+ $fileTexts = $( 'div' )
+ .addClass( 'mwe-upwiz-file-texts' )
.append(
- 'div class=mwe-upwiz-visible-file-filename' +
- 'div class=mwe-upwiz-file-preview/' +
- 'div class=mwe-upwiz-file-texts' +
- 'div
class=mwe-upwiz-visible-file-filename-text/' +
- 'div
class=mwe-upwiz-file-status-line' +
- 'div
class=mwe-upwiz-file-status mwe-upwiz-file-status-line-item/div' +
- '/div' +
- '/div' +
- '/div'
+ this.$filenameText,
+ this.$statusLine
);
+
+ this.$filePreview = $( 'div' )
+ .addClass( 'mwe-upwiz-file-preview' );
+
+ $filenameDiv = $( 'div' )
+ .addClass( 'mwe-upwiz-visible-file-filename' )
+ .html( $fileTexts );
+
+ this.$visibleFilenameDiv = $( 'div' )
+ .addClass(
[MediaWiki-commits] [Gerrit] New diff variables regarding pre-save transformed wikitext - change (mediawiki...AbuseFilter)
Liangent has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86815
Change subject: New diff variables regarding pre-save transformed wikitext
..
New diff variables regarding pre-save transformed wikitext
Change-Id: Ie21041d96f1c4cf37d697fffcaffa1ff8242f886
---
M AbuseFilter.class.php
M AbuseFilter.i18n.php
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/15/86815/1
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index f41cbc7..fe5d602 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -108,6 +108,9 @@
'removed_links' = 'removed-links',
'all_links' = 'all-links',
'new_pst' = 'new-pst',
+ 'edit_diff_pst' = 'diff-pst',
+ 'added_lines_pst' = 'addedlines-pst',
+ 'removed_lines_pst' = 'removedlines-pst',
'new_text' = 'new-text-stripped',
'new_html' = 'new-html',
'article_restrictions_edit' = 'restrictions-edit',
@@ -1990,6 +1993,8 @@
$vars-setLazyLoadVar( 'edit_diff', 'diff',
array( 'oldtext-var' = 'old_wikitext', 'newtext-var'
= 'new_wikitext' ) );
+ $vars-setLazyLoadVar( 'edit_diff_pst', 'diff',
+ array( 'oldtext-var' = 'old_wikitext', 'newtext-var'
= 'new_pst' ) );
$vars-setLazyLoadVar( 'new_size', 'length', array(
'length-var' = 'new_wikitext' ) );
$vars-setLazyLoadVar( 'old_size', 'length', array(
'length-var' = 'old_wikitext' ) );
$vars-setLazyLoadVar( 'edit_delta', 'subtract',
@@ -2000,6 +2005,10 @@
array( 'diff-var' = 'edit_diff', 'line-prefix' = '+'
) );
$vars-setLazyLoadVar( 'removed_lines', 'diff-split',
array( 'diff-var' = 'edit_diff', 'line-prefix' = '-'
) );
+ $vars-setLazyLoadVar( 'added_lines_pst', 'diff-split',
+ array( 'diff-var' = 'edit_diff_pst', 'line-prefix' =
'+' ) );
+ $vars-setLazyLoadVar( 'removed_lines_pst', 'diff-split',
+ array( 'diff-var' = 'edit_diff_pst', 'line-prefix' =
'-' ) );
// Links
$vars-setLazyLoadVar( 'added_links', 'link-diff-added',
diff --git a/AbuseFilter.i18n.php b/AbuseFilter.i18n.php
index 1d1fe55..30f232d 100644
--- a/AbuseFilter.i18n.php
+++ b/AbuseFilter.i18n.php
@@ -337,6 +337,9 @@
'abusefilter-edit-builder-vars-old-text' = 'Old page wikitext, before
the edit',
'abusefilter-edit-builder-vars-new-text' = 'New page wikitext, after
the edit',
'abusefilter-edit-builder-vars-new-pst' = 'New page wikitext, pre-save
transformed',
+ 'abusefilter-edit-builder-vars-diff-pst' = 'Unified diff of changes
made by edit, pre-save transformed',
+ 'abusefilter-edit-builder-vars-addedlines-pst' = 'Lines added in edit,
pre-save transformed',
+ 'abusefilter-edit-builder-vars-removedlines-pst' = 'Lines removed in
edit, pre-save transformed',
'abusefilter-edit-builder-vars-new-text-stripped' = 'New page text,
stripped of any markup',
'abusefilter-edit-builder-vars-new-html' = 'Parsed HTML source of the
new revision',
'abusefilter-edit-builder-vars-recent-contributors' = 'Last ten users
to contribute to the page',
@@ -922,6 +925,9 @@
* {{msg-mw|Abusefilter-edit-builder-vars-global-user-groups}}',
'abusefilter-edit-builder-vars-user-blocked' = 'Paraphrased: Boolean
value on whether the user is blocked. Abuse filter syntax option in a dropdown
from the group {{msg-mw|abusefilter-edit-builder-group-vars}}.',
'abusefilter-edit-builder-vars-new-pst' = 'Paraphrased: The output
wikitext after pre-save transform is applied to new_wikitext. Abuse filter
syntax option in a dropdown from the group
{{msg-mw|abusefilter-edit-builder-group-vars}}.',
+ 'abusefilter-edit-builder-vars-diff-pst' = 'Paraphrased: Edit diff of
new_pst against old_wikitext. Abuse filter syntax option in a dropdown from the
group {{msg-mw|abusefilter-edit-builder-group-vars}}.',
+ 'abusefilter-edit-builder-vars-addedlines-pst' = 'Paraphrased: Added
lines in edit_diff_pst. Abuse filter syntax option in a dropdown from the group
{{msg-mw|abusefilter-edit-builder-group-vars}}.',
+ 'abusefilter-edit-builder-vars-removedlines-pst' = 'Paraphrased:
Removed lines in edit_diff_pst. Abuse filter syntax option in a dropdown from
the group {{msg-mw|abusefilter-edit-builder-group-vars}}.',
'abusefilter-edit-builder-vars-restrictions-edit' = 'This variable
contains the level of protection required to edit the page. (Edit here is not
a verb, but an adjective, like Edit-related protection level).
[MediaWiki-commits] [Gerrit] Remove lucid umask setting - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86816
Change subject: Remove lucid umask setting
..
Remove lucid umask setting
Since Fenari is on precise and tin is the deploy host, sepcial umask setting is
redundant.
Change-Id: I2d59d10dd8c76a4ec307e7bccc3fa39629d14b6b
---
D files/environment/profile-deploy-host
M manifests/generic-definitions.pp
2 files changed, 0 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/86816/1
diff --git a/files/environment/profile-deploy-host
b/files/environment/profile-deploy-host
deleted file mode 100644
index 8b1351b..000
--- a/files/environment/profile-deploy-host
+++ /dev/null
@@ -1,35 +0,0 @@
-# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
-# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-
-# ! this file is generated by puppet !
-# this /etc/profile does NOT set umask
-# instead that is being handled in /etc/profile.d/umask-wikidev.sh
-# based on group membership in wikidev (RT-804)
-# this is ONLY applied on deployment hosts (fenari) on lucid or older
-# precise and newer does not have a umask line there any longer
-
-if [ -d /etc/profile.d ]; then
- for i in /etc/profile.d/*.sh; do
-if [ -r $i ]; then
- . $i
-fi
- done
- unset i
-fi
-
-if [ $PS1 ]; then
- if [ $BASH ]; then
-PS1='\u@\h:\w\$ '
-if [ -f /etc/bash.bashrc ]; then
- . /etc/bash.bashrc
-fi
- else
-if [ `id -u` -eq 0 ]; then
- PS1='# '
-else
- PS1='$ '
-fi
- fi
-fi
-
-export PATH=$PATH:/home/wikipedia/bin
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 539447f..a1bfbce 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -303,17 +303,6 @@
mode = 0444,
source =
puppet:///files/environment/umask-wikidev-profile-d.sh;
}
- # if lucid or earlier /etc/profile would overwrite umask after incl.
above
- # FIXME: remove this once fenari became precise or there is a new
deploy host
- if versioncmp($::lsbdistrelease, 10.04) = 0 {
- file {
- /etc/profile:
- ensure = present,
- owner = root,
- group = root,
- source =
puppet:///files/environment/profile-deploy-host;
- }
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/86816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d59d10dd8c76a4ec307e7bccc3fa39629d14b6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unbreak javascript for forms not including category/categories - change (mediawiki...SemanticForms)
MathiasLidal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86817
Change subject: Unbreak javascript for forms not including category/categories
..
Unbreak javascript for forms not including category/categories
Change-Id: Ice9e44847e6730ba0ae747e555c8ef30d13046dd
---
M libs/ext.dynatree.js
1 file changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/17/86817/1
diff --git a/libs/ext.dynatree.js b/libs/ext.dynatree.js
index 228cbbc..8ffc821 100644
--- a/libs/ext.dynatree.js
+++ b/libs/ext.dynatree.js
@@ -38,15 +38,16 @@
dtnode.isSelected()).addClass(hidden);
}
});
-});
-//Update real checkboxes according to selections
- $.map(nodeSelection.dynatree(getTree).getSelectedNodes(),
- function (dtnode) {
- $(#chb- + dtnode.data.key).attr(checked, true);
- dtnode.activate();
- });
- var activeNode = nodeSelection.dynatree(getTree).getActiveNode();
- if (activeNode !== null) {
- activeNode.deactivate()
- }
+ //Update real checkboxes according to selections
+ $.map(node.dynatree(getTree).getSelectedNodes(),
+ function (dtnode) {
+ $(#chb- + dtnode.data.key).attr(checked,
true);
+ dtnode.activate();
+ });
+ var activeNode = node.dynatree(getTree).getActiveNode();
+ if (activeNode !== null) {
+ activeNode.deactivate()
+ }
+ });
});
+
--
To view, visit https://gerrit.wikimedia.org/r/86817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice9e44847e6730ba0ae747e555c8ef30d13046dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: MathiasLidal mathiasli...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fundrising: removed non-WMF jenkins. - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86818
Change subject: Fundrising: removed non-WMF jenkins.
..
Fundrising: removed non-WMF jenkins.
The Fundrising should be using the jenkins from WMF apt repo.
Change-Id: Ib9cf4f6da88cd78ecfcd9878bc5ba5d5ab9ed632
---
M manifests/misc/fundraising.pp
1 file changed, 0 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/86818/1
diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index f53eef5..2b856fd 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -354,23 +354,6 @@
system_role { 'misc::fundraising::jenkins': description = 'fundraising
jenkins server' }
- # FIXME: remove and use Jenkins from the WMF repository
- exec {
- 'jenkins-apt-repo-key':
- unless = '/bin/grep deb
http://pkg.jenkins-ci.org/debian-stable binary/ /etc/apt/sources.list.d/*',
- command = '/usr/bin/wget -q -O -
http://pkg.jenkins-ci.org/debian-stable/jenkins-ci.org.key | /usr/bin/apt-key
add -';
-
- 'jenkins-apt-repo-add':
- subscribe = Exec['jenkins-apt-repo-key'],
- refreshonly = true,
- command = '/bin/echo deb
http://pkg.jenkins-ci.org/debian-stable binary/
/etc/apt/sources.list.d/jenkins.list';
-
- 'do-an-apt-get-update':
- subscribe = Exec['jenkins-apt-repo-add'],
- refreshonly = true,
- command = '/usr/bin/apt-get update';
- }
-
package { jenkins:
ensure = latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/86818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9cf4f6da88cd78ecfcd9878bc5ba5d5ab9ed632
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed pstack package since bug 48025 is resolved. - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Removed pstack package since bug 48025 is resolved.
..
Removed pstack package since bug 48025 is resolved.
Change-Id: Ic33fe60baa8791ded1dd38aace4570b12d5b6be5
---
M manifests/site.pp
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 4cca19a..437411b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1046,12 +1046,6 @@
require = File['/srv/ssd'],
}
-# FIXME requested by hashar to debug out an issue
-# with Jenkins (bug 48025)
-package { 'pstack':
-ensure = present,
-}
-
install_certificate{ star.mediawiki.org: }
install_certificate{ star.wikimedia.org: }
}
--
To view, visit https://gerrit.wikimedia.org/r/86812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic33fe60baa8791ded1dd38aace4570b12d5b6be5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make pyflakes work on all files by default - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Make pyflakes work on all files by default .. Make pyflakes work on all files by default Change-Id: Id66c2a9c0cb23a19dd18bfa8ae219a462813b229 --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/macro.yaml b/macro.yaml index 2c47bb2..156ee39 100644 --- a/macro.yaml +++ b/macro.yaml @@ -297,7 +297,7 @@ - builder: name: pyflakes builders: - - shell: pyflakes + - shell: pyflakes . - builder: name: phplint -- To view, visit https://gerrit.wikimedia.org/r/86727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id66c2a9c0cb23a19dd18bfa8ae219a462813b229 Gerrit-PatchSet: 3 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bits: remove /w/ symlink, add a /w/404.php symlink - change (operations/mediawiki-config)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/86819 Change subject: bits: remove /w/ symlink, add a /w/404.php symlink .. bits: remove /w/ symlink, add a /w/404.php symlink bits isn't a valid hostname for MediaWiki, so regular entry points just fail and log fatals. Remove the /w/ symlink and symlink just 404.php instead, which was the intention of Ida784b all along. Bug: 54805 Change-Id: Ia73fca2012696f7021cc8fb75da527654b83e088 --- D docroot/bits/w A docroot/bits/w/404.php 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/19/86819/1 diff --git a/docroot/bits/w b/docroot/bits/w deleted file mode 12 index e91fae3..000 --- a/docroot/bits/w +++ /dev/null @@ -1 +0,0 @@ -/apache/common/live-1.5 \ No newline at end of file diff --git a/docroot/bits/w/404.php b/docroot/bits/w/404.php new file mode 12 index 000..204b12a --- /dev/null +++ b/docroot/bits/w/404.php @@ -0,0 +1 @@ +/apache/common/live-1.5/404.php \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/86819 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia73fca2012696f7021cc8fb75da527654b83e088 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added admins parameter to the zero config - change (mediawiki...ZeroRatedMobileAccess)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86820
Change subject: Added admins parameter to the zero config
..
Added admins parameter to the zero config
* This is just a placeholder - user accounts can be added
to the json zero config, validated and shown properly as
a link to the User:xxx page.
* Enforces uniqueness and proper normalization
* Minor cleanup - old sample json file is deleted.
Change-Id: I698c85d548c383b044374cd2c44b8baa61b1379f
---
D SampleConfigPage.json
M includes/CarrierConfig.php
M includes/ZeroConfig.i18n.php
M includes/ZeroConfigContent.php
4 files changed, 26 insertions(+), 64 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/20/86820/1
diff --git a/SampleConfigPage.json b/SampleConfigPage.json
deleted file mode 100644
index f848e8e..000
--- a/SampleConfigPage.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- enabled:true,
- messageId:dialog-sri-lanka,
- showLangs:[
-en,
-kg
- ],
- langNameOverrides:{
-kg:Kikongo
- },
- whitelistedLangs:[
-en,
-ru,
-fr
- ],
- foreground:#735005,
- background:#F4A83D,
- fontSize:0.9em,
- bannerWarning:true,
- showImages:false,
- showZeroPage:true,
- bannerUrl:http://www.dialog.lk/personal/broadband/hspa/;,
- ips:[
-192.168.0.0/16
- ],
- name:{
-en: Dialog Sri Lanka,
-id: Dialog Sri Lanka,
-ja: ダイアログ スリランカ,
-mk: Dialog Шри Ланка,
-si: ඩයලොග්,
-ta: Dialog Sri Lanka
- },
- banner:{
-ar: {{SITENAME}} بلا مقابل من $1,
-ast: {{SITENAME}} @ TARIFA CERO dende $1,
-cs: {{SITENAME}} BEZPLATNĚ od $1,
-de: {{SITENAME}} ohne Gebühren von $1,
-en: {{SITENAME}} @ ZERO CHARGE from $1,
-es: {{SITENAME}} gratis desde $1,
-fi: {{SITENAME}} MAKSUTTA, tarjoaa $1,
-fr: {{SITENAME}} @ ZÉRO CHARGE depuis $1,
-frp: {{SITENAME}} @ ZÉRÔ CHARGE dês $1,
-gl: {{SITENAME}} gratis desde $1,
-he: {{SITENAME}} חינם־חינם מבית $1,
-hsb: {{SITENAME}} bjez popłatkow wot $1,
-id: {{SITENAME}} BEBAS PULSA dari $1,
-it: {{SITENAME}} gratuito da $1,
-ja: {{SITENAME}} @ ZERO CHARGE、$1 から,
-ko: $1에서 {{SITENAME}} @ ZERO CHARGE,
-ksh: {{SITENAME}} span style='text-convsert:uppercase'der ohne
Koßte/span vun $1,
-mk: {{SITENAME}} без наплата од $1,
-ml: {{SITENAME}} @ $1 നൽകുന്ന സീറോ ചാർജ്,
-ms: {{SITENAME}} PERCUMA mulai $1,
-nl: {{SITENAME}} ZONDER KOSTEN van $1,
-pms: {{SITENAME}} @ TARIFA ZERO da $1,
-ro: {{SITENAME}} @ FĂRĂ COSTURI de la $1,
-si: $1 සමගින් නොමිලේ විකිපීඩියා බලන්න,
-ta: $1 Wikipedia க்கு கட்டணங்கள் இல்லை,
-vi: {{SITENAME}} MIỄN PHÍ từ $1,
-zh-hans: 由$1提供的免费{{SITENAME}}访问,
-zh-hant: $1提供{{SITENAME}}免費訪問連線
- }
-}
diff --git a/includes/CarrierConfig.php b/includes/CarrierConfig.php
index 0b3f389..0e91fb7 100644
--- a/includes/CarrierConfig.php
+++ b/includes/CarrierConfig.php
@@ -313,6 +313,25 @@
natsort( $v );
return array_values( $v );
} );
+
+ // List of additional admins for this entry
+ $this-check( 'admins', array(),
+ function( $v ) {
+ if ( !CarrierConfig::isArray( $v, false
)
+ ||
!CarrierConfig::isArrayOfStrings( $v ) ) {
+ return wfMessage(
'zeroconfig-admins' );
+ }
+ $v2 = array();
+ foreach ( $v as $name ) {
+ $n = \User::getCanonicalName(
$name, 'usable' );
+ if ( !$n ) {
+ return wfMessage(
'zeroconfig-admins' );
+ }
+ $v2[] = $n;
+ }
+ $v2 = array_unique( $v2 );
+ return array_values( $v2 );
+ } );
}
// In case 'showZeroPage' is not set, the default depends on
how many languages are shown.
diff --git a/includes/ZeroConfig.i18n.php b/includes/ZeroConfig.i18n.php
index 507897b..ebc5c8d 100644
--- a/includes/ZeroConfig.i18n.php
+++ b/includes/ZeroConfig.i18n.php
@@ -30,6 +30,7 @@
'zeroconfig-banner_url' = 'must be a valid URL (optional)',
'zeroconfig-sites' = 'must be missing or be a list with one or more of
these values: $1',
'zeroconfig-ips' = 'must be an array of valid non-restricted (no
private networks) CIDR IP blocks',
+
[MediaWiki-commits] [Gerrit] Fixed zero.wikipedia.org to show red banner for no carrier case - change (mediawiki...ZeroRatedMobileAccess)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86821
Change subject: Fixed zero.wikipedia.org to show red banner for no carrier case
..
Fixed zero.wikipedia.org to show red banner for no carrier case
In case X-CS is net set, Special:Zero... will show red banner
for zero subnet instead of redirecting to www.wikipedia.org
Change-Id: Ia4d13d4a3875cc4300ea6ff35600d7ba2343f62c
---
M includes/PageRenderingHooks.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/21/86821/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 472cc42..737740e 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -734,8 +734,12 @@
$toUrl = $this-request-getVal( 'to' );
if ( $toUrl === null || $from === null ) {
// This is not a redirect, see if we need to redirect
to the Main Page
+ $url = false;
if ( $config === null ) {
- $url = '//www.wikipedia.org';
+ // Do not redirect if this is
zero.wikipedia.org - need to show red warning
+ if ( !$this-isZeroSubdomain() ) {
+ $url = '//www.wikipedia.org';
+ }
} else {
$info = self::getWikiInfo();
$dfltLang = $config['showLangs'][0];
@@ -746,8 +750,6 @@
$spcl = Title::makeTitle( NS_SPECIAL,
'ZeroRatedMobileAccess', '', $dfltLang );
$url = $spcl-getFullUrl();
$url =
MobileContext::singleton()-getMobileUrl( $url );
- } else {
- $url = false;
}
}
if ( $url ) {
--
To view, visit https://gerrit.wikimedia.org/r/86821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4d13d4a3875cc4300ea6ff35600d7ba2343f62c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] minor config file sync - change (operations/dumps)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/86822 Change subject: minor config file sync .. minor config file sync The code required small changes to the sample config Change-Id: I316e25dfd659a78bbaa278e57107191442ea2a06 --- M xmldumps-backup/wikidump.conf.sample 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dumps refs/changes/22/86822/1 diff --git a/xmldumps-backup/wikidump.conf.sample b/xmldumps-backup/wikidump.conf.sample index 57de2e0..43669ba 100644 --- a/xmldumps-backup/wikidump.conf.sample +++ b/xmldumps-backup/wikidump.conf.sample @@ -41,6 +41,9 @@ keep=10 [chunks] -chunksEnabled=True +chunksEnabled=1 pagesPerChunkHistory=1,5,5,5,5 pagesPerChunkAbstract=10,10 + +[pageslogging] +batchsize=1000 -- To view, visit https://gerrit.wikimedia.org/r/86822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I316e25dfd659a78bbaa278e57107191442ea2a06 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps Gerrit-Branch: ariel Gerrit-Owner: Adamw awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gitignore things - change (operations/dumps)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/86823 Change subject: gitignore things .. gitignore things Change-Id: Ib671071153f8eafe9ba495188f662ad9a7f9e378 --- M xmldumps-backup/mwbzutils/.gitignore 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dumps refs/changes/23/86823/1 diff --git a/xmldumps-backup/mwbzutils/.gitignore b/xmldumps-backup/mwbzutils/.gitignore index 747fab5..5535828 100644 --- a/xmldumps-backup/mwbzutils/.gitignore +++ b/xmldumps-backup/mwbzutils/.gitignore @@ -1,6 +1,8 @@ *.o +*.gz checkforbz2footer dumpbz2filefromoffset dumplastbz2block findpageidinbz2xml recompressxml +writeuptopageid -- To view, visit https://gerrit.wikimedia.org/r/86823 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib671071153f8eafe9ba495188f662ad9a7f9e378 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps Gerrit-Branch: ariel Gerrit-Owner: Adamw awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cheap hack to qualify table with prefix - change (operations/dumps)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/86824 Change subject: cheap hack to qualify table with prefix .. cheap hack to qualify table with prefix Some stray queries did not account for dBTablePrefix. Change-Id: I433fc99e8b7a4c4134919fd3d899c7f332a744c3 FIXME: Any queries other than mysqldump should be done using native DBI... --- M xmldumps-backup/worker.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dumps refs/changes/24/86824/1 diff --git a/xmldumps-backup/worker.py b/xmldumps-backup/worker.py index f592fed..c3f5857 100644 --- a/xmldumps-backup/worker.py +++ b/xmldumps-backup/worker.py @@ -324,7 +324,7 @@ def getStatistics(self, dbName, ignore): Get statistics for the wiki - query = select MAX(page_id) from page; + query = select MAX(page_id) from %spage; % self.dbServerInfo.dBTablePrefix results = None retries = 0 maxretries = 5 @@ -339,7 +339,7 @@ lines = results.splitlines() if (lines and lines[1]): self.totalPages = int(lines[1]) - query = select MAX(rev_id) from revision; + query = select MAX(rev_id) from %srevision; % self.dbServerInfo.dBTablePrefix retries = 0 results = None results = self.dbServerInfo.runSqlAndGetOutput(query) @@ -2951,7 +2951,7 @@ def getMaxLogID(self, runner): dbServerInfo = DbServerInfo(runner.wiki, runner.dbName) - query = select MAX(log_id) from logging; + query = select MAX(log_id) from %slogging; % dbServerInfo.dBTablePrefix results = None retries = 0 maxretries = 5 -- To view, visit https://gerrit.wikimedia.org/r/86824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I433fc99e8b7a4c4134919fd3d899c7f332a744c3 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps Gerrit-Branch: ariel Gerrit-Owner: Adamw awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [bug 54820] Fixed zero.wikipedia.org to show red banner for ... - change (mediawiki...ZeroRatedMobileAccess)
jenkins-bot has submitted this change and it was merged.
Change subject: [bug 54820] Fixed zero.wikipedia.org to show red banner for no
carrier case
..
[bug 54820] Fixed zero.wikipedia.org to show red banner for no carrier case
In case X-CS is net set, Special:Zero... will show red banner
for zero subnet instead of redirecting to www.wikipedia.org
Change-Id: Ia4d13d4a3875cc4300ea6ff35600d7ba2343f62c
---
M includes/PageRenderingHooks.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 472cc42..737740e 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -734,8 +734,12 @@
$toUrl = $this-request-getVal( 'to' );
if ( $toUrl === null || $from === null ) {
// This is not a redirect, see if we need to redirect
to the Main Page
+ $url = false;
if ( $config === null ) {
- $url = '//www.wikipedia.org';
+ // Do not redirect if this is
zero.wikipedia.org - need to show red warning
+ if ( !$this-isZeroSubdomain() ) {
+ $url = '//www.wikipedia.org';
+ }
} else {
$info = self::getWikiInfo();
$dfltLang = $config['showLangs'][0];
@@ -746,8 +750,6 @@
$spcl = Title::makeTitle( NS_SPECIAL,
'ZeroRatedMobileAccess', '', $dfltLang );
$url = $spcl-getFullUrl();
$url =
MobileContext::singleton()-getMobileUrl( $url );
- } else {
- $url = false;
}
}
if ( $url ) {
--
To view, visit https://gerrit.wikimedia.org/r/86821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4d13d4a3875cc4300ea6ff35600d7ba2343f62c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero Ext Update - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/86826 Change subject: Zero Ext Update .. Zero Ext Update Change-Id: I41d5ba94406d9022c87a024801f6ef6cdaa6137c --- M extensions/ZeroRatedMobileAccess 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/26/86826/1 diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess index a89c5b1..3d800c5 16 --- a/extensions/ZeroRatedMobileAccess +++ b/extensions/ZeroRatedMobileAccess -Subproject commit a89c5b152d6157b872d526e85ce223f655c4c974 +Subproject commit 3d800c5e07ef0c79ad585457539c32fd2f44c0a6 -- To view, visit https://gerrit.wikimedia.org/r/86826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41d5ba94406d9022c87a024801f6ef6cdaa6137c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf19 Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero Ext Update - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/86825 Change subject: Zero Ext Update .. Zero Ext Update Change-Id: I5be814efe0f847f883c0c8f6eeb9d175cc8b2d7f --- M extensions/ZeroRatedMobileAccess 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/25/86825/1 diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess index a89c5b1..3d800c5 16 --- a/extensions/ZeroRatedMobileAccess +++ b/extensions/ZeroRatedMobileAccess -Subproject commit a89c5b152d6157b872d526e85ce223f655c4c974 +Subproject commit 3d800c5e07ef0c79ad585457539c32fd2f44c0a6 -- To view, visit https://gerrit.wikimedia.org/r/86825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5be814efe0f847f883c0c8f6eeb9d175cc8b2d7f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf18 Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero Ext Update - change (mediawiki/core)
Yurik has submitted this change and it was merged. Change subject: Zero Ext Update .. Zero Ext Update Change-Id: I41d5ba94406d9022c87a024801f6ef6cdaa6137c --- M extensions/ZeroRatedMobileAccess 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Yurik: Verified; Looks good to me, approved diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess index a89c5b1..3d800c5 16 --- a/extensions/ZeroRatedMobileAccess +++ b/extensions/ZeroRatedMobileAccess -Subproject commit a89c5b152d6157b872d526e85ce223f655c4c974 +Subproject commit 3d800c5e07ef0c79ad585457539c32fd2f44c0a6 -- To view, visit https://gerrit.wikimedia.org/r/86826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41d5ba94406d9022c87a024801f6ef6cdaa6137c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf19 Gerrit-Owner: Yurik yu...@wikimedia.org Gerrit-Reviewer: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero Ext Update - change (mediawiki/core)
Yurik has submitted this change and it was merged. Change subject: Zero Ext Update .. Zero Ext Update Change-Id: I5be814efe0f847f883c0c8f6eeb9d175cc8b2d7f --- M extensions/ZeroRatedMobileAccess 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Yurik: Verified; Looks good to me, approved diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess index a89c5b1..3d800c5 16 --- a/extensions/ZeroRatedMobileAccess +++ b/extensions/ZeroRatedMobileAccess -Subproject commit a89c5b152d6157b872d526e85ce223f655c4c974 +Subproject commit 3d800c5e07ef0c79ad585457539c32fd2f44c0a6 -- To view, visit https://gerrit.wikimedia.org/r/86825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5be814efe0f847f883c0c8f6eeb9d175cc8b2d7f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf18 Gerrit-Owner: Yurik yu...@wikimedia.org Gerrit-Reviewer: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bits: remove /w/ symlink, add a /w/404.php symlink - change (operations/mediawiki-config)
MaxSem has submitted this change and it was merged. Change subject: bits: remove /w/ symlink, add a /w/404.php symlink .. bits: remove /w/ symlink, add a /w/404.php symlink bits isn't a valid hostname for MediaWiki, so regular entry points just fail and log fatals. Remove the /w/ symlink and symlink just 404.php instead, which was the intention of Ida784b all along. Bug: 54805 Change-Id: Ia73fca2012696f7021cc8fb75da527654b83e088 --- D docroot/bits/w A docroot/bits/w/404.php 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: MaxSem: Verified; Looks good to me, approved Faidon Liambotis: Checked diff --git a/docroot/bits/w b/docroot/bits/w deleted file mode 12 index e91fae3..000 --- a/docroot/bits/w +++ /dev/null @@ -1 +0,0 @@ -/apache/common/live-1.5 \ No newline at end of file diff --git a/docroot/bits/w/404.php b/docroot/bits/w/404.php new file mode 12 index 000..204b12a --- /dev/null +++ b/docroot/bits/w/404.php @@ -0,0 +1 @@ +/apache/common/live-1.5/404.php \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/86819 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia73fca2012696f7021cc8fb75da527654b83e088 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Quick test to see if tests still work - change (operations/mediawiki-config)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86827
Change subject: Quick test to see if tests still work
..
Quick test to see if tests still work
Change-Id: I0b3262f5320c22311d8c109913129af64936e177
---
M wmf-config/mobile.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/27/86827/1
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 05fa190..7af94ca 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -1,7 +1,7 @@
?php
# WARNING: This file is publically viewable on the web.
-# # Do not put private data here.
+# Do not put private data here.
if ( $wmgMobileFrontend ) {
require_once( $IP/extensions/MobileFrontend/MobileFrontend.php );
--
To view, visit https://gerrit.wikimedia.org/r/86827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b3262f5320c22311d8c109913129af64936e177
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use $.toJSON instead of JSON.parse for compatability and - change (mediawiki...UploadWizard)
Rillke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86828
Change subject: Use $.toJSON instead of JSON.parse for compatability and
..
Use $.toJSON instead of JSON.parse for compatability and
consistency with other parts that a commonly used by all browsers.
Restores compatability with IE 7 which is still responsible for 1.8% of
the page views at Wikimedia.
So this can be seen as a fix to a regression introduced with
I5f35a701843baa19
Change-Id: I3920e14d860c8dd5c67ed53e4b82d452118d12d8
---
M resources/mw.IframeTransport.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/28/86828/1
diff --git a/resources/mw.IframeTransport.js b/resources/mw.IframeTransport.js
index 415f722..7621f37 100644
--- a/resources/mw.IframeTransport.js
+++ b/resources/mw.IframeTransport.js
@@ -99,7 +99,7 @@
// check that the JSON is not an XML error message
// (this happens when user aborts upload, we get the
API docs in XML wrapped in HTML)
if ( json json.substring(0, 5) !== '?xml' ) {
- response = JSON.parse( json );
+ response = $.parseJSON( json );
} else {
response = {};
}
--
To view, visit https://gerrit.wikimedia.org/r/86828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3920e14d860c8dd5c67ed53e4b82d452118d12d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Rillke rainerril...@hotmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix api example in SetReference module - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86829
Change subject: Fix api example in SetReference module
..
Fix api example in SetReference module
Change-Id: I2b01e8329099bbe41e76d61ac5fd218175fa35fb
---
M repo/includes/api/SetReference.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/29/86829/1
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index d0db2be..72750b8 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -296,8 +296,10 @@
*/
protected function getExamples() {
return array(
-
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFsnaks={P39:[{snaktype:value,property:P14,datavalue:{type:string,value:wikipedia}}}baserevid=7201010token=foobar'
= 'Create a new reference for claim with GUID
Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF',
-
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFreference=1eb8793c002b1d9820c833d234a1b54c8e94187esnaks={P39:[{snaktype:value,property:P14,datavalue:{type:string,value:wikipedia}}}baserevid=7201010token=foobar'
= 'Set reference for claim with GUID Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF
which has hash of 1eb8793c002b1d9820c833d234a1b54c8e94187e',
+
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFsnaks={P212:[{snaktype:value,property:P212,datavalue:{type:string,value:foo}}]}baserevid=7201010token=foobar'
+ = 'Create a new reference for claim with GUID
Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF',
+
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFreference=1eb8793c002b1d9820c833d234a1b54c8e94187esnaks={P212:[{snaktype:value,property:P212,datavalue:{type:string,value:bar}}]}baserevid=7201010token=foobar'
+ = 'Set reference for claim with GUID
Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF which has hash of
1eb8793c002b1d9820c833d234a1b54c8e94187e',
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b01e8329099bbe41e76d61ac5fd218175fa35fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use $.toJSON instead of JSON.parse for compatability and - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Use $.toJSON instead of JSON.parse for compatability and
..
Use $.toJSON instead of JSON.parse for compatability and
consistency with other parts that a commonly used by all browsers.
Restores compatability with IE 7 which is still responsible for 1.8% of
the page views at Wikimedia.
So this can be seen as a fix to a regression introduced with
I5f35a701843baa19
Change-Id: I3920e14d860c8dd5c67ed53e4b82d452118d12d8
---
M resources/mw.IframeTransport.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.IframeTransport.js b/resources/mw.IframeTransport.js
index 415f722..7621f37 100644
--- a/resources/mw.IframeTransport.js
+++ b/resources/mw.IframeTransport.js
@@ -99,7 +99,7 @@
// check that the JSON is not an XML error message
// (this happens when user aborts upload, we get the
API docs in XML wrapped in HTML)
if ( json json.substring(0, 5) !== '?xml' ) {
- response = JSON.parse( json );
+ response = $.parseJSON( json );
} else {
response = {};
}
--
To view, visit https://gerrit.wikimedia.org/r/86828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3920e14d860c8dd5c67ed53e4b82d452118d12d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Rillke rainerril...@hotmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix api example in SetReference module - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix api example in SetReference module
..
Fix api example in SetReference module
Change-Id: I2b01e8329099bbe41e76d61ac5fd218175fa35fb
---
M repo/includes/api/SetReference.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Lydia Pintscher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index d0db2be..72750b8 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -296,8 +296,10 @@
*/
protected function getExamples() {
return array(
-
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFsnaks={P39:[{snaktype:value,property:P14,datavalue:{type:string,value:wikipedia}}}baserevid=7201010token=foobar'
= 'Create a new reference for claim with GUID
Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF',
-
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFreference=1eb8793c002b1d9820c833d234a1b54c8e94187esnaks={P39:[{snaktype:value,property:P14,datavalue:{type:string,value:wikipedia}}}baserevid=7201010token=foobar'
= 'Set reference for claim with GUID Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF
which has hash of 1eb8793c002b1d9820c833d234a1b54c8e94187e',
+
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFsnaks={P212:[{snaktype:value,property:P212,datavalue:{type:string,value:foo}}]}baserevid=7201010token=foobar'
+ = 'Create a new reference for claim with GUID
Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF',
+
'api.php?action=wbsetreferencestatement=Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFFreference=1eb8793c002b1d9820c833d234a1b54c8e94187esnaks={P212:[{snaktype:value,property:P212,datavalue:{type:string,value:bar}}]}baserevid=7201010token=foobar'
+ = 'Set reference for claim with GUID
Q76$D4FDE516-F20C-4154-ADCE-7C5B609DFDFF which has hash of
1eb8793c002b1d9820c833d234a1b54c8e94187e',
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b01e8329099bbe41e76d61ac5fd218175fa35fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint::localvhost easily setup an apache listener - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: contint::localvhost easily setup an apache listener
..
contint::localvhost easily setup an apache listener
This generalized the QUnit vhost listening on localhost. To run browser
tests, I would need as well a vhost listening on localhost and pointing
to some document root.
I simply converted the existing Apache conf for QUnit to be a template,
the class contint::localvhost let us fill the placeholders.
The QUnit vhost has been migrated to use the new class.
Apache 'Listen' statements are under /etc/apache2/conf.d/
bug: 54385
Change-Id: I3e17c2ab82fbbab5be654f48ca55cca98070ba40
---
D modules/contint/files/apache/qunit.localhost
A modules/contint/manifests/localvhost.pp
M modules/contint/manifests/website.pp
A modules/contint/templates/apache/listen.erb
A modules/contint/templates/apache/localvhost.erb
5 files changed, 93 insertions(+), 42 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/files/apache/qunit.localhost
b/modules/contint/files/apache/qunit.localhost
deleted file mode 100644
index 344201e..000
--- a/modules/contint/files/apache/qunit.localhost
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/contint/apache/qunit.localhost
-#
-# vim: filetype=apache
-
-# We would prefer not having external requests
-Listen 127.0.0.1:9412
-Listen [::1]:9412
-
-VirtualHost *:9412
- ServerName localhost
- DocumentRoot /srv/localhost/qunit
-
- Directory /
- Order deny,allow
- Deny from all
- /Directory
-
- Directory /srv/localhost/qunit
- Options +Indexes
- Options FollowSymLinks
-
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1/32
- Allow from ::1/128
- /Directory
-
- LogLevel warn
- ErrorLog /var/log/apache2/qunit_error.log
- CustomLog /var/log/apache2/qunit_access.log vhost_combined
-/VirtualHost
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
new file mode 100644
index 000..0f3160b
--- /dev/null
+++ b/modules/contint/manifests/localvhost.pp
@@ -0,0 +1,42 @@
+# == Class contint::localvhost
+#
+# Craft an apache configuration file to listen on localhost:$port (default to
+# port 9412) and point that vhost to $docroot (default to
+# /srv/localhost${name}).
+#
+# The $name is by default used as a prefix for the Apache logs. You can
+# override it using $log_prefix.
+#
+# == Example:
+#
+# contint::localvhost { 'qunit:' }
+#
+# Creates a vhost listening on 127.0.0.1:9412 having a DocumentRoot at
+# /srv/localhost/qunit.
+#
+class contint::localvhost(
+$docroot = /srv/localhost/${name},
+$port = 9412,
+$log_prefix = $name,
+){
+
+file { /etc/apache2/sites-available/${name}.localhost:
+mode= '0444',
+owner = 'root',
+group = 'root',
+content = template('contint/apache/localvhost.erb'),
+}
+
+$apache_listens = [
+{ 'ip' = '127.0.0.1', 'port' = $port, 'proto' = 'http', },
+{ 'ip' = '[::1]', 'port' = $port, 'proto' = 'http', },
+]
+file { /etc/apache2/conf.d/listen-localhost-${port}:
+content = template('contint/apache/listen.erb'),
+}
+
+apache_site { ${name} localhost:
+name = ${name}.localhost
+}
+
+}
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 00bce89..2184910 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -97,15 +97,11 @@
group = 'jenkins-slave',
}
- # Apache configuration for a virtual host on localhost
- file { '/etc/apache2/sites-available/qunit.localhost':
-mode = '0444',
-owner = 'root',
-group = 'root',
-source = 'puppet:///modules/contint/apache/qunit.localhost',
- }
- apache_site { 'qunit localhost':
-name = 'qunit.localhost'
+ contint::localvhost { 'qunit':
+port = 9412,
+docroot= '/srv/localhost/qunit',
+log_prefix = 'qunit',
+require= File['/srv/localhost/qunit'],
}
}
diff --git a/modules/contint/templates/apache/listen.erb
b/modules/contint/templates/apache/listen.erb
new file mode 100644
index 000..af917a9
--- /dev/null
+++ b/modules/contint/templates/apache/listen.erb
@@ -0,0 +1,18 @@
+#
+ THIS FILE IS MANAGED BY PUPPET
+ puppet:///modules/contint/apache/listen.erb
+##
+
+# Ports Apache is listening to in addition to the default ports:
+%
[MediaWiki-commits] [Gerrit] Remove clutter comments - change (mediawiki...DataTypes)
Addshore has submitted this change and it was merged. Change subject: Remove clutter comments .. Remove clutter comments Change-Id: I6662553e927edda4f106224db861ca3031f20bc7 --- M DataTypes.php M README.md 2 files changed, 1 insertion(+), 10 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/DataTypes.php b/DataTypes.php index 2d61c8d..7ea9e9a 100644 --- a/DataTypes.php +++ b/DataTypes.php @@ -22,13 +22,6 @@ * @defgroup DataTypes DataTypes */ -/** - * Tests part of the DataTypes extension. - * - * @defgroup DataTypesTests DataTypesTests - * @ingroup DataTypes - */ - namespace DataTypes; use Exception; diff --git a/README.md b/README.md index 0783c0b..9c24535 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,7 @@ ### 0.1 (under development) -Initial release with these features: - -* +Initial release. ## Links -- To view, visit https://gerrit.wikimedia.org/r/86646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6662553e927edda4f106224db861ca3031f20bc7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DataTypes Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Normalize and Vary on the forceHTTPS cookie - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Normalize and Vary on the forceHTTPS cookie
..
Normalize and Vary on the forceHTTPS cookie
We move most cookies out of the way since Varnish doesn't support
X-Vary-Options, but forceHTTPS we do need to vary on.
Change-Id: Ibc47e96e7725170486286def7e7c5c8f28d0c892
---
M templates/varnish/text-common.inc.vcl.erb
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
CSteipp: Looks good to me, but someone else must approve
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index 0710a5d..2d70db1 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -17,6 +17,11 @@
if (req.restarts == 0) {
set req.http.Orig-Cookie = req.http.Cookie;
unset req.http.Cookie;
+
+ /* We need to vary on the forceHTTPS cookie */
+ if (req.http.Orig-Cookie ~ forceHTTPS=(1|true)) {
+ set req.http.Cookie = forceHTTPS=1;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc47e96e7725170486286def7e7c5c8f28d0c892
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/86830 Change subject: Updated Ruby gems .. Updated Ruby gems Change-Id: I09a77bcdeb04cb465108832f4d7fdc0063331519 --- M Gemfile.lock 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/30/86830/1 diff --git a/Gemfile.lock b/Gemfile.lock index b63cb9b..d6ba2fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,13 +5,13 @@ childprocess (0.3.9) ffi (~ 1.0, = 1.0.11) chunky_png (1.2.8) -cucumber (1.3.6) +cucumber (1.3.8) builder (= 2.1.2) diff-lcs (= 1.1.3) - gherkin (~ 2.12.0) - multi_json (~ 1.7.5) + gherkin (~ 2.12.1) + multi_json (= 1.7.5, 2.0) multi_test (= 0.0.2) -data_magic (0.15.2) +data_magic (0.16.1) faker (= 1.1.2) yml_reader (= 0.2) diff-lcs (1.2.4) @@ -25,7 +25,7 @@ multi_json (~ 1.3) i18n (0.6.5) json (1.8.0) -multi_json (1.7.9) +multi_json (1.8.0) multi_test (0.0.2) net-http-persistent (2.9) page-object (0.9.2) @@ -34,13 +34,13 @@ watir-webdriver (= 0.6.4) page_navigation (0.9) data_magic (= 0.14) -rspec-expectations (2.14.2) +rspec-expectations (2.14.3) diff-lcs (= 1.1.3, 2.0) rubyzip (0.9.9) -selenium-webdriver (2.35.0) +selenium-webdriver (2.35.1) childprocess (= 0.2.5) multi_json (~ 1.0) - rubyzip + rubyzip ( 1.0.0) websocket (~ 1.0.4) syntax (1.0.0) watir-webdriver (0.6.4) -- To view, visit https://gerrit.wikimedia.org/r/86830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09a77bcdeb04cb465108832f4d7fdc0063331519 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint::localvhost is really a define - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86831
Change subject: contint::localvhost is really a define
..
contint::localvhost is really a define
Change-Id: I3ffc791721c3228cd6fed55a54a16ccba30368fa
---
M modules/contint/manifests/localvhost.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/86831/1
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
index 0f3160b..cb08cb8 100644
--- a/modules/contint/manifests/localvhost.pp
+++ b/modules/contint/manifests/localvhost.pp
@@ -1,4 +1,4 @@
-# == Class contint::localvhost
+# == Definition contint::localvhost
#
# Craft an apache configuration file to listen on localhost:$port (default to
# port 9412) and point that vhost to $docroot (default to
@@ -14,7 +14,7 @@
# Creates a vhost listening on 127.0.0.1:9412 having a DocumentRoot at
# /srv/localhost/qunit.
#
-class contint::localvhost(
+define contint::localvhost(
$docroot = /srv/localhost/${name},
$port = 9412,
$log_prefix = $name,
--
To view, visit https://gerrit.wikimedia.org/r/86831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ffc791721c3228cd6fed55a54a16ccba30368fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint::localvhost is really a define - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: contint::localvhost is really a define
..
contint::localvhost is really a define
Change-Id: I3ffc791721c3228cd6fed55a54a16ccba30368fa
---
M modules/contint/manifests/localvhost.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
index 0f3160b..cb08cb8 100644
--- a/modules/contint/manifests/localvhost.pp
+++ b/modules/contint/manifests/localvhost.pp
@@ -1,4 +1,4 @@
-# == Class contint::localvhost
+# == Definition contint::localvhost
#
# Craft an apache configuration file to listen on localhost:$port (default to
# port 9412) and point that vhost to $docroot (default to
@@ -14,7 +14,7 @@
# Creates a vhost listening on 127.0.0.1:9412 having a DocumentRoot at
# /srv/localhost/qunit.
#
-class contint::localvhost(
+define contint::localvhost(
$docroot = /srv/localhost/${name},
$port = 9412,
$log_prefix = $name,
--
To view, visit https://gerrit.wikimedia.org/r/86831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ffc791721c3228cd6fed55a54a16ccba30368fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deleted Jenkins jobs that run ULS tests at sandbox.translate... - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/86832 Change subject: Deleted Jenkins jobs that run ULS tests at sandbox.translatewiki.net .. Deleted Jenkins jobs that run ULS tests at sandbox.translatewiki.net No ULS tests are tagged @sandbox.translatewiki.net. There were a couple of Jenkins jobs, disabled for the last 10 days, probably because they were failing all the time. Change-Id: Ib3d12695f8797a37acc28949c3cc5836b1a713b1 --- M docs/jobs.md 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/32/86832/1 diff --git a/docs/jobs.md b/docs/jobs.md index f1392dd..75dd125 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -158,16 +158,6 @@ - bundle exec: cucumber --verbose --profile ci --tags @en.wikipedia.beta.wmflabs.org - MediaWiki URL: en.wikipedia.beta.wmflabs.org -## UniversalLanguageSelector-sandbox.translatewiki.net-linux-chrome -- Browser Label: chrome -- bundle exec: cucumber --verbose --profile ci --tags @sandbox.translatewiki.net -- MediaWiki URL: sandbox.translatewiki.net - -## UniversalLanguageSelector-sandbox.translatewiki.net-linux-firefox -- Browser Label: firefox -- bundle exec: cucumber --verbose --profile ci --tags @sandbox.translatewiki.net -- MediaWiki URL: sandbox.translatewiki.net - # VisualEditor-test2.wikipedia.org-linux-firefox -- To view, visit https://gerrit.wikimedia.org/r/86832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3d12695f8797a37acc28949c3cc5836b1a713b1 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use clientaddrUsesPort and a high port to send out outgoing ... - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86834
Change subject: use clientaddrUsesPort and a high port to send out outgoing
SNMP requests per man snmp.conf so that non-root users can bind to it and we
avoid getting SNMP permission denied errors when icinga runs these and we send
the client IP since I9c7b1c11aeef2ff984
..
use clientaddrUsesPort and a high port to send out outgoing SNMP
requests per man snmp.conf so that non-root users can bind to it
and we avoid getting SNMP permission denied errors when icinga
runs these and we send the client IP since
I9c7b1c11aeef2ff984ab25c7c81514be3c5897db
Change-Id: I2e8b31459e78e5fd743cc817faeab82971aa1e26
---
M modules/base/templates/snmp.conf.erb
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/86834/1
diff --git a/modules/base/templates/snmp.conf.erb
b/modules/base/templates/snmp.conf.erb
index a91102c..e372e16 100644
--- a/modules/base/templates/snmp.conf.erb
+++ b/modules/base/templates/snmp.conf.erb
@@ -4,9 +4,10 @@
##
mibs :
% if has_variable?('::ipaddress_bond0') then %
-clientaddr %= scope.lookupvar('::ipaddress_bond0') %
+clientaddr %= scope.lookupvar('::ipaddress_bond0') %:5061
% elsif has_variable?('::ipaddress_eth0') then %
-clientaddr %= scope.lookupvar('::ipaddress_eth0') %
+clientaddr %= scope.lookupvar('::ipaddress_eth0') %:5061
% else %
-clientaddr %= scope.lookupvar('::ipaddress') %
+clientaddr %= scope.lookupvar('::ipaddress') %:5061
% end %
+clientaddrUsesPort yes
--
To view, visit https://gerrit.wikimedia.org/r/86834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e8b31459e78e5fd743cc817faeab82971aa1e26
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add nrpe to node zirconium so we can monitor processes like ... - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86833
Change subject: add nrpe to node zirconium so we can monitor processes like
etherpad
..
add nrpe to node zirconium so we can monitor processes like etherpad
Change-Id: Ibe96a1b57f1d8b501195fc0314d351812dc72325
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/86833/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 35378b6..dd2abb7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3012,6 +3012,7 @@
node zirconium.wikimedia.org {
include standard,
admins::roots,
+nrpe,
role::planet,
misc::outreach::civicrm, # contacts.wikimedia.org
misc::etherpad_lite
--
To view, visit https://gerrit.wikimedia.org/r/86833
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe96a1b57f1d8b501195fc0314d351812dc72325
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: simplify apache listen template - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86836
Change subject: contint: simplify apache listen template
..
contint: simplify apache listen template
I am not sure what I had in mind previously, but using a bunch of
non working ruby was not really smart.
The localvhost template now accepts 'port' and would simply make Apache
listen locally for HTTP.
Change-Id: I7ae6bb2047da1e4fa07bf234bf5e499f91b30da7
---
M modules/contint/manifests/localvhost.pp
M modules/contint/templates/apache/listen.erb
2 files changed, 3 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/86836/1
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
index cb08cb8..9078c92 100644
--- a/modules/contint/manifests/localvhost.pp
+++ b/modules/contint/manifests/localvhost.pp
@@ -27,10 +27,6 @@
content = template('contint/apache/localvhost.erb'),
}
-$apache_listens = [
-{ 'ip' = '127.0.0.1', 'port' = $port, 'proto' = 'http', },
-{ 'ip' = '[::1]', 'port' = $port, 'proto' = 'http', },
-]
file { /etc/apache2/conf.d/listen-localhost-${port}:
content = template('contint/apache/listen.erb'),
}
diff --git a/modules/contint/templates/apache/listen.erb
b/modules/contint/templates/apache/listen.erb
index af917a9..5317ea1 100644
--- a/modules/contint/templates/apache/listen.erb
+++ b/modules/contint/templates/apache/listen.erb
@@ -4,15 +4,6 @@
##
# Ports Apache is listening to in addition to the default ports:
-%
-# Apache Listen format is:
-# Listen [IP-address:]portnumber [protocol]
-@apache_listens.sort.each do |l|
- # Tweak ip and proto to match Apache format
- ip = l.fetch('ip', '')
- ip += ':' if ip != ''
- proto = l.fetch('protocol', '')
- proto = ' ' + proto if proto != ''
--%
- Listen %= ip -%%= l.fetch('port') -%%= proto -%
-% end -%
+
+Listen 127.0.0.1:%= @port % http
+Listen [::1]:%= @port % http
--
To view, visit https://gerrit.wikimedia.org/r/86836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ae6bb2047da1e4fa07bf234bf5e499f91b30da7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] @language tag is now only used in ULS repository - change (qa/browsertests)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86837
Change subject: @language tag is now only used in ULS repository
..
@language tag is now only used in ULS repository
Change-Id: Ia6cb175f3c88d4e24c60dcabeda688ad55e3d4cc
---
M features/support/env.rb
1 file changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests
refs/changes/37/86837/1
diff --git a/features/support/env.rb b/features/support/env.rb
index 57040ef..92061ac 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -96,16 +96,11 @@
puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
end
-Before('@language') do |scenario|
- @language = true
- @scenario = scenario
-end
-
Before do |scenario|
@config = config
@random_string = Random.new.rand.to_s
@mediawiki_username = mediawiki_username
- @browser = browser(environment, test_name(scenario), 'default') unless
@language
+ @browser = browser(environment, test_name(scenario), 'default')
$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
end
--
To view, visit https://gerrit.wikimedia.org/r/86837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6cb175f3c88d4e24c60dcabeda688ad55e3d4cc
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change the order of params displayed in api.php - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86835
Change subject: Change the order of params displayed in api.php
..
Change the order of params displayed in api.php
This means that the bot token and baserevid etc
will be displayed at the bottom of the list of
params
this then allows the params that actually differ
from module to module to appear at the top
Change-Id: I2590be822af07f01826fd4c67481cb005f80c526
---
M repo/includes/api/CreateClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetQualifier.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetStatementRank.php
8 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/35/86835/1
diff --git a/repo/includes/api/CreateClaim.php
b/repo/includes/api/CreateClaim.php
index 482bfcf..ee9ecfa 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -109,7 +109,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'entity' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -127,7 +126,8 @@
ApiBase::PARAM_TYPE = 'string',
ApiBase::PARAM_REQUIRED = false,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 8886cfe..28d6973 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -174,14 +174,14 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'claim' = array(
ApiBase::PARAM_TYPE = 'string',
ApiBase::PARAM_ISMULTI = true,
ApiBase::PARAM_REQUIRED = true,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/RemoveQualifiers.php
b/repo/includes/api/RemoveQualifiers.php
index 758a532..7c5604b 100644
--- a/repo/includes/api/RemoveQualifiers.php
+++ b/repo/includes/api/RemoveQualifiers.php
@@ -136,7 +136,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'claim' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -147,7 +146,8 @@
ApiBase::PARAM_REQUIRED = true,
ApiBase::PARAM_ISMULTI = true,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/RemoveReferences.php
b/repo/includes/api/RemoveReferences.php
index 24daf2a..3410f66 100644
--- a/repo/includes/api/RemoveReferences.php
+++ b/repo/includes/api/RemoveReferences.php
@@ -140,7 +140,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'statement' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -151,7 +150,8 @@
ApiBase::PARAM_REQUIRED = true,
ApiBase::PARAM_ISMULTI = true,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index 748a9a6..3cf64be 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -85,7 +85,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'claim' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -99,7 +98,8 @@
ApiBase::PARAM_TYPE =
[MediaWiki-commits] [Gerrit] contint: simplify apache listen template - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: contint: simplify apache listen template
..
contint: simplify apache listen template
I am not sure what I had in mind previously, but using a bunch of
non working ruby was not really smart.
The localvhost template now accepts 'port' and would simply make Apache
listen locally for HTTP.
Change-Id: I7ae6bb2047da1e4fa07bf234bf5e499f91b30da7
---
M modules/contint/manifests/localvhost.pp
M modules/contint/templates/apache/listen.erb
2 files changed, 3 insertions(+), 16 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
index cb08cb8..9078c92 100644
--- a/modules/contint/manifests/localvhost.pp
+++ b/modules/contint/manifests/localvhost.pp
@@ -27,10 +27,6 @@
content = template('contint/apache/localvhost.erb'),
}
-$apache_listens = [
-{ 'ip' = '127.0.0.1', 'port' = $port, 'proto' = 'http', },
-{ 'ip' = '[::1]', 'port' = $port, 'proto' = 'http', },
-]
file { /etc/apache2/conf.d/listen-localhost-${port}:
content = template('contint/apache/listen.erb'),
}
diff --git a/modules/contint/templates/apache/listen.erb
b/modules/contint/templates/apache/listen.erb
index af917a9..5317ea1 100644
--- a/modules/contint/templates/apache/listen.erb
+++ b/modules/contint/templates/apache/listen.erb
@@ -4,15 +4,6 @@
##
# Ports Apache is listening to in addition to the default ports:
-%
-# Apache Listen format is:
-# Listen [IP-address:]portnumber [protocol]
-@apache_listens.sort.each do |l|
- # Tweak ip and proto to match Apache format
- ip = l.fetch('ip', '')
- ip += ':' if ip != ''
- proto = l.fetch('protocol', '')
- proto = ' ' + proto if proto != ''
--%
- Listen %= ip -%%= l.fetch('port') -%%= proto -%
-% end -%
+
+Listen 127.0.0.1:%= @port % http
+Listen [::1]:%= @port % http
--
To view, visit https://gerrit.wikimedia.org/r/86836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ae6bb2047da1e4fa07bf234bf5e499f91b30da7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated ULS repository to the latest version of shared test ... - change (mediawiki...UniversalLanguageSelector)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86838
Change subject: Updated ULS repository to the latest version of shared test
files
..
Updated ULS repository to the latest version of shared test files
Bug: 53579
Change-Id: I9828866f3a3db24a95324bb82942f2c59382f2c9
---
D tests/browser/.gitignore
M tests/browser/features/step_definitions/accept_language_steps.rb
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/support/env.rb
4 files changed, 19 insertions(+), 38 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/38/86838/1
diff --git a/tests/browser/.gitignore b/tests/browser/.gitignore
deleted file mode 100644
index 9fc7a0c..000
--- a/tests/browser/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config/secret.yml
diff --git a/tests/browser/features/step_definitions/accept_language_steps.rb
b/tests/browser/features/step_definitions/accept_language_steps.rb
index b13422f..41a6183 100644
--- a/tests/browser/features/step_definitions/accept_language_steps.rb
+++ b/tests/browser/features/step_definitions/accept_language_steps.rb
@@ -1,5 +1,5 @@
Given(/^that my browser's accept language is (.+)$/) do |language|
- @browser = browser(environment, test_name(@scenario), @saucelabs_username,
@saucelabs_key, language)
+ @browser = browser(environment, test_name(@scenario),
ENV['SAUCE_ONDEMAND_USERNAME'], ENV['SAUCE_ONDEMAND_ACCESS_KEY'], language)
$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
end
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index f5a092d..a879835 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -6,7 +6,7 @@
end
Given(/^I am logged in$/) do
- visit(LoginPage).login_with(@mediawiki_username, @mediawiki_password)
+ visit(LoginPage).login_with(@mediawiki_username,
ENV['MEDIAWIKI_PASSWORD'])
# Assert that login worked
loggedin = !@browser.execute_script( return mw.user.isAnon(); )
loggedin.should be_true
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index 75f62b5..ca56ddb 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -7,16 +7,16 @@
World(PageObject::PageFactory)
-def browser(environment, test_name, saucelabs_username, saucelabs_key,
language)
- if environment == :cloudbees
-sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
+def browser(environment, test_name, language)
+ if environment == :saucelabs
+sauce_browser(test_name, language)
else
local_browser(language)
end
end
def environment
- if ENV['ENVIRONMENT'] == 'cloudbees'
-:cloudbees
+ if ENV['BROWSER_LABEL'] and ENV['SAUCE_ONDEMAND_USERNAME'] and
ENV['SAUCE_ONDEMAND_ACCESS_KEY']
+:saucelabs
else
:local
end
@@ -42,10 +42,10 @@
Watir::Browser.new browser_label, :profile = profile
end
end
-def sauce_api(json, saucelabs_username, saucelabs_key)
- %x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{saucelabs_username}:#{saucelabs_key}@saucelabs.com/rest/v1/#{saucelabs_username}/jobs/#{$session_id}}
+def sauce_api(json)
+ %x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}}
end
-def sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
+def sauce_browser(test_name, language)
config = YAML.load_file('config/config.yml')
browser_label = config[ENV['BROWSER_LABEL']]
@@ -69,7 +69,7 @@
browser = Watir::Browser.new(
:remote,
http_client: Selenium::WebDriver::Remote::Http::Persistent.new,
-url:
http://#{saucelabs_username}:#{saucelabs_key}@ondemand.saucelabs.com:80/wd/hub;,
+url:
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@ondemand.saucelabs.com:80/wd/hub,
desired_capabilities: caps)
browser.wd.file_detector = lambda do |args|
@@ -80,13 +80,7 @@
browser
end
-def secret_yml_location
- secret_yml_locations = ['/private/wmf/', 'config/']
- secret_yml_locations.each do |secret_yml_location|
-return secret_yml_location if
File.exists?(#{secret_yml_location}secret.yml)
- end
- nil
-end
+
def test_name(scenario)
if scenario.respond_to? :feature
#{scenario.feature.name}: #{scenario.name}
@@ -98,41 +92,29 @@
config = YAML.load_file('config/config.yml')
mediawiki_username = config['mediawiki_username']
-unless secret_yml_location == nil
- secret = YAML.load_file(#{secret_yml_location}secret.yml)
- mediawiki_password = secret['mediawiki_password']
-end
-
[MediaWiki-commits] [Gerrit] add :0 as port when sending outgoing SNMP requests - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: add :0 as port when sending outgoing SNMP requests
..
add :0 as port when sending outgoing SNMP requests
so that non-root users can bind to it and we avoid getting
SNMP permission denied errors when icinga
runs these.
we send the client IP since I9c7b1c11aeef2ff984ab25c7c81514be3c5897db
this fixes lots of Icinga monitors with status UNKNOWN
https://icinga.wikimedia.org/cgi-bin/icinga/status.cgi?host=alltype=detailservicestatustypes=8hoststatustypes=3serviceprops=2097162nostatusheader
if snmp.conf just has the IP: clientaddr 208.80.154.14
root@neon:~# sudo -u nagios /usr/lib/nagios/plugins/check_snmp -H 10.65.0.42 -C
...
External command error: snmpget: Unknown host (10.65.0.42:161) (Permission
denied)
if snmp.conf also has port :0
root@neon:~# sudo -u nagios /usr/lib/nagios/plugins/check_snmp -H 10.65.0.42 -C
...
SNMP OK - ps1-b3-eqiad-infeed-load-tower-A-phase-X 750 |
ps1-b3-eqiad-infeed-load-tower-A-phase-X=750
Change-Id: I2e8b31459e78e5fd743cc817faeab82971aa1e26
---
M modules/base/templates/snmp.conf.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
ArielGlenn: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/base/templates/snmp.conf.erb
b/modules/base/templates/snmp.conf.erb
index a91102c..0d6d6e1 100644
--- a/modules/base/templates/snmp.conf.erb
+++ b/modules/base/templates/snmp.conf.erb
@@ -4,9 +4,9 @@
##
mibs :
% if has_variable?('::ipaddress_bond0') then %
-clientaddr %= scope.lookupvar('::ipaddress_bond0') %
+clientaddr %= scope.lookupvar('::ipaddress_bond0') %:0
% elsif has_variable?('::ipaddress_eth0') then %
-clientaddr %= scope.lookupvar('::ipaddress_eth0') %
+clientaddr %= scope.lookupvar('::ipaddress_eth0') %:0
% else %
-clientaddr %= scope.lookupvar('::ipaddress') %
+clientaddr %= scope.lookupvar('::ipaddress') %:0
% end %
--
To view, visit https://gerrit.wikimedia.org/r/86834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e8b31459e78e5fd743cc817faeab82971aa1e26
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 54529) Fix message doc for wblinktitles-* - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86839
Change subject: (bug 54529) Fix message doc for wblinktitles-*
..
(bug 54529) Fix message doc for wblinktitles-*
Change-Id: Idb8292772ed069c92afaf9a8f36599542bd7c5c1
---
M repo/Wikibase.i18n.php
1 file changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/39/86839/1
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 850fec0..8bfff26 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -1072,17 +1072,15 @@
This module generates a slightly different summary (autocomment) than the
other ones.
Parameters:
-* $1 - the number of pages that were connected
-* $2 - the site code for the from-page
-* $3 - the site code for the to-page',
+* $1 - the site code for the from-page
+* $2 - the site code for the to-page',
'wikibase-item-summary-wblinktitles-connect' = '{{wikibase summary
messages|item|Automatic edit summary when connecting page(s).}}
This module generates a slightly different summary (autocomment) than the
other ones.
Parameters:
-* $1 - (Unused) the number of pages that were connected
-* $2 - the site code for the from-page
-* $3 - the site code for the to-page',
+* $1 - the site code for the from-page
+* $2 - the site code for the to-page',
'wikibase-item-summary-wbcreateclaim-value' = '{{wikibase summary
messages|item-claims|Automatic edit summary when a claim is created and a value
is used. The values can be of various types, including but not limited to
defined properties. This is a LEGACY value, needed for old log entries!}}',
'wikibase-item-summary-wbcreateclaim-novalue' = {{wikibase summary
messages|item-claims|Automatic edit summary when ''no value'' is supplied to
the claim. A ''no value'' means that there are no valid value to be set for
this claim, or that there are no existing value. This is a LEGACY value, needed
for old log entries!}},
'wikibase-item-summary-wbcreateclaim-somevalue' = '{{wikibase summary
messages|item-claims|Automatic edit summary when there should be a value but it
is unknown. This is different from the case where there are no valid or
existing value. This is a LEGACY value, needed for old log entries!}}',
--
To view, visit https://gerrit.wikimedia.org/r/86839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb8292772ed069c92afaf9a8f36599542bd7c5c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Bugzilla comment field border to match Vector skin - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: Update Bugzilla comment field border to match Vector skin
..
Update Bugzilla comment field border to match Vector skin
Change-Id: I43d9b3ff9753341899564d2a2435b20574aa5cf6
---
M skins/contrib/Wikimedia/vector.css
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Aklapper: Looks good to me, but someone else must approve
Dzahn: Verified; Looks good to me, approved
diff --git a/skins/contrib/Wikimedia/vector.css
b/skins/contrib/Wikimedia/vector.css
index 134355e..ae3b26f 100644
--- a/skins/contrib/Wikimedia/vector.css
+++ b/skins/contrib/Wikimedia/vector.css
@@ -403,17 +403,17 @@
}
pre {
padding: 1em;
- border: 1px dashed #2f6fab;
+ border: 1px solid #ddd;
color: black;
background-color: #f9f9f9;
line-height: 1.1em;
word-wrap: break-word;
}
tbody.file pre {
- padding: 0;
- border: 0;
- background: transparent;
- }
+ padding: 0;
+ border: 0;
+ background: transparent;
+}
ul {
line-height: 1.5em;
list-style-type: square;
--
To view, visit https://gerrit.wikimedia.org/r/86799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43d9b3ff9753341899564d2a2435b20574aa5cf6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: TTO at.li...@live.com.au
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change the order of params displayed in api.php - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Change the order of params displayed in api.php
..
Change the order of params displayed in api.php
This means that the bot token and baserevid etc
will be displayed at the bottom of the list of
params
this then allows the params that actually differ
from module to module to appear at the top
Change-Id: I2590be822af07f01826fd4c67481cb005f80c526
---
M repo/includes/api/CreateClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetQualifier.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetStatementRank.php
8 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/CreateClaim.php
b/repo/includes/api/CreateClaim.php
index 482bfcf..ee9ecfa 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -109,7 +109,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'entity' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -127,7 +126,8 @@
ApiBase::PARAM_TYPE = 'string',
ApiBase::PARAM_REQUIRED = false,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 8886cfe..28d6973 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -174,14 +174,14 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'claim' = array(
ApiBase::PARAM_TYPE = 'string',
ApiBase::PARAM_ISMULTI = true,
ApiBase::PARAM_REQUIRED = true,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/RemoveQualifiers.php
b/repo/includes/api/RemoveQualifiers.php
index 758a532..7c5604b 100644
--- a/repo/includes/api/RemoveQualifiers.php
+++ b/repo/includes/api/RemoveQualifiers.php
@@ -136,7 +136,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'claim' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -147,7 +146,8 @@
ApiBase::PARAM_REQUIRED = true,
ApiBase::PARAM_ISMULTI = true,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/RemoveReferences.php
b/repo/includes/api/RemoveReferences.php
index 24daf2a..3410f66 100644
--- a/repo/includes/api/RemoveReferences.php
+++ b/repo/includes/api/RemoveReferences.php
@@ -140,7 +140,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'statement' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -151,7 +150,8 @@
ApiBase::PARAM_REQUIRED = true,
ApiBase::PARAM_ISMULTI = true,
),
- )
+ ),
+ parent::getAllowedParams()
);
}
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index 748a9a6..3cf64be 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -85,7 +85,6 @@
*/
public function getAllowedParams() {
return array_merge(
- parent::getAllowedParams(),
array(
'claim' = array(
ApiBase::PARAM_TYPE = 'string',
@@ -99,7 +98,8 @@
ApiBase::PARAM_TYPE = array( 'value',
'novalue', 'somevalue' ),
[MediaWiki-commits] [Gerrit] There is new repository with browser tests, TwnMainPage - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/86841 Change subject: There is new repository with browser tests, TwnMainPage .. There is new repository with browser tests, TwnMainPage Documented how to create Jenkins job to run tests at dev.translatewiki.net. Change-Id: I00418f00c612b9e220c4f1b6303190209b729c32 --- M docs/jobs.md M docs/template.md 2 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/41/86841/1 diff --git a/docs/jobs.md b/docs/jobs.md index f1392dd..b055d4c 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -133,11 +133,26 @@ - MediaWiki URL: en.m.wikipedia.org +# TwnMainPage + + +## TwnMainPage-dev.translatewiki.net-linux-firefox +- Browser Label: firefox +- bundle exec: cucumber --verbose --profile ci --tags @dev.translatewiki.net +- Recipients: zfili...@wikimedia.org cmcma...@wikimedia.org +- Repository URL: TwnMainPage@gerrit +- Branch: master +- MediaWiki URL: dev.translatewiki.net +- Folder: tests/browser/ + + + # UniversalLanguageSelector - Recipients: zfili...@wikimedia.org cmcma...@wikimedia.org - Repository URL: UniversalLanguageSelector@gerrit - Folder: tests/browser/ + ## UniversalLanguageSelector-commons.wikimedia.beta.wmflabs.org-linux-chrome - Browser Label: chrome - bundle exec: cucumber --verbose --profile ci --tags @commons.wikimedia.beta.wmflabs.org diff --git a/docs/template.md b/docs/template.md index 21139ca..48e0134 100644 --- a/docs/template.md +++ b/docs/template.md @@ -66,6 +66,9 @@ - Display Name: MobileFrontend@gerrit - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/MobileFrontend + - Display Name: TwnMainPage@gerrit + - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/TwnMainPage + - Display Name: UniversalLanguageSelector@gerrit - Value: https://gerrit.wikimedia.org/r/mediawiki/extensions/UniversalLanguageSelector @@ -98,6 +101,7 @@ - name: - commons.wikimedia.beta.wmflabs.org +- dev.translatewiki.net - en.m.wikipedia.beta.wmflabs.org - en.m.wikipedia.org - en.wikipedia.beta.wmflabs.org -- To view, visit https://gerrit.wikimedia.org/r/86841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00418f00c612b9e220c4f1b6303190209b729c32 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run tests at dev.translatewiki.net - change (mediawiki...TwnMainPage)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/86842 Change subject: Run tests at dev.translatewiki.net .. Run tests at dev.translatewiki.net As soon as this commit is merged into master, TwnMainPage-dev.translatewiki.net-linux-firefox[1] Jenkins job should not fail with No test report files were found[2] error message. 1: https://wmf.ci.cloudbees.com/job/TwnMainPage-dev.translatewiki.net-linux -firefox/ 2: https://wmf.ci.cloudbees.com/job/TwnMainPage-dev.translatewiki.net-linux -firefox/1/console Change-Id: Ie419eb2a5ab70561a5da477f1b31f3446b39e552 --- M tests/browser/features/signed_in_and_approved_users.feature M tests/browser/features/signed_in_source_language.feature M tests/browser/features/user_interested_in_project_only.feature M tests/browser/features/user_not_signed_in.feature M tests/browser/features/user_signed_in_not_approved.feature 5 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage refs/changes/42/86842/1 diff --git a/tests/browser/features/signed_in_and_approved_users.feature b/tests/browser/features/signed_in_and_approved_users.feature index 58d2d9b..396466f 100644 --- a/tests/browser/features/signed_in_and_approved_users.feature +++ b/tests/browser/features/signed_in_and_approved_users.feature @@ -1,4 +1,4 @@ -@login +@dev.translatewiki.net @login Feature: View for approved users Sign-in and first display - one scenario to verify if the user sees the diff --git a/tests/browser/features/signed_in_source_language.feature b/tests/browser/features/signed_in_source_language.feature index 3126a4b..ddaf03e 100644 --- a/tests/browser/features/signed_in_source_language.feature +++ b/tests/browser/features/signed_in_source_language.feature @@ -1,4 +1,4 @@ -@login +@dev.translatewiki.net @login Feature: Main page in the source language Source language in this case means that the source language of all message diff --git a/tests/browser/features/user_interested_in_project_only.feature b/tests/browser/features/user_interested_in_project_only.feature index fd93a5d..2d08855 100644 --- a/tests/browser/features/user_interested_in_project_only.feature +++ b/tests/browser/features/user_interested_in_project_only.feature @@ -1,3 +1,4 @@ +@dev.translatewiki.net Feature: Users interested in Project only This is WIP functionality. diff --git a/tests/browser/features/user_not_signed_in.feature b/tests/browser/features/user_not_signed_in.feature index e8c90f2..b6f7b94 100644 --- a/tests/browser/features/user_not_signed_in.feature +++ b/tests/browser/features/user_not_signed_in.feature @@ -1,3 +1,4 @@ +@dev.translatewiki.net Feature: Users who are not signed-in (and for other scenarios common to all users) Background: diff --git a/tests/browser/features/user_signed_in_not_approved.feature b/tests/browser/features/user_signed_in_not_approved.feature index 1e02809..e18d150 100644 --- a/tests/browser/features/user_signed_in_not_approved.feature +++ b/tests/browser/features/user_signed_in_not_approved.feature @@ -1,4 +1,4 @@ -@login +@dev.translatewiki.net @login Feature: Signed-in New Users who have not been approved (only onboarding view will be available for them) -- To view, visit https://gerrit.wikimedia.org/r/86842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie419eb2a5ab70561a5da477f1b31f3446b39e552 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove git-setup - change (integration/jenkins)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/86843 Change subject: remove git-setup .. remove git-setup The shell script is meant to set post commit hooks in your local repository. Instead one should use git-review or some similar helper. Change-Id: I3b95531b68d7198f995c5ee08d09ecf7118a03dd --- D git-setup 1 file changed, 0 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/43/86843/1 diff --git a/git-setup b/git-setup deleted file mode 100755 index a8dab71..000 --- a/git-setup +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# Basic setup for the jenkins git repository - -# Need this info -echo Type your Labs console wiki username (ie: Test User): -read name -echo Type your shell username (ie: testuser): -read username -echo Type the e-mail address for this username: -read email - -# Global config -git config --global user.email $email -git config --global user.name $name - -# Setup remotes/aliases -git remote add jenkins ssh://$usern...@gerrit.wikimedia.org:29418/integration/jenkins -git config alias.push-review push jenkins HEAD:refs/for/master - -TOPLEVEL=`git rev-parse --show-toplevel` -which curl -if [ $? == 0 ] -then - curl https://gerrit.wikimedia.org/r/tools/hooks/commit-msg; $TOPLEVEL/.git/hooks/commit-msg chmod u+x $TOPLEVEL/.git/hooks/commit-msg -else - which wget - if [ $? == 0 ] - then - wget https://gerrit.wikimedia.org/r/tools/hooks/commit-msg; -O $TOPLEVEL/.git/hooks/commit-msg chmod u+x $TOPLEVEL/.git/hooks/commit-msg - else - scp -p 29418 gerrit.wikimedia.org:hooks/commit-msg $TOPLEVEL/.git/hooks/commit-msg - if [ $? != 0 ] - then - echo Please download the commit message hook from https://gerrit.wikimedia.org/r/tools/hooks/commit-msg, place it in .git/hooks/commit-msg, and chmod u+x the file. - fi - fi -fi -- To view, visit https://gerrit.wikimedia.org/r/86843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b95531b68d7198f995c5ee08d09ecf7118a03dd Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix other tests interfering EntityViewTest - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86844
Change subject: Fix other tests interfering EntityViewTest
..
Fix other tests interfering EntityViewTest
This is a nasty quick fix to work around sporadic test failures.
The real solution is to isolate EntityView from, global state,
see I760ef1eb6 and I430dc1f2b.
Change-Id: Id264fa056805ff32bb8aa7aa3fc54974a0809e92
---
M repo/tests/phpunit/includes/EntityViewTest.php
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/86844/1
diff --git a/repo/tests/phpunit/includes/EntityViewTest.php
b/repo/tests/phpunit/includes/EntityViewTest.php
index 1029f09..a2aac8b 100644
--- a/repo/tests/phpunit/includes/EntityViewTest.php
+++ b/repo/tests/phpunit/includes/EntityViewTest.php
@@ -312,17 +312,17 @@
$entity = Item::newEmpty();
$entity-setLabel( 'de', 'foo' );
- $entity-setId( 49 );
+ $entity-setId( 27449 );
$content = $entityContentFactory-newFromEntity( $entity );
- $q98 = new ItemId( 'Q98' );
+ $q98 = new ItemId( 'Q27498' );
$entityQ98 = Item::newEmpty();
$entityQ98-setLabel( 'de', 'bar' );
$entityQ98-setId( $q98 );
$itemHandler = new ItemHandler();
- $itemTitle = Title::makeTitle(
$itemHandler-getEntityNamespace(), 'Q98' );
+ $itemTitle = Title::makeTitle(
$itemHandler-getEntityNamespace(), 'Q27498' );
$titleText = $itemTitle-getPrefixedText();
$entityLoader = new MockRepository();
@@ -339,9 +339,9 @@
$argLists[] = array( $content, $entityLoader, null,
$languageFallbackChain, 'fr', true, array(
'wbEntityType' = 'item',
'wbDataLangName' = 'français',
- 'wbEntityId' = 'Q49',
- 'wbEntity' =
'{id:Q49,type:item,labels:{de:{language:de,value:foo},fr:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:98},type:wikibase-entityid}},type:claim}]}}',
- 'wbUsedEntities' =
'{Q98:{content:{id:Q98,type:item,labels:{fr:{language:de,value:bar}}},title:'
. $titleText . ',revision:}}',
+ 'wbEntityId' = 'Q27449',
+ 'wbEntity' =
'{id:Q27449,type:item,labels:{de:{language:de,value:foo},fr:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:27498},type:wikibase-entityid}},type:claim}]}}',
+ 'wbUsedEntities' =
'{Q27498:{content:{id:Q27498,type:item,labels:{fr:{language:de,value:bar}}},title:'
. $titleText . ',revision:}}',
) );
$languageFallbackChain =
$languageFallbackChainFactory-newFromLanguageCode(
@@ -351,9 +351,9 @@
$argLists[] = array( $content, $entityLoader, null,
$languageFallbackChain, 'nl', true, array(
'wbEntityType' = 'item',
'wbDataLangName' = 'Nederlands',
- 'wbEntityId' = 'Q49',
- 'wbEntity' =
'{id:Q49,type:item,labels:{de:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:98},type:wikibase-entityid}},type:claim}]}}',
- 'wbUsedEntities' =
'{Q98:{content:{id:Q98,type:item},title:' . $titleText .
',revision:}}',
+ 'wbEntityId' = 'Q27449',
+ 'wbEntity' =
'{id:Q27449,type:item,labels:{de:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:27498},type:wikibase-entityid}},type:claim}]}}',
+ 'wbUsedEntities' =
'{Q27498:{content:{id:Q27498,type:item},title:' . $titleText .
',revision:}}',
) );
// TODO: add more tests for other JS vars
--
To view, visit https://gerrit.wikimedia.org/r/86844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id264fa056805ff32bb8aa7aa3fc54974a0809e92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated the repository to the latest version of shared test ... - change (mediawiki...TwnMainPage)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86845
Change subject: Updated the repository to the latest version of shared test
files
..
Updated the repository to the latest version of shared test files
Bug: 53579
Change-Id: I6767477414ff3c659bb6bec3b89b0fd566225c8d
---
D tests/browser/.gitignore
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/tags.txt
4 files changed, 19 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage
refs/changes/45/86845/1
diff --git a/tests/browser/.gitignore b/tests/browser/.gitignore
deleted file mode 100644
index 9fc7a0c..000
--- a/tests/browser/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config/secret.yml
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index fa8ed56..6632e3a 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -2,7 +2,7 @@
end
Given(/^I am logged in$/) do
- visit(LoginPage).login_with(@mediawiki_username, @mediawiki_password)
+ visit(LoginPage).login_with(@mediawiki_username,
ENV['MEDIAWIKI_PASSWORD'])
# Assert that login worked
loggedin = !@browser.execute_script( return mw.user.isAnon(); )
loggedin.should be_true
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index 75f62b5..d56c8c4 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -7,16 +7,16 @@
World(PageObject::PageFactory)
-def browser(environment, test_name, saucelabs_username, saucelabs_key,
language)
- if environment == :cloudbees
-sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
+def browser(environment, test_name, language)
+ if environment == :saucelabs
+sauce_browser(test_name, language)
else
local_browser(language)
end
end
def environment
- if ENV['ENVIRONMENT'] == 'cloudbees'
-:cloudbees
+ if ENV['BROWSER_LABEL'] and ENV['SAUCE_ONDEMAND_USERNAME'] and
ENV['SAUCE_ONDEMAND_ACCESS_KEY']
+:saucelabs
else
:local
end
@@ -42,10 +42,10 @@
Watir::Browser.new browser_label, :profile = profile
end
end
-def sauce_api(json, saucelabs_username, saucelabs_key)
- %x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{saucelabs_username}:#{saucelabs_key}@saucelabs.com/rest/v1/#{saucelabs_username}/jobs/#{$session_id}}
+def sauce_api(json)
+ %x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}}
end
-def sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
+def sauce_browser(test_name, language)
config = YAML.load_file('config/config.yml')
browser_label = config[ENV['BROWSER_LABEL']]
@@ -69,7 +69,7 @@
browser = Watir::Browser.new(
:remote,
http_client: Selenium::WebDriver::Remote::Http::Persistent.new,
-url:
http://#{saucelabs_username}:#{saucelabs_key}@ondemand.saucelabs.com:80/wd/hub;,
+url:
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@ondemand.saucelabs.com:80/wd/hub,
desired_capabilities: caps)
browser.wd.file_detector = lambda do |args|
@@ -80,13 +80,7 @@
browser
end
-def secret_yml_location
- secret_yml_locations = ['/private/wmf/', 'config/']
- secret_yml_locations.each do |secret_yml_location|
-return secret_yml_location if
File.exists?(#{secret_yml_location}secret.yml)
- end
- nil
-end
+
def test_name(scenario)
if scenario.respond_to? :feature
#{scenario.feature.name}: #{scenario.name}
@@ -98,41 +92,27 @@
config = YAML.load_file('config/config.yml')
mediawiki_username = config['mediawiki_username']
-unless secret_yml_location == nil
- secret = YAML.load_file(#{secret_yml_location}secret.yml)
- mediawiki_password = secret['mediawiki_password']
-end
-
-if ENV['ENVIRONMENT'] == 'cloudbees'
- saucelabs_username = secret['saucelabs_username']
- saucelabs_key = secret['saucelabs_key']
+Before('@login') do
+ puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
end
Before('@language') do |scenario|
@language = true
- @saucelabs_username = saucelabs_username
- @saucelabs_key = saucelabs_key
@scenario = scenario
-end
-Before('@login') do
- puts secret.yml file at /private/wmf/ or config/ is required for tests
tagged @login if secret_yml_location == nil
end
Before do |scenario|
@config = config
- @does_not_exist_page_name = Random.new.rand.to_s
+ @random_string = Random.new.rand.to_s
[MediaWiki-commits] [Gerrit] Fix other tests interfering EntityViewTest - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Fix other tests interfering EntityViewTest
..
Fix other tests interfering EntityViewTest
This is a nasty quick fix to work around sporadic test failures.
The real solution is to isolate EntityView from, global state,
see I760ef1eb6 and I430dc1f2b.
Change-Id: Id264fa056805ff32bb8aa7aa3fc54974a0809e92
---
M repo/tests/phpunit/includes/EntityViewTest.php
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/EntityViewTest.php
b/repo/tests/phpunit/includes/EntityViewTest.php
index 1029f09..a2aac8b 100644
--- a/repo/tests/phpunit/includes/EntityViewTest.php
+++ b/repo/tests/phpunit/includes/EntityViewTest.php
@@ -312,17 +312,17 @@
$entity = Item::newEmpty();
$entity-setLabel( 'de', 'foo' );
- $entity-setId( 49 );
+ $entity-setId( 27449 );
$content = $entityContentFactory-newFromEntity( $entity );
- $q98 = new ItemId( 'Q98' );
+ $q98 = new ItemId( 'Q27498' );
$entityQ98 = Item::newEmpty();
$entityQ98-setLabel( 'de', 'bar' );
$entityQ98-setId( $q98 );
$itemHandler = new ItemHandler();
- $itemTitle = Title::makeTitle(
$itemHandler-getEntityNamespace(), 'Q98' );
+ $itemTitle = Title::makeTitle(
$itemHandler-getEntityNamespace(), 'Q27498' );
$titleText = $itemTitle-getPrefixedText();
$entityLoader = new MockRepository();
@@ -339,9 +339,9 @@
$argLists[] = array( $content, $entityLoader, null,
$languageFallbackChain, 'fr', true, array(
'wbEntityType' = 'item',
'wbDataLangName' = 'français',
- 'wbEntityId' = 'Q49',
- 'wbEntity' =
'{id:Q49,type:item,labels:{de:{language:de,value:foo},fr:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:98},type:wikibase-entityid}},type:claim}]}}',
- 'wbUsedEntities' =
'{Q98:{content:{id:Q98,type:item,labels:{fr:{language:de,value:bar}}},title:'
. $titleText . ',revision:}}',
+ 'wbEntityId' = 'Q27449',
+ 'wbEntity' =
'{id:Q27449,type:item,labels:{de:{language:de,value:foo},fr:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:27498},type:wikibase-entityid}},type:claim}]}}',
+ 'wbUsedEntities' =
'{Q27498:{content:{id:Q27498,type:item,labels:{fr:{language:de,value:bar}}},title:'
. $titleText . ',revision:}}',
) );
$languageFallbackChain =
$languageFallbackChainFactory-newFromLanguageCode(
@@ -351,9 +351,9 @@
$argLists[] = array( $content, $entityLoader, null,
$languageFallbackChain, 'nl', true, array(
'wbEntityType' = 'item',
'wbDataLangName' = 'Nederlands',
- 'wbEntityId' = 'Q49',
- 'wbEntity' =
'{id:Q49,type:item,labels:{de:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:98},type:wikibase-entityid}},type:claim}]}}',
- 'wbUsedEntities' =
'{Q98:{content:{id:Q98,type:item},title:' . $titleText .
',revision:}}',
+ 'wbEntityId' = 'Q27449',
+ 'wbEntity' =
'{id:Q27449,type:item,labels:{de:{language:de,value:foo}},claims:{P11:[{id:null,mainsnak:{snaktype:value,property:P11,datavalue:{value:{entity-type:item,numeric-id:27498},type:wikibase-entityid}},type:claim}]}}',
+ 'wbUsedEntities' =
'{Q27498:{content:{id:Q27498,type:item},title:' . $titleText .
',revision:}}',
) );
// TODO: add more tests for other JS vars
--
To view, visit https://gerrit.wikimedia.org/r/86844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id264fa056805ff32bb8aa7aa3fc54974a0809e92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove git-setup - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged. Change subject: remove git-setup .. remove git-setup The shell script is meant to set post commit hooks in your local repository. Instead one should use git-review or some similar helper. Change-Id: I3b95531b68d7198f995c5ee08d09ecf7118a03dd --- D git-setup 1 file changed, 0 insertions(+), 38 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/git-setup b/git-setup deleted file mode 100755 index a8dab71..000 --- a/git-setup +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# Basic setup for the jenkins git repository - -# Need this info -echo Type your Labs console wiki username (ie: Test User): -read name -echo Type your shell username (ie: testuser): -read username -echo Type the e-mail address for this username: -read email - -# Global config -git config --global user.email $email -git config --global user.name $name - -# Setup remotes/aliases -git remote add jenkins ssh://$usern...@gerrit.wikimedia.org:29418/integration/jenkins -git config alias.push-review push jenkins HEAD:refs/for/master - -TOPLEVEL=`git rev-parse --show-toplevel` -which curl -if [ $? == 0 ] -then - curl https://gerrit.wikimedia.org/r/tools/hooks/commit-msg; $TOPLEVEL/.git/hooks/commit-msg chmod u+x $TOPLEVEL/.git/hooks/commit-msg -else - which wget - if [ $? == 0 ] - then - wget https://gerrit.wikimedia.org/r/tools/hooks/commit-msg; -O $TOPLEVEL/.git/hooks/commit-msg chmod u+x $TOPLEVEL/.git/hooks/commit-msg - else - scp -p 29418 gerrit.wikimedia.org:hooks/commit-msg $TOPLEVEL/.git/hooks/commit-msg - if [ $? != 0 ] - then - echo Please download the commit message hook from https://gerrit.wikimedia.org/r/tools/hooks/commit-msg, place it in .git/hooks/commit-msg, and chmod u+x the file. - fi - fi -fi -- To view, visit https://gerrit.wikimedia.org/r/86843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b95531b68d7198f995c5ee08d09ecf7118a03dd Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish mobile: don't override MW's X-Analytics - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86846
Change subject: varnish mobile: don't override MW's X-Analytics
..
varnish mobile: don't override MW's X-Analytics
Commit I6ac2dd altered the config to override previously set cached
X-Analytics. This unfortunately included X-Analytics as set by
MediaWiki, which was flagged by the commit message but considered to be
okay at the time.
Turns out it wasn't, so let's be a bit more smart about it and only
unset the previously set X-Analytics only when the request isn't varied
by X-CS. This should have the same effect but without its downsides.
Bug: 54779
Change-Id: Iaf6a7255a5dffd32e43233b19fbeffd60de50cc4
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/86846/1
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index a9dc07f..a0eb786 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -131,18 +131,22 @@
}
sub vcl_deliver {
- # remove X-CS X-Analytics from resp if they happen to have it. We
- # used to incorrectly set them in vcl_fetch(), which means that our
+ unset resp.http.X-CS;
+
+ # We used to incorrectly set them in vcl_fetch(), which means that our
# cache is now poisoned with non-varied cached objects that have this
# incorrectly set with random carriers. Clean up after ourselves.
- unset resp.http.X-CS;
- if (req.http.X-Analytics) {
- # FIXME: replace with std.log()
- set resp.http.X-Analytics = req.http.X-Analytics;
- } else {
+ if (resp.http.Vary !~ X-CS resp.http.X-Analytics ~ zero=) {
+ # no Vary: X-CS and zero in X-Analytics is an invalid
combination
unset resp.http.X-Analytics;
}
+ if (resp.http.X-Analytics) {
+ # do nothing, MediaWiki has handled X-Analytics
+ } else if (req.http.X-Analytics) {
+ set resp.http.X-Analytics = req.http.X-Analytics;
+ }
+
if (resp.http.Cache-Control ~ s-maxage=[1-9]) {
set resp.http.Cache-Control = s-maxage=300, must-revalidate,
max-age=0;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/86846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf6a7255a5dffd32e43233b19fbeffd60de50cc4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Nrpe: /usr/lib/nagios/plugins/check_dpkg should be absent ev... - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86847
Change subject: Nrpe: /usr/lib/nagios/plugins/check_dpkg should be absent
everywhere.
..
Nrpe: /usr/lib/nagios/plugins/check_dpkg should be absent everywhere.
Removed puppet absent command for the file.
Change-Id: I79c584ccd7e0ee12e0aa6feec2a1db0645fbb9f3
---
M modules/nrpe/manifests/init.pp
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/86847/1
diff --git a/modules/nrpe/manifests/init.pp b/modules/nrpe/manifests/init.pp
index 4f497b8..8138bc3 100644
--- a/modules/nrpe/manifests/init.pp
+++ b/modules/nrpe/manifests/init.pp
@@ -46,11 +46,6 @@
notify = Service['nagios-nrpe-server'],
}
-# TODO: Remove this after the file has been purged everywhere
-file { '/usr/lib/nagios/plugins/check_dpkg':
-ensure = absent,
-}
-
file { '/usr/local/lib/nagios/':
ensure = directory,
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/86847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79c584ccd7e0ee12e0aa6feec2a1db0645fbb9f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unbreak javascript for forms not including category/categories - change (mediawiki...SemanticForms)
jenkins-bot has submitted this change and it was merged.
Change subject: Unbreak javascript for forms not including category/categories
..
Unbreak javascript for forms not including category/categories
Change-Id: Ice9e44847e6730ba0ae747e555c8ef30d13046dd
---
M libs/ext.dynatree.js
1 file changed, 12 insertions(+), 11 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/libs/ext.dynatree.js b/libs/ext.dynatree.js
index 228cbbc..8ffc821 100644
--- a/libs/ext.dynatree.js
+++ b/libs/ext.dynatree.js
@@ -38,15 +38,16 @@
dtnode.isSelected()).addClass(hidden);
}
});
-});
-//Update real checkboxes according to selections
- $.map(nodeSelection.dynatree(getTree).getSelectedNodes(),
- function (dtnode) {
- $(#chb- + dtnode.data.key).attr(checked, true);
- dtnode.activate();
- });
- var activeNode = nodeSelection.dynatree(getTree).getActiveNode();
- if (activeNode !== null) {
- activeNode.deactivate()
- }
+ //Update real checkboxes according to selections
+ $.map(node.dynatree(getTree).getSelectedNodes(),
+ function (dtnode) {
+ $(#chb- + dtnode.data.key).attr(checked,
true);
+ dtnode.activate();
+ });
+ var activeNode = node.dynatree(getTree).getActiveNode();
+ if (activeNode !== null) {
+ activeNode.deactivate()
+ }
+ });
});
+
--
To view, visit https://gerrit.wikimedia.org/r/86817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice9e44847e6730ba0ae747e555c8ef30d13046dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: MathiasLidal mathiasli...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish mobile: don't override MW's X-Analytics - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: varnish mobile: don't override MW's X-Analytics
..
varnish mobile: don't override MW's X-Analytics
Commit I6ac2dd altered the config to override previously set cached
X-Analytics. This unfortunately included X-Analytics as set by
MediaWiki, which was flagged by the commit message but considered to be
okay at the time.
Turns out it wasn't, so let's be a bit more smart about it and only
unset the previously set X-Analytics only when the request isn't varied
by X-CS. This should have the same effect but without its downsides.
Bug: 54779
Change-Id: Iaf6a7255a5dffd32e43233b19fbeffd60de50cc4
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 12 insertions(+), 7 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index a9dc07f..19b4e7e 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -131,18 +131,23 @@
}
sub vcl_deliver {
- # remove X-CS X-Analytics from resp if they happen to have it. We
- # used to incorrectly set them in vcl_fetch(), which means that our
+ unset resp.http.X-CS;
+
+ # We used to incorrectly set them in vcl_fetch(), which means that our
# cache is now poisoned with non-varied cached objects that have this
# incorrectly set with random carriers. Clean up after ourselves.
- unset resp.http.X-CS;
- if (req.http.X-Analytics) {
- # FIXME: replace with std.log()
- set resp.http.X-Analytics = req.http.X-Analytics;
- } else {
+ # FIXME: remove after cache expires, Sep 26 2013 + 30 days
+ if (resp.http.Vary !~ X-CS resp.http.X-Analytics ~ zero=) {
+ # no Vary: X-CS and zero in X-Analytics is an invalid
combination
unset resp.http.X-Analytics;
}
+ if (resp.http.X-Analytics) {
+ # do nothing, MediaWiki has handled X-Analytics
+ } else if (req.http.X-Analytics) {
+ set resp.http.X-Analytics = req.http.X-Analytics;
+ }
+
if (resp.http.Cache-Control ~ s-maxage=[1-9]) {
set resp.http.Cache-Control = s-maxage=300, must-revalidate,
max-age=0;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/86846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf6a7255a5dffd32e43233b19fbeffd60de50cc4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lint jobs for wikimedia/fundraising repos - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: lint jobs for wikimedia/fundraising repos
..
lint jobs for wikimedia/fundraising repos
Change-Id: Iac4d126db6f65db7b9548f5bdcf0fff48539d492
---
M wm-fundraising.yaml
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wm-fundraising.yaml b/wm-fundraising.yaml
index 2ddbb06..a01fec5 100644
--- a/wm-fundraising.yaml
+++ b/wm-fundraising.yaml
@@ -5,3 +5,24 @@
- '{name}-jslint'
- '{name}-yamllint'
- python-jobs
+
+- project:
+name: 'wikimedia-fundraising-crm'
+
+jobs:
+ - '{name}-jslint'
+ - '{name}-phplint'
+
+- project:
+name: 'wikimedia-fundraising-crm-civicrm'
+
+jobs:
+ - '{name}-jslint'
+ - '{name}-phplint'
+
+- project:
+name: 'wikimedia-fundraising-crm-drupal'
+
+jobs:
+ - '{name}-jslint'
+ - '{name}-phplint'
--
To view, visit https://gerrit.wikimedia.org/r/86703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac4d126db6f65db7b9548f5bdcf0fff48539d492
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobs for wikimedia/fundraising/crm* - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: jobs for wikimedia/fundraising/crm* .. jobs for wikimedia/fundraising/crm* Change-Id: I0d6882db30d4a240f63f63785b0db05ba8735b1f --- M layout.yaml 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index aa3bbd1..871d17c 100644 --- a/layout.yaml +++ b/layout.yaml @@ -967,6 +967,30 @@ - wikimedia-fundraising-tools-pyflakes - wikimedia-fundraising-tools-yamllint + - name: wikimedia/fundraising/crm +check-voter: + - wikimedia-fundraising-tools-jslint + - wikimedia-fundraising-tools-phplint +gate-and-submit: + - wikimedia-fundraising-tools-jslint + - wikimedia-fundraising-tools-phplint + + - name: wikimedia/fundraising/crm/civicrm +check-voter: + - wikimedia-fundraising-crm-civicrm-jslint + - wikimedia-fundraising-crm-civicrm-phplint +gate-and-submit: + - wikimedia-fundraising-crm-civicrm-jslint + - wikimedia-fundraising-crm-civicrm-phplint + + - name: wikimedia/fundraising/crm/drupal +check-voter: + - wikimedia-fundraising-crm-drupal-jslint + - wikimedia-fundraising-crm-drupal-phplint +gate-and-submit: + - wikimedia-fundraising-crm-drupal-jslint + - wikimedia-fundraising-crm-drupal-phplint + MediaWiki extensions ## - name: mediawiki/extensions/AbuseFilter -- To view, visit https://gerrit.wikimedia.org/r/86705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d6882db30d4a240f63f63785b0db05ba8735b1f Gerrit-PatchSet: 2 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Adamw awi...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use full path - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/86848 Change subject: Use full path .. Use full path Otherwise having folder in PATH is needed Change-Id: Ibc0941fc3067bb1e421d426f795d11a0becf1cca --- M bin/repoupdate 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/48/86848/1 diff --git a/bin/repoupdate b/bin/repoupdate index 37bbb5c..4346639 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -159,7 +159,7 @@ cd .. fi else - update-reset-repo $DIR/$PROJECT/extensions/$EXTENSION + /home/betawiki/config/bin/update-reset-repo $DIR/$PROJECT/extensions/$EXTENSION let count+=1; [[ $((count%10)) -eq 0 ]] wait fi done -- To view, visit https://gerrit.wikimedia.org/r/86848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc0941fc3067bb1e421d426f795d11a0becf1cca Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Nrpe: /usr/lib/nagios/plugins/check_dpkg should be absent ev... - change (operations/puppet)
Akosiaris has submitted this change and it was merged.
Change subject: Nrpe: /usr/lib/nagios/plugins/check_dpkg should be absent
everywhere.
..
Nrpe: /usr/lib/nagios/plugins/check_dpkg should be absent everywhere.
Removed puppet absent command for the file.
Change-Id: I79c584ccd7e0ee12e0aa6feec2a1db0645fbb9f3
---
M modules/nrpe/manifests/init.pp
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/nrpe/manifests/init.pp b/modules/nrpe/manifests/init.pp
index 4f497b8..8138bc3 100644
--- a/modules/nrpe/manifests/init.pp
+++ b/modules/nrpe/manifests/init.pp
@@ -46,11 +46,6 @@
notify = Service['nagios-nrpe-server'],
}
-# TODO: Remove this after the file has been purged everywhere
-file { '/usr/lib/nagios/plugins/check_dpkg':
-ensure = absent,
-}
-
file { '/usr/local/lib/nagios/':
ensure = directory,
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/86847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79c584ccd7e0ee12e0aa6feec2a1db0645fbb9f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
Gerrit-Reviewer: Akosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Lcarr lc...@wikimedia.org
Gerrit-Reviewer: Matanya matanya.mo...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] UpdateObserver and JobBase to implement ContextAware - change (mediawiki...SemanticMediaWiki)
Mwjames has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86849
Change subject: UpdateObserver and JobBase to implement ContextAware
..
UpdateObserver and JobBase to implement ContextAware
Instead of implementing DependencyRequestor, implement ContextAware to
loosen dependency between DIC and the requestor.
Change-Id: Ie5e74dfd56f5fecd7391285585622f80681db97a
---
M includes/UpdateObserver.php
M includes/dic/SharedDependencyContainer.php
M includes/jobs/JobBase.php
M includes/jobs/UpdateDispatcherJob.php
M includes/jobs/UpdateJob.php
M tests/phpunit/includes/UpdateObserverTest.php
M tests/phpunit/includes/dic/SharedDependencyContainerTest.php
M tests/phpunit/includes/jobs/UpdateDispatcherJobTest.php
M tests/phpunit/includes/jobs/UpdateJobTest.php
9 files changed, 81 insertions(+), 117 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/49/86849/1
diff --git a/includes/UpdateObserver.php b/includes/UpdateObserver.php
index 1828c2b..c75c510 100644
--- a/includes/UpdateObserver.php
+++ b/includes/UpdateObserver.php
@@ -21,37 +21,35 @@
* to this observer which will independently act from the source of
* the notification
*
- * @note When testing rountrips, use the MockUpdateObserver instead
+ * @note When testing round-trips, use the MockUpdateObserver instead
*
* @ingroup Observer
*/
-class UpdateObserver extends Observer implements DependencyRequestor {
+class UpdateObserver extends Observer implements ContextAware {
- /** @var DependencyBuilder */
- protected $dependencyBuilder = null;
+ /** @var ContextResource */
+ protected $context = null;
/**
-* @see DependencyRequestor::setDependencyBuilder
-*
* @since 1.9
*
-* @param DependencyBuilder $builder
+* @param ContextResource
*/
- public function setDependencyBuilder( DependencyBuilder $builder ) {
- $this-dependencyBuilder = $builder;
+ public function invokeContext( ContextResource $context ) {
+ $this-context = $context;
}
/**
-* @see DependencyRequestor::getDependencyBuilder
+* @see ContextAware::withContext
*
* @since 1.9
*
-* @return DependencyBuilder
+* @return ContextResource
*/
- public function getDependencyBuilder() {
+ public function withContext() {
// This is not as clean as it should be but to avoid to make
- // multipe changes at once we determine a default builder here
+ // multiple changes at once we determine a default builder here
// which at some point should vanish after pending changes have
// been merged
@@ -59,11 +57,11 @@
// UpdateJob does not
// ParserAfterTidy does not
- if ( $this-dependencyBuilder === null ) {
- $this-dependencyBuilder = new SimpleDependencyBuilder(
new SharedDependencyContainer() );
+ if ( $this-context === null ) {
+ $this-context = new BaseContext();
}
- return $this-dependencyBuilder;
+ return $this-context;
}
/**
@@ -80,17 +78,12 @@
*/
public function runStoreUpdater( ParserData $subject ) {
- /**
-* @var Settings $settings
-*/
- $settings = $this-getDependencyBuilder()-newObject(
'Settings' );
+ $updater = new StoreUpdater(
+ $this-withContext()-getStore(),
+ $subject-getData(),
+ $this-withContext()-getSettings()
+ );
- /**
-* @var Store $store
-*/
- $store = $this-getDependencyBuilder()-newObject( 'Store' );
-
- $updater = new StoreUpdater( $store, $subject-getData(),
$settings );
$updater-setUpdateStatus( $subject-getUpdateStatus()
)-doUpdate();
return true;
@@ -119,7 +112,7 @@
public function runUpdateDispatcher( TitleAccess $subject ) {
$dispatcher = new UpdateDispatcherJob( $subject-getTitle() );
- $dispatcher-setDependencyBuilder(
$this-getDependencyBuilder() );
+ $dispatcher-invokeContext( $this-withContext() );
$dispatcher-run();
return true;
diff --git a/includes/dic/SharedDependencyContainer.php
b/includes/dic/SharedDependencyContainer.php
index 8de063b..4003e21 100644
--- a/includes/dic/SharedDependencyContainer.php
+++ b/includes/dic/SharedDependencyContainer.php
@@ -284,7 +284,7 @@
protected function getUpdateObserver() {
return function ( DependencyBuilder
[MediaWiki-commits] [Gerrit] Adding bacula module rspec tests - change (operations/puppet)
Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86850
Change subject: Adding bacula module rspec tests
..
Adding bacula module rspec tests
Change-Id: Ie075c20329b09d606b43aa35c37ded4af2bec321
---
A modules/bacula/.rspec
A modules/bacula/Rakefile
A modules/bacula/spec/classes/bacula_client_spec.rb
A modules/bacula/spec/classes/bacula_console_spec.rb
A modules/bacula/spec/classes/bacula_director_spec.rb
A modules/bacula/spec/classes/bacula_storage_spec.rb
A modules/bacula/spec/defines/catalog_spec.rb
A modules/bacula/spec/defines/fileset_spec.rb
A modules/bacula/spec/defines/job_spec.rb
A modules/bacula/spec/defines/jobdefaults_spec.rb
A modules/bacula/spec/defines/pool_spec.rb
A modules/bacula/spec/defines/schedule_spec.rb
A modules/bacula/spec/defines/storage_device_spec.rb
A modules/bacula/spec/fixtures/manifests/site.pp
A modules/bacula/spec/spec_helper.rb
15 files changed, 441 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/86850/1
diff --git a/modules/bacula/.rspec b/modules/bacula/.rspec
new file mode 100644
index 000..f449dae
--- /dev/null
+++ b/modules/bacula/.rspec
@@ -0,0 +1,2 @@
+--format doc
+--color
diff --git a/modules/bacula/Rakefile b/modules/bacula/Rakefile
new file mode 100644
index 000..d9226a8
--- /dev/null
+++ b/modules/bacula/Rakefile
@@ -0,0 +1,37 @@
+require 'rake'
+require 'fileutils'
+
+require 'rspec/core/rake_task'
+
+modulename = File.basename(File.expand_path(File.dirname(__FILE__)))
+
+symlinks = { 'spec/fixtures/modules/%s/files' % modulename =
'../../../../files',
+ 'spec/fixtures/modules/%s/manifests' % modulename = '../../../../manifests',
+ 'spec/fixtures/modules/%s/templates' % modulename = '../../../../templates',
+}
+
+
+task :setup do
+ FileUtils.mkdir_p('spec/fixtures/modules/%s' % modulename)
+ symlinks.each do |x|
+if !File.exist?(x[0])
+ FileUtils.ln_s(x[1], x[0])
+end
+ end
+end
+
+task :teardown do
+ symlinks.each { |x| FileUtils.rm(x[0], :force = true) }
+ FileUtils.rmdir('spec/fixtures/modules/%s' % modulename)
+ FileUtils.rmdir('spec/fixtures/modules')
+end
+
+RSpec::Core::RakeTask.new(:realspec) do |t|
+ t.fail_on_error = false
+ t.pattern = 'spec/*/*_spec.rb'
+end
+
+task :spec = [ :setup, :realspec, :teardown]
+
+task :default = :spec do
+end
diff --git a/modules/bacula/spec/classes/bacula_client_spec.rb
b/modules/bacula/spec/classes/bacula_client_spec.rb
new file mode 100644
index 000..c289d4c
--- /dev/null
+++ b/modules/bacula/spec/classes/bacula_client_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'bacula::client', :type = :class do
+let(:node) { 'testhost.example.com' }
+let(:params) { {
+:director = 'testdirector',
+:catalog = 'testcatalog',
+:file_retention = 'testfr',
+:job_retention = 'testjr',
+:fdport = '2000',
+:directorpassword = 'testdirectorpass',
+}
+}
+
+it { should contain_package('bacula-fd') }
+it { should contain_service('bacula-fd') }
+it { should contain_exec('concat-bacula-keypair') }
+it 'should generate valid content for /etc/bacula/bacula-fd.conf' do
+should contain_file('/etc/bacula/bacula-fd.conf').with({
+'ensure' = 'present',
+'owner' = 'root',
+'group' = 'root',
+'mode'= '0400',
+}) \
+.with_content(/Name = testdirector/) \
+.with_content(/Password = testdirectorpass/) \
+.with_content(/TLS Certificate =
\/var\/lib\/puppet\/ssl\/certs\/testhost.example.com.pem/) \
+.with_content(/TLS Key =
\/var\/lib\/puppet\/ssl\/private_keys\/testhost.example.com.pem/) \
+.with_content(/Name = testhost.example.com-fd/) \
+.with_content(/FDport = 2000/) \
+.with_content(/PKI Keypair =
\/var\/lib\/puppet\/ssl\/private_keys\/bacula-keypair-testhost.example.com.pem/)
+end
+end
diff --git a/modules/bacula/spec/classes/bacula_console_spec.rb
b/modules/bacula/spec/classes/bacula_console_spec.rb
new file mode 100644
index 000..4dd7916
--- /dev/null
+++ b/modules/bacula/spec/classes/bacula_console_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe 'bacula::console', :type = :class do
+let(:params) { { :director = 'testdirector' } }
+
+it { should contain_package('bacula-console') }
+end
diff --git a/modules/bacula/spec/classes/bacula_director_spec.rb
b/modules/bacula/spec/classes/bacula_director_spec.rb
new file mode 100644
index 000..6c63475
--- /dev/null
+++ b/modules/bacula/spec/classes/bacula_director_spec.rb
@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe 'bacula::director', :type = :class do
+let(:node) { 'testhost.example.com' }
+let(:params) { {
+:max_dir_concur_jobs = '10',
+:sqlvariant = 'testsql',
+:dir_port = '9900',
+:bconsolepassword
[MediaWiki-commits] [Gerrit] Use full path - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Use full path .. Use full path Otherwise having folder in PATH is needed Change-Id: Ibc0941fc3067bb1e421d426f795d11a0becf1cca --- M bin/repoupdate 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/repoupdate b/bin/repoupdate index 37bbb5c..4346639 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -159,7 +159,7 @@ cd .. fi else - update-reset-repo $DIR/$PROJECT/extensions/$EXTENSION + /home/betawiki/config/bin/update-reset-repo $DIR/$PROJECT/extensions/$EXTENSION let count+=1; [[ $((count%10)) -eq 0 ]] wait fi done -- To view, visit https://gerrit.wikimedia.org/r/86848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc0941fc3067bb1e421d426f795d11a0becf1cca Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding bacula module rspec tests - change (operations/puppet)
Akosiaris has submitted this change and it was merged.
Change subject: Adding bacula module rspec tests
..
Adding bacula module rspec tests
Change-Id: Ie075c20329b09d606b43aa35c37ded4af2bec321
---
A modules/bacula/.rspec
A modules/bacula/Rakefile
A modules/bacula/spec/classes/bacula_client_spec.rb
A modules/bacula/spec/classes/bacula_console_spec.rb
A modules/bacula/spec/classes/bacula_director_spec.rb
A modules/bacula/spec/classes/bacula_storage_spec.rb
A modules/bacula/spec/defines/catalog_spec.rb
A modules/bacula/spec/defines/fileset_spec.rb
A modules/bacula/spec/defines/job_spec.rb
A modules/bacula/spec/defines/jobdefaults_spec.rb
A modules/bacula/spec/defines/pool_spec.rb
A modules/bacula/spec/defines/schedule_spec.rb
A modules/bacula/spec/defines/storage_device_spec.rb
A modules/bacula/spec/fixtures/manifests/site.pp
A modules/bacula/spec/spec_helper.rb
15 files changed, 441 insertions(+), 0 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/bacula/.rspec b/modules/bacula/.rspec
new file mode 100644
index 000..f449dae
--- /dev/null
+++ b/modules/bacula/.rspec
@@ -0,0 +1,2 @@
+--format doc
+--color
diff --git a/modules/bacula/Rakefile b/modules/bacula/Rakefile
new file mode 100644
index 000..d9226a8
--- /dev/null
+++ b/modules/bacula/Rakefile
@@ -0,0 +1,37 @@
+require 'rake'
+require 'fileutils'
+
+require 'rspec/core/rake_task'
+
+modulename = File.basename(File.expand_path(File.dirname(__FILE__)))
+
+symlinks = { 'spec/fixtures/modules/%s/files' % modulename =
'../../../../files',
+ 'spec/fixtures/modules/%s/manifests' % modulename = '../../../../manifests',
+ 'spec/fixtures/modules/%s/templates' % modulename = '../../../../templates',
+}
+
+
+task :setup do
+ FileUtils.mkdir_p('spec/fixtures/modules/%s' % modulename)
+ symlinks.each do |x|
+if !File.exist?(x[0])
+ FileUtils.ln_s(x[1], x[0])
+end
+ end
+end
+
+task :teardown do
+ symlinks.each { |x| FileUtils.rm(x[0], :force = true) }
+ FileUtils.rmdir('spec/fixtures/modules/%s' % modulename)
+ FileUtils.rmdir('spec/fixtures/modules')
+end
+
+RSpec::Core::RakeTask.new(:realspec) do |t|
+ t.fail_on_error = false
+ t.pattern = 'spec/*/*_spec.rb'
+end
+
+task :spec = [ :setup, :realspec, :teardown]
+
+task :default = :spec do
+end
diff --git a/modules/bacula/spec/classes/bacula_client_spec.rb
b/modules/bacula/spec/classes/bacula_client_spec.rb
new file mode 100644
index 000..c289d4c
--- /dev/null
+++ b/modules/bacula/spec/classes/bacula_client_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'bacula::client', :type = :class do
+let(:node) { 'testhost.example.com' }
+let(:params) { {
+:director = 'testdirector',
+:catalog = 'testcatalog',
+:file_retention = 'testfr',
+:job_retention = 'testjr',
+:fdport = '2000',
+:directorpassword = 'testdirectorpass',
+}
+}
+
+it { should contain_package('bacula-fd') }
+it { should contain_service('bacula-fd') }
+it { should contain_exec('concat-bacula-keypair') }
+it 'should generate valid content for /etc/bacula/bacula-fd.conf' do
+should contain_file('/etc/bacula/bacula-fd.conf').with({
+'ensure' = 'present',
+'owner' = 'root',
+'group' = 'root',
+'mode'= '0400',
+}) \
+.with_content(/Name = testdirector/) \
+.with_content(/Password = testdirectorpass/) \
+.with_content(/TLS Certificate =
\/var\/lib\/puppet\/ssl\/certs\/testhost.example.com.pem/) \
+.with_content(/TLS Key =
\/var\/lib\/puppet\/ssl\/private_keys\/testhost.example.com.pem/) \
+.with_content(/Name = testhost.example.com-fd/) \
+.with_content(/FDport = 2000/) \
+.with_content(/PKI Keypair =
\/var\/lib\/puppet\/ssl\/private_keys\/bacula-keypair-testhost.example.com.pem/)
+end
+end
diff --git a/modules/bacula/spec/classes/bacula_console_spec.rb
b/modules/bacula/spec/classes/bacula_console_spec.rb
new file mode 100644
index 000..4dd7916
--- /dev/null
+++ b/modules/bacula/spec/classes/bacula_console_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe 'bacula::console', :type = :class do
+let(:params) { { :director = 'testdirector' } }
+
+it { should contain_package('bacula-console') }
+end
diff --git a/modules/bacula/spec/classes/bacula_director_spec.rb
b/modules/bacula/spec/classes/bacula_director_spec.rb
new file mode 100644
index 000..6c63475
--- /dev/null
+++ b/modules/bacula/spec/classes/bacula_director_spec.rb
@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe 'bacula::director', :type = :class do
+let(:node) { 'testhost.example.com' }
+let(:params) { {
+:max_dir_concur_jobs = '10',
+:sqlvariant = 'testsql',
+:dir_port = '9900',
+:bconsolepassword = 'bconsolepass',
+}
+}
+
+
[MediaWiki-commits] [Gerrit] deduplicating by username and project - change (analytics/wikimetrics)
Milimetric has submitted this change and it was merged.
Change subject: deduplicating by username and project
..
deduplicating by username and project
Change-Id: Idb827a23bf6669ecda263b35b7b44d28d9d33e2e
---
M scripts/test
M tests/test_controllers/test_cohorts.py
M tests/test_utils/test_one_off_functions.py
M wikimetrics/controllers/cohorts.py
4 files changed, 28 insertions(+), 3 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/scripts/test b/scripts/test
index b31359a..83a5573 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,4 +1,4 @@
# for example:
-# scripts/test tests/test_controllers/test_cohorts.py:TestCohortsController
+# scripts/test tests/test_controllers/test_cohorts.py:CohortsControllerTest
# rm .coverage *.db
find -name *.pyc | xargs rm ; nosetests --cover-erase $1
diff --git a/tests/test_controllers/test_cohorts.py
b/tests/test_controllers/test_cohorts.py
index f07fba1..6b7dcd2 100644
--- a/tests/test_controllers/test_cohorts.py
+++ b/tests/test_controllers/test_cohorts.py
@@ -18,7 +18,7 @@
from wikimetrics.models import Cohort
-class TestCohortsController(WebTest):
+class CohortsControllerTest(WebTest):
def test_index(self):
response = self.app.get('/cohorts/', follow_redirects=True)
diff --git a/tests/test_utils/test_one_off_functions.py
b/tests/test_utils/test_one_off_functions.py
index c538983..726e4d7 100644
--- a/tests/test_utils/test_one_off_functions.py
+++ b/tests/test_utils/test_one_off_functions.py
@@ -4,6 +4,7 @@
from unittest import TestCase
from wikimetrics.utils import (
stringify,
+deduplicate_by_key,
)
from wikimetrics.metrics import NamespaceEdits
@@ -31,3 +32,27 @@
result = stringify(normal='hello world')
assert_true(result.find('normal') = 0)
assert_true(result.find('normal') = 0)
+
+def test_deduplicate_by_key(self):
+collection_of_dicts = [
+{'index': 'one', 'other': '1'},
+{'index': 'two', 'other': '2'},
+{'index': 'two', 'other': '3'},
+]
+no_duplicates = deduplicate_by_key(collection_of_dicts, lambda r:
r['index'])
+expected = collection_of_dicts[0:2]
+assert_equals(sorted(no_duplicates), expected)
+
+def test_deduplicate_by_key_tuple(self):
+collection_of_dicts = [
+{'index': 'one', 'other': '1'},
+{'index': 'two', 'other': '2'},
+{'index': 'two', 'other': '3'},
+{'index': 'two', 'other': '2'},
+]
+no_duplicates = deduplicate_by_key(
+collection_of_dicts,
+lambda r: (r['index'], r['other'])
+)
+expected = collection_of_dicts[0:3]
+assert_equals(sorted(no_duplicates), expected)
diff --git a/wikimetrics/controllers/cohorts.py
b/wikimetrics/controllers/cohorts.py
index ddfd0b5..64ff35e 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -415,5 +415,5 @@
record['user_id'], record['username'] = normalized_user
valid.append(record)
-valid = deduplicate_by_key(valid, lambda record: record['username'])
+valid = deduplicate_by_key(valid, lambda r: (r['username'], r['project']))
return (valid, invalid)
--
To view, visit https://gerrit.wikimedia.org/r/86851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb827a23bf6669ecda263b35b7b44d28d9d33e2e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Complete rename to EmailableUser - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Complete rename to EmailableUser
..
Complete rename to EmailableUser
Followup to Ia6ee70420 / dc06b430b
Bug: 54761
Change-Id: Idf19ab05e601cf6996097ba6c53040d99a80c705
---
M EmailableUser.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EmailableUser.php b/EmailableUser.php
index 4004114..fe8f433 100644
--- a/EmailableUser.php
+++ b/EmailableUser.php
@@ -17,7 +17,7 @@
*User::getCanonicalName(), except that true is accepted as an alias
*for 'valid', for BC.
*
-* @return ConfirmAndMigrateUser|bool ConfirmAndMigrateUser object, or
false if the
+* @return EmailableUser|bool EmailableUser object, or false if the
*username is invalid (e.g. if it contains illegal characters or is
an IP address).
*If the username is not present in the database, the result will
be a user object
*with a name, zero user ID and default settings.
@@ -31,7 +31,7 @@
return false;
} else {
# Create unloaded user object
- $u = new ConfirmAndMigrateUser;
+ $u = new EmailableUser;
$u-mName = $name;
$u-mFrom = 'name';
$u-setItemLoaded( 'name' );
--
To view, visit https://gerrit.wikimedia.org/r/86421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf19ab05e601cf6996097ba6c53040d99a80c705
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] provide sane configuration defaults - change (labs...grrrit)
Yuvipanda has submitted this change and it was merged.
Change subject: provide sane configuration defaults
..
provide sane configuration defaults
Using underscore _.defaults(), we can trivially add default parameters
to the user provided configuration. Should help clueless users not
respecting the config spec.
Change-Id: I33a546dedf0e7f5fabefeae3c2461ca9ef11c49d
---
M src/relay.js
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/relay.js b/src/relay.js
index bac9555..b0288e9 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -6,7 +6,14 @@
yaml = require('js-yaml'),
logging = require('winston'),
config = require('../config.yaml'),
-conns = require('../connections.yaml');
+conns = require('../connections.yaml'),
+// Sane? defaults
+config_defaults = {
+nick: 'grrrit',
+server: 'chat.freenode.net'
+};
+
+_.defaults(config, config_defaults);
function errorLog(message) {
logging.error(message);
--
To view, visit https://gerrit.wikimedia.org/r/85404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33a546dedf0e7f5fabefeae3c2461ca9ef11c49d
Gerrit-PatchSet: 3
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 54529) Fix message doc for wblinktitles-* - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 54529) Fix message doc for wblinktitles-*
..
(bug 54529) Fix message doc for wblinktitles-*
Change-Id: Idb8292772ed069c92afaf9a8f36599542bd7c5c1
---
M repo/Wikibase.i18n.php
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 850fec0..8bfff26 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -1072,17 +1072,15 @@
This module generates a slightly different summary (autocomment) than the
other ones.
Parameters:
-* $1 - the number of pages that were connected
-* $2 - the site code for the from-page
-* $3 - the site code for the to-page',
+* $1 - the site code for the from-page
+* $2 - the site code for the to-page',
'wikibase-item-summary-wblinktitles-connect' = '{{wikibase summary
messages|item|Automatic edit summary when connecting page(s).}}
This module generates a slightly different summary (autocomment) than the
other ones.
Parameters:
-* $1 - (Unused) the number of pages that were connected
-* $2 - the site code for the from-page
-* $3 - the site code for the to-page',
+* $1 - the site code for the from-page
+* $2 - the site code for the to-page',
'wikibase-item-summary-wbcreateclaim-value' = '{{wikibase summary
messages|item-claims|Automatic edit summary when a claim is created and a value
is used. The values can be of various types, including but not limited to
defined properties. This is a LEGACY value, needed for old log entries!}}',
'wikibase-item-summary-wbcreateclaim-novalue' = {{wikibase summary
messages|item-claims|Automatic edit summary when ''no value'' is supplied to
the claim. A ''no value'' means that there are no valid value to be set for
this claim, or that there are no existing value. This is a LEGACY value, needed
for old log entries!}},
'wikibase-item-summary-wbcreateclaim-somevalue' = '{{wikibase summary
messages|item-claims|Automatic edit summary when there should be a value but it
is unknown. This is different from the case where there are no valid or
existing value. This is a LEGACY value, needed for old log entries!}}',
--
To view, visit https://gerrit.wikimedia.org/r/86839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb8292772ed069c92afaf9a8f36599542bd7c5c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Liangent liang...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use generic Rakefile in nrpe module - change (operations/puppet)
Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86852
Change subject: Use generic Rakefile in nrpe module
..
Use generic Rakefile in nrpe module
This makes the Rakefile used to run rspec-puppet tests in nrpe module
fully generic some it can be re-used as is in any other module
Change-Id: I3c97fcc849ba3d38044b6c3c8656f31f08d40f39
---
M modules/nrpe/Rakefile
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/86852/1
diff --git a/modules/nrpe/Rakefile b/modules/nrpe/Rakefile
index ed517ca..d9226a8 100644
--- a/modules/nrpe/Rakefile
+++ b/modules/nrpe/Rakefile
@@ -3,14 +3,16 @@
require 'rspec/core/rake_task'
-symlinks = { 'spec/fixtures/modules/nrpe/files' = '../../../../files',
- 'spec/fixtures/modules/nrpe/manifests' = '../../../../manifests',
- 'spec/fixtures/modules/nrpe/templates' = '../../../../templates',
+modulename = File.basename(File.expand_path(File.dirname(__FILE__)))
+
+symlinks = { 'spec/fixtures/modules/%s/files' % modulename =
'../../../../files',
+ 'spec/fixtures/modules/%s/manifests' % modulename = '../../../../manifests',
+ 'spec/fixtures/modules/%s/templates' % modulename = '../../../../templates',
}
task :setup do
- FileUtils.mkdir_p('spec/fixtures/modules/nrpe')
+ FileUtils.mkdir_p('spec/fixtures/modules/%s' % modulename)
symlinks.each do |x|
if !File.exist?(x[0])
FileUtils.ln_s(x[1], x[0])
@@ -20,7 +22,7 @@
task :teardown do
symlinks.each { |x| FileUtils.rm(x[0], :force = true) }
- FileUtils.rmdir('spec/fixtures/modules/nrpe')
+ FileUtils.rmdir('spec/fixtures/modules/%s' % modulename)
FileUtils.rmdir('spec/fixtures/modules')
end
--
To view, visit https://gerrit.wikimedia.org/r/86852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c97fcc849ba3d38044b6c3c8656f31f08d40f39
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deduplicating by username and project - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86851
Change subject: deduplicating by username and project
..
deduplicating by username and project
Change-Id: Idb827a23bf6669ecda263b35b7b44d28d9d33e2e
---
M scripts/test
M tests/test_controllers/test_cohorts.py
M tests/test_utils/test_one_off_functions.py
M wikimetrics/controllers/cohorts.py
4 files changed, 28 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/51/86851/1
diff --git a/scripts/test b/scripts/test
index b31359a..83a5573 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,4 +1,4 @@
# for example:
-# scripts/test tests/test_controllers/test_cohorts.py:TestCohortsController
+# scripts/test tests/test_controllers/test_cohorts.py:CohortsControllerTest
# rm .coverage *.db
find -name *.pyc | xargs rm ; nosetests --cover-erase $1
diff --git a/tests/test_controllers/test_cohorts.py
b/tests/test_controllers/test_cohorts.py
index f07fba1..6b7dcd2 100644
--- a/tests/test_controllers/test_cohorts.py
+++ b/tests/test_controllers/test_cohorts.py
@@ -18,7 +18,7 @@
from wikimetrics.models import Cohort
-class TestCohortsController(WebTest):
+class CohortsControllerTest(WebTest):
def test_index(self):
response = self.app.get('/cohorts/', follow_redirects=True)
diff --git a/tests/test_utils/test_one_off_functions.py
b/tests/test_utils/test_one_off_functions.py
index c538983..726e4d7 100644
--- a/tests/test_utils/test_one_off_functions.py
+++ b/tests/test_utils/test_one_off_functions.py
@@ -4,6 +4,7 @@
from unittest import TestCase
from wikimetrics.utils import (
stringify,
+deduplicate_by_key,
)
from wikimetrics.metrics import NamespaceEdits
@@ -31,3 +32,27 @@
result = stringify(normal='hello world')
assert_true(result.find('normal') = 0)
assert_true(result.find('normal') = 0)
+
+def test_deduplicate_by_key(self):
+collection_of_dicts = [
+{'index': 'one', 'other': '1'},
+{'index': 'two', 'other': '2'},
+{'index': 'two', 'other': '3'},
+]
+no_duplicates = deduplicate_by_key(collection_of_dicts, lambda r:
r['index'])
+expected = collection_of_dicts[0:2]
+assert_equals(sorted(no_duplicates), expected)
+
+def test_deduplicate_by_key_tuple(self):
+collection_of_dicts = [
+{'index': 'one', 'other': '1'},
+{'index': 'two', 'other': '2'},
+{'index': 'two', 'other': '3'},
+{'index': 'two', 'other': '2'},
+]
+no_duplicates = deduplicate_by_key(
+collection_of_dicts,
+lambda r: (r['index'], r['other'])
+)
+expected = collection_of_dicts[0:3]
+assert_equals(sorted(no_duplicates), expected)
diff --git a/wikimetrics/controllers/cohorts.py
b/wikimetrics/controllers/cohorts.py
index ddfd0b5..64ff35e 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -415,5 +415,5 @@
record['user_id'], record['username'] = normalized_user
valid.append(record)
-valid = deduplicate_by_key(valid, lambda record: record['username'])
+valid = deduplicate_by_key(valid, lambda r: (r['username'], r['project']))
return (valid, invalid)
--
To view, visit https://gerrit.wikimedia.org/r/86851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb827a23bf6669ecda263b35b7b44d28d9d33e2e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for IME menu integration tests - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Fix for IME menu integration tests .. Fix for IME menu integration tests Make sure to click only when Input Method indicator is available. Change-Id: Ieff61d74a8ea5b8bcb7aafdc94865dee4927dc97 --- M tests/browser/features/step_definitions/ime_steps.rb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/ime_steps.rb b/tests/browser/features/step_definitions/ime_steps.rb index 725c9f7..384487f 100644 --- a/tests/browser/features/step_definitions/ime_steps.rb +++ b/tests/browser/features/step_definitions/ime_steps.rb @@ -16,7 +16,7 @@ end When(/^I click on the input method indicator$/) do - on(RandomPage).input_method_element.click + on(RandomPage).input_method_element.when_present.click end When(/^I open the input method menu$/) do @@ -28,7 +28,7 @@ end Then(/^I should see the input method indicator$/) do - on(RandomPage).input_method_element.should be_visible + on(RandomPage).input_method_element.when_present.should be_visible end Then(/^I should see input methods for (.+)/) do |language| -- To view, visit https://gerrit.wikimedia.org/r/86680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieff61d74a8ea5b8bcb7aafdc94865dee4927dc97 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Arrbee run...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: SuchetaG sucheta.ghos...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch English to kstem. - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/86853 Change subject: Switch English to kstem. .. Switch English to kstem. The old stemmer (Porter) was having trouble with words like aliases and uses. kstem has problems as well, I believe there are fewer of them. Bug: 54811 Bug: 54022 Change-Id: I0722c13f7d023d8ad8a6845403be974262b91054 --- M includes/CirrusSearchAnalysisConfigBuilder.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/53/86853/1 diff --git a/includes/CirrusSearchAnalysisConfigBuilder.php b/includes/CirrusSearchAnalysisConfigBuilder.php index 0da92a6..89f1378 100644 --- a/includes/CirrusSearchAnalysisConfigBuilder.php +++ b/includes/CirrusSearchAnalysisConfigBuilder.php @@ -116,7 +116,7 @@ $config[ 'analyzer' ][ 'text' ] = array( 'type' = 'custom', 'tokenizer' = 'standard', - 'filter' = array( 'standard', 'possessive_english', 'lowercase', 'stop', 'porter_stem', 'asciifolding' ) + 'filter' = array( 'standard', 'possessive_english', 'lowercase', 'stop', 'kstem', 'asciifolding' ) ); // Add asciifolding to the the text_plain analyzer as well $config[ 'analyzer' ][ 'plain' ][ 'filter' ][] = 'asciifolding'; -- To view, visit https://gerrit.wikimedia.org/r/86853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0722c13f7d023d8ad8a6845403be974262b91054 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tests for places where kstem beats porter stemmer. - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86854
Change subject: Tests for places where kstem beats porter stemmer.
..
Tests for places where kstem beats porter stemmer.
Bug: 54022
Bug: 54811
Change-Id: Ic853942da54b0fd23da4a5e6cd448c4826100772
---
M tests/browser/features/full_text.feature
M tests/browser/features/support/build_pages.rb
2 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/54/86854/1
diff --git a/tests/browser/features/full_text.feature
b/tests/browser/features/full_text.feature
index edb71e0..6dc91ac 100644
--- a/tests/browser/features/full_text.feature
+++ b/tests/browser/features/full_text.feature
@@ -269,3 +269,16 @@
Scenario: Searching for a quoted * actually searches for a *
When I search for pick*
Then Pick* is the first search result
+
+ @stemmer
+ Scenario Outline: Stemming works as expected
+When I search for StemmerTest term
+Then result is the first search result
+ Examples:
+| term |result|
+| aliases | StemmerTest Aliases |
+| alias| StemmerTest Aliases |
+| used | StemmerTest Used |
+| uses | StemmerTest Used |
+| use | StemmerTest Used |
+| us | none |
diff --git a/tests/browser/features/support/build_pages.rb
b/tests/browser/features/support/build_pages.rb
index c755109..17bf15d 100644
--- a/tests/browser/features/support/build_pages.rb
+++ b/tests/browser/features/support/build_pages.rb
@@ -139,3 +139,13 @@
end
$exact_quotes = true
end
+
+Before('@stemmer') do
+ if !$exact_quotes
+steps %Q{
+ Given a page named StemmerTest Aliases exists
+ And a page named StemmerTest Used exists
+}
+ end
+ $exact_quotes = true
+end
--
To view, visit https://gerrit.wikimedia.org/r/86854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic853942da54b0fd23da4a5e6cd448c4826100772
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes incorrectly declared GraphViz graphsize parameter. - change (mediawiki...SemanticResultFormats)
jenkins-bot has submitted this change and it was merged. Change subject: Fixes incorrectly declared GraphViz graphsize parameter. .. Fixes incorrectly declared GraphViz graphsize parameter. It's been wrong for at least a year and reported at least twice (#40088, #35868). Change-Id: I7f70d2e8a2bb9a478c816194af39fa3ffa1ecccf --- M formats/graphviz/SRF_Graph.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nathan Douglas: Looks good to me, but someone else must approve Mwjames: Looks good to me, approved jenkins-bot: Verified diff --git a/formats/graphviz/SRF_Graph.php b/formats/graphviz/SRF_Graph.php index c56ce9c..9b30f66 100644 --- a/formats/graphviz/SRF_Graph.php +++ b/formats/graphviz/SRF_Graph.php @@ -293,7 +293,7 @@ ); $params['graphsize'] = array( - 'type' = 'integer', + 'type' = 'string', 'default' = '', 'message' = 'srf_paramdesc_graphsize', 'manipulatedefault' = false, -- To view, visit https://gerrit.wikimedia.org/r/85922 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f70d2e8a2bb9a478c816194af39fa3ffa1ecccf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticResultFormats Gerrit-Branch: master Gerrit-Owner: Nathan Douglas s...@thedouglasfamily.org Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Mwjames jamesin.hongkon...@gmail.com Gerrit-Reviewer: Nathan Douglas s...@thedouglasfamily.org Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tests for programmer friendly word splitting. - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Tests for programmer friendly word splitting.
..
Tests for programmer friendly word splitting.
Bug: 54799
Change-Id: I7bbe0152095af982a1b929f8f7ae2445cbe698fc
---
M tests/browser/features/full_text.feature
M tests/browser/features/full_text_advanced.feature
M tests/browser/features/full_text_highlighting.feature
M tests/browser/features/support/build_pages.rb
4 files changed, 38 insertions(+), 3 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/full_text.feature
b/tests/browser/features/full_text.feature
index edb71e0..74bcdaa 100644
--- a/tests/browser/features/full_text.feature
+++ b/tests/browser/features/full_text.feature
@@ -35,8 +35,7 @@
| File:Savepage-greyed.png | File:Savepage-greyed.png is
| not in | image |
| File:Savepage| File:Savepage-greyed.png is
| not in | image |
| File:greyed.png | File:Savepage-greyed.png is
| not in | image |
-# Bug 52948
-#| File:greyed | File:Savepage-greyed.png is
| not in | image |
+| File:greyed | File:Savepage-greyed.png is
| not in | image |
| File:Screenshot, for test purposes | File:Savepage-greyed.png is
| not in | image |
# You can't search for text inside a video or audio tag
| JavaScript disabled| none is
| not in ||
@@ -269,3 +268,23 @@
Scenario: Searching for a quoted * actually searches for a *
When I search for pick*
Then Pick* is the first search result
+
+ @programmer_friendly
+ Scenario Outline: Programmer friendly searches
+When I search for term
+Then page is the first search result
+ Examples:
+| term| page|
+| namespace aliases | $wgNamespaceAliases |
+| namespaceAliases| $wgNamespaceAliases |
+| $wgNamespaceAliases | $wgNamespaceAliases |
+| namespace_aliases | $wgNamespaceAliases |
+| NamespaceAliases| $wgNamespaceAliases |
+| snake case | PFSC|
+| snakeCase | PFSC|
+| snake_case | PFSC|
+| SnakeCase | PFSC|
+| Pascal Case | PascalCase |
+| pascalCase | PascalCase |
+| pascal_case | PascalCase |
+| PascalCase | PascalCase |
diff --git a/tests/browser/features/full_text_advanced.feature
b/tests/browser/features/full_text_advanced.feature
index 19fe019..092767b 100644
--- a/tests/browser/features/full_text_advanced.feature
+++ b/tests/browser/features/full_text_advanced.feature
@@ -38,4 +38,4 @@
| Talk, Help | catapult | Talk:Two Words is |
| Help, Help talk | catapult | none is |
| (Main) or (Article) | catapult | Catapult is in|
-| List redirects | rdir | none is |
+| List redirects | rdir | none is |
diff --git a/tests/browser/features/full_text_highlighting.feature
b/tests/browser/features/full_text_highlighting.feature
index 37a45c8..b25f7fa 100644
--- a/tests/browser/features/full_text_highlighting.feature
+++ b/tests/browser/features/full_text_highlighting.feature
@@ -60,3 +60,8 @@
Scenario: The highest scoring redirect is highlighted
When I search for crazy rdir
Then *Crazy* *Rdir* is the highlighted alttitle of the first search result
+
+ @programmer_friendly
+ Scenario: camelCase is highlighted correctly
+When I search for namespace aliases
+Then $wg*Namespace**Aliases* is the highlighted title of the first search
result
diff --git a/tests/browser/features/support/build_pages.rb
b/tests/browser/features/support/build_pages.rb
index c755109..4626eaa 100644
--- a/tests/browser/features/support/build_pages.rb
+++ b/tests/browser/features/support/build_pages.rb
@@ -139,3 +139,14 @@
end
$exact_quotes = true
end
+
+Before('@programmer_friendly') do
+ if !$programmer_friendly
+steps %Q{
+ Given a page named $wgNamespaceAliases exists
+ And a page named PFSC exists with contents snake_case
+ And a page named PascalCase exists
+}
+$programmer_friendly = true
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/86782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bbe0152095af982a1b929f8f7ae2445cbe698fc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Cmcmahon
[MediaWiki-commits] [Gerrit] Allow aggressive splitting. - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow aggressive splitting.
..
Allow aggressive splitting.
Aggressive splitting splits camelCase, snake_case, terms with numb3rs in
them, hyphen-ated words, etc. It might be good in all wikis but for now
it only works in English.
Bug: 54799
Change-Id: I6a84835ea5d6463f10e4fcd5bb228e1ffd252a28
---
M CirrusSearch.php
M includes/CirrusSearchAnalysisConfigBuilder.php
2 files changed, 22 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 9743802..f7bf99c 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -92,6 +92,10 @@
'max_word_len' = 0,
);
+// Should CirrusSearch aggressively split up compound words? Good for
splitting camelCase, snake_case, etc.
+// Changing it requires an in place reindex to take effect. Currently only
available in English.
+$wgCirrusSearchUseAggressiveSplitting = true;
+
$dir = __DIR__ . '/';
/**
* Classes
diff --git a/includes/CirrusSearchAnalysisConfigBuilder.php
b/includes/CirrusSearchAnalysisConfigBuilder.php
index 0da92a6..cd4ed84 100644
--- a/includes/CirrusSearchAnalysisConfigBuilder.php
+++ b/includes/CirrusSearchAnalysisConfigBuilder.php
@@ -84,6 +84,11 @@
),
'lowercase' = array(
'type' = 'lowercase',
+ ),
+
+ 'aggressive_splitting' = array(
+ 'type' = 'word_delimiter',
+ 'stem_english_possessive' = 'false',
// No need
)
),
'tokenizer' = array(
@@ -102,6 +107,7 @@
* Customize the default config for the language.
*/
private function customize( $config ) {
+ global $wgCirrusSearchUseAggressiveSplitting;
switch ( $this-language ) {
// Please add languages in alphabetical order.
case 'el':
@@ -116,8 +122,19 @@
$config[ 'analyzer' ][ 'text' ] = array(
'type' = 'custom',
'tokenizer' = 'standard',
- 'filter' = array( 'standard',
'possessive_english', 'lowercase', 'stop', 'porter_stem', 'asciifolding' )
);
+ $filters = array();
+ $filters[] = 'standard';
+ if ( $wgCirrusSearchUseAggressiveSplitting ) {
+ $filters[] = 'aggressive_splitting';
+ }
+ $filters[] = 'possessive_english';
+ $filters[] = 'lowercase';
+ $filters[] = 'stop';
+ $filters[] = 'porter_stem';
+ $filters[] = 'asciifolding';
+ $config[ 'analyzer' ][ 'text' ][ 'filter' ] = $filters;
+
// Add asciifolding to the the text_plain analyzer as
well
$config[ 'analyzer' ][ 'plain' ][ 'filter' ][] =
'asciifolding';
// Add asciifolding to the prefix queries and
incategory filters
--
To view, visit https://gerrit.wikimedia.org/r/86781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a84835ea5d6463f10e4fcd5bb228e1ffd252a28
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove lucid umask setting - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Remove lucid umask setting
..
Remove lucid umask setting
Since Fenari is on precise and tin is the deploy host, sepcial umask setting is
redundant.
Change-Id: I2d59d10dd8c76a4ec307e7bccc3fa39629d14b6b
---
D files/environment/profile-deploy-host
M manifests/generic-definitions.pp
2 files changed, 0 insertions(+), 46 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/environment/profile-deploy-host
b/files/environment/profile-deploy-host
deleted file mode 100644
index 8b1351b..000
--- a/files/environment/profile-deploy-host
+++ /dev/null
@@ -1,35 +0,0 @@
-# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
-# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-
-# ! this file is generated by puppet !
-# this /etc/profile does NOT set umask
-# instead that is being handled in /etc/profile.d/umask-wikidev.sh
-# based on group membership in wikidev (RT-804)
-# this is ONLY applied on deployment hosts (fenari) on lucid or older
-# precise and newer does not have a umask line there any longer
-
-if [ -d /etc/profile.d ]; then
- for i in /etc/profile.d/*.sh; do
-if [ -r $i ]; then
- . $i
-fi
- done
- unset i
-fi
-
-if [ $PS1 ]; then
- if [ $BASH ]; then
-PS1='\u@\h:\w\$ '
-if [ -f /etc/bash.bashrc ]; then
- . /etc/bash.bashrc
-fi
- else
-if [ `id -u` -eq 0 ]; then
- PS1='# '
-else
- PS1='$ '
-fi
- fi
-fi
-
-export PATH=$PATH:/home/wikipedia/bin
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 539447f..a1bfbce 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -303,17 +303,6 @@
mode = 0444,
source =
puppet:///files/environment/umask-wikidev-profile-d.sh;
}
- # if lucid or earlier /etc/profile would overwrite umask after incl.
above
- # FIXME: remove this once fenari became precise or there is a new
deploy host
- if versioncmp($::lsbdistrelease, 10.04) = 0 {
- file {
- /etc/profile:
- ensure = present,
- owner = root,
- group = root,
- source =
puppet:///files/environment/profile-deploy-host;
- }
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/86816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d59d10dd8c76a4ec307e7bccc3fa39629d14b6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SearchUpdate should read from master. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: SearchUpdate should read from master.
..
SearchUpdate should read from master.
This should prevent slave lag from being interpreted as a page delete
from the perspective of search.
Bug: 54652
Change-Id: I2b6673a9d2950cb9e88e9191e8d359aa5dd36d06
---
M includes/search/SearchUpdate.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/search/SearchUpdate.php b/includes/search/SearchUpdate.php
index 2148210..82a413e 100644
--- a/includes/search/SearchUpdate.php
+++ b/includes/search/SearchUpdate.php
@@ -89,7 +89,7 @@
wfProfileIn( __METHOD__ );
- $page = WikiPage::newFromId( $this-id );
+ $page = WikiPage::newFromId( $this-id, WikiPage::READ_LATEST );
$indexTitle = Title::indexTitle( $this-title-getNamespace(),
$this-title-getText() );
foreach ( SearchEngine::getSearchTypes() as $type ) {
--
To view, visit https://gerrit.wikimedia.org/r/86704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b6673a9d2950cb9e88e9191e8d359aa5dd36d06
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 38946) : Added culmus-fancy font to help render svg - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86855
Change subject: (bug 38946) : Added culmus-fancy font to help render svg
..
(bug 38946) : Added culmus-fancy font to help render svg
Change-Id: I1d593cbd265df5ceec43f6651b70c5fc96886ff1
---
M manifests/imagescaler.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/86855/1
diff --git a/manifests/imagescaler.pp b/manifests/imagescaler.pp
index 4995ef3..ea2167a 100644
--- a/manifests/imagescaler.pp
+++ b/manifests/imagescaler.pp
@@ -3,7 +3,7 @@
# Virtual resource for the monitoring server
@monitor_group { imagescaler: description = image scalers }
-## need to move the /a/magick-tmp stuff to /tmp/magick-tmp this will require a
mediaiwiki change, it would seem
+## need to move the /a/magick-tmp stuff to /tmp/magick-tmp this will require a
mediawiki change, it would seem
class imagescaler::cron {
cron { removetmpfiles:
@@ -45,6 +45,7 @@
package {
[
culmus, # bug 38946
+ culmus-fancy, # bug 38946
gsfonts,
texlive-fonts-recommended,
ttf-alee,
--
To view, visit https://gerrit.wikimedia.org/r/86855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d593cbd265df5ceec43f6651b70c5fc96886ff1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] New design - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86856
Change subject: [WIP] New design
..
[WIP] New design
https://www.mediawiki.org/wiki/Flow_Portal/Design/Iteration_4
Change-Id: Ibb77ba1321ddaf4269bffa1f5881f679f7ebd9e3
---
M Resources.php
M includes/Block/Summary.php
A modules/base/images/stub.png
M modules/discussion/base.css
M modules/discussion/ui.js
A modules/summary/summary.css
M modules/summary/summary.js
M templates/post.html.php
M templates/summary.html.php
M templates/topic.html.php
10 files changed, 195 insertions(+), 161 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/56/86856/1
diff --git a/Resources.php b/Resources.php
index 9a37df4..57d9def 100644
--- a/Resources.php
+++ b/Resources.php
@@ -18,6 +18,7 @@
),
),
'ext.flow.summary' = $flowResourceTemplate + array(
+ 'styles' = 'summary/summary.css',
'scripts' = 'summary/summary.js',
'dependencies' = array(
'ext.flow.editor',
diff --git a/includes/Block/Summary.php b/includes/Block/Summary.php
index 45179f4..c9beaab 100644
--- a/includes/Block/Summary.php
+++ b/includes/Block/Summary.php
@@ -84,9 +84,8 @@
}
public function render( Templating $templating, array $options ) {
- if ( $this-action === 'edit-summary' ) {
- $templating-getOutput()-addModules(
'ext.flow.summary' );
- }
+ $templating-getOutput()-addModules( 'ext.flow.summary' );
+
$templateName = ( $this-action == 'edit-summary' ) ?
'edit-summary' : 'summary';
$templating-render( flow:$templateName.html.php, array(
'block' = $this,
diff --git a/modules/base/images/stub.png b/modules/base/images/stub.png
new file mode 100644
index 000..55b64a8
--- /dev/null
+++ b/modules/base/images/stub.png
Binary files differ
diff --git a/modules/discussion/base.css b/modules/discussion/base.css
index 0efe88b..0cab132 100644
--- a/modules/discussion/base.css
+++ b/modules/discussion/base.css
@@ -145,10 +145,6 @@
background-position: center bottom;
}
-.flow-topic-closed.hasmention .flow-topic-datestamp {
- margin-left: -13px;
-}
-
.flow-post-mention-indicator {
position: relative;
float: left;
@@ -230,11 +226,6 @@
margin-top: -20;
width:670px;
max-width: 670px;
-}
-
-.flow-metabar {
- margin-bottom: 5px;
- margin-top: 5px;
}
/* SUMMARY STUFF */
@@ -330,8 +321,12 @@
color: #44;
}
.flow-topic-datestamp {
- font-size: 10pt;
- color: #99;
+ position: absolute;
+ right: 22px;
+ bottom: 22px;
+
+ font-size: 16px;
+ color: #AAA;
}
.flow-datestamp {
position: absolute;
@@ -347,15 +342,20 @@
.unreadpost .flow-datestamp, .selfpost .flow-datestamp {
color: #ff;
}
-.flow-topic-title {
- color: #44;
- max-width: 600px;
- overflow: wrap;
- cursor: pointer;
+.flow-titlebar {
+ padding: 22px;
+ margin: 0;
+ background-color: #EDEDED;
+ position: relative;
}
-.flow-topic-title, .flow-topic-title a, .ownerboard {
+.flow-titlebar p {
+ margin: 0;
+}
+.flow-topic-title {
font-weight: bold;
- font-size: 13pt;
+ font-size: 24px;
+ line-height: 30px;
+ color: #231F20;
}
.lockedtopic .flow-topic-title {
@@ -364,6 +364,9 @@
background-repeat: no-repeat;
background-position: left center;
padding-left: 25px;
+
+ /* preserve space on the right, for .flow-topic-actions */
+ margin-right: 30px;
}
.lockedtopic .flow-topic-title:hover {
/* @embed */
@@ -372,6 +375,12 @@
.boardnotice {
color: #318c6d;
padding-right: 5px;
+}
+
+.flow-topic-posts-meta {
+ font-size: 16px;
+ line-height: 28px;
+ color: #808184;
}
/* POST STUFF */
@@ -397,7 +406,6 @@
padding-left: 10px;
padding-top: 10px;
padding-bottom: 10px;
- background-color: #efefef;
}
.unreadpost .flow-post-title {
background-color: #318c6d;
@@ -693,87 +701,55 @@
}
/* Action boxes */
-.flow-actionbox-pokey, .flow-actionbox-pokey {
- /* @embed */
- background-image: url('images/PokeyNorth.png');
- background-repeat: no-repeat;
- width: 21px;
- height: 11px;
- position: absolute;
- z-index: 61000;
- top: 20px;
- right: 10px;
- display:none;
-}
-
-.flow-topic-actionbox, .flow-post-actionbox {
- position: absolute;
- top: 30px;
- right: 0;
- border: 1px solid silver;
- background-color: #ff;
- min-height: 2em;
- width:auto;
- min-width: 100px;
- white-space: nowrap;
- color:
[MediaWiki-commits] [Gerrit] Switch English to kstem. - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Switch English to kstem. .. Switch English to kstem. The old stemmer (Porter) was having trouble with words like aliases and uses. kstem has problems as well, I believe there are fewer of them. Bug: 54811 Bug: 54022 Change-Id: I0722c13f7d023d8ad8a6845403be974262b91054 --- M includes/CirrusSearchAnalysisConfigBuilder.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/CirrusSearchAnalysisConfigBuilder.php b/includes/CirrusSearchAnalysisConfigBuilder.php index cd4ed84..761c14f 100644 --- a/includes/CirrusSearchAnalysisConfigBuilder.php +++ b/includes/CirrusSearchAnalysisConfigBuilder.php @@ -131,7 +131,7 @@ $filters[] = 'possessive_english'; $filters[] = 'lowercase'; $filters[] = 'stop'; - $filters[] = 'porter_stem'; + $filters[] = 'kstem'; $filters[] = 'asciifolding'; $config[ 'analyzer' ][ 'text' ][ 'filter' ] = $filters; -- To view, visit https://gerrit.wikimedia.org/r/86853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0722c13f7d023d8ad8a6845403be974262b91054 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: puppet class to setup browsertests slaves - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: contint: puppet class to setup browsertests slaves
..
contint: puppet class to setup browsertests slaves
We are going to run web browser tests against VisualEditor in labs
instances. The new role::ci::slave::browsertests class provides:
* dependencies for the Jenkins slave agent. Currently that is just the
openjdk-7-jre-headless package. I have split it up from the
role::ci::slave class which is production specific.
* A home dir on /mnt/jenkins-workspace to avoid GlusterFS and use
/dev/vdb where all the disk space is.
* dependencies needed to install qa/browsertests.git which is a ruby
* application providing its own list of gems.
* a localhost vhost listening on 127.0.0.1:9413 and bound to the labs
directory mnt/localhost-browsertests which has plenty of space.
Note that labs provides a jenkins-deploy user, so we do not have to set
up that user like we are doing in role::ci::slave.
bug: 54385
Change-Id: I35f3a9b738fc8f1c594674e63d21e545eca77000
---
M manifests/role/ci.pp
A modules/contint/manifests/browsertests.pp
M modules/jenkins/manifests/slave.pp
A modules/jenkins/manifests/slave/requisites.pp
4 files changed, 90 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 042f2e2..0c79794 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -133,6 +133,55 @@
}
}
+# Common configuration to be applied on any labs Jenkins slave
+class role::ci::slave::labs::common {
+ # Home dir for Jenkins agent
+ #
+ # We will use neither /var/lib (partition too small) nor /home since it is
+ # GlusterFS.
+ #
+ # Instead, create a work dir on /dev/vdb which has all the instance disk
+ # space and is usually mounted on /mnt.
+ file { '/mnt/jenkins-workspace':
+ensure = directory,
+owner = 'jenkins-deploy',
+group = 'wikidev', # useless, but we need a group
+mode = '0775',
+ }
+
+ # The slaves on labs use the `jenkins-deploy` user which is already
+ # configured in labs LDAP. Thus, we only need to install the dependencies
+ # needed by the slave agent.
+ include jenkins::slave::requisites
+}
+
+class role::ci::slave::browsertests {
+
+ system_role { 'role::ci::slave::browsertests':
+description = 'CI Jenkins slave for browser tests' }
+
+ if $::realm != 'labs' {
+fail( 'role::ci::slave::browsertests must only be applied in labs' )
+ }
+
+ include role::ci::slave::labs::common
+
+ # We are in labs context, so use /mnt (== /dev/vdb)
+ # Never EVER think about using GlusterFS.
+ file { '/mnt/localhost-browsertests':
+ ensure = directory,
+ owner = 'jenkins-deploy',
+ group = 'wikidev',
+ mode = '0775',
+ }
+
+ class { 'contint::browsertests':
+docroot = '/mnt/localhost-browsertests',
+require = File['/mnt/localhost-browsertests'],
+ }
+
+}
+
# The testswarm installation
# Although not used as of July 2013, we will resurect this one day.
class role::ci::testswarm {
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
new file mode 100644
index 000..ead8eec
--- /dev/null
+++ b/modules/contint/manifests/browsertests.pp
@@ -0,0 +1,29 @@
+# == Class contint::browsertests
+#
+# == Parameters:
+#
+# *docroot* Where the virtualhost will be pointing to. Default to
+# /srv/localhost/browsertests which is suitable for future production purposes.
+#
+class contint::browsertests(
+ $docroot = '/srv/localhost/browsertests',
+){
+
+# Dependencies for qa/browsertests.git
+package { [
+'ruby-bundler', # installer for qa/browsertests.git
+'rubygems', # dependency of ruby-bundler
+'ruby1.9', # state of the art ruby
+'phantomjs', # headless browser
+]:
+ensure = present
+}
+
+# And we need a vhost :-)
+contint::localvhost { 'browsertests':
+port = 9413,
+docroot= $docroot,
+log_prefix = 'browsertests',
+}
+
+}
diff --git a/modules/jenkins/manifests/slave.pp
b/modules/jenkins/manifests/slave.pp
index ce9fa7e..0612824 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -8,9 +8,7 @@
$workdir = '/var/lib/jenkins-slave',
) {
- package { 'openjdk-7-jre-headless':
-ensure = present,
- }
+ include jenkins::slave::requisites
systemuser { $user:
ensure = present,
diff --git a/modules/jenkins/manifests/slave/requisites.pp
b/modules/jenkins/manifests/slave/requisites.pp
new file mode 100644
index 000..8e85be8
--- /dev/null
+++ b/modules/jenkins/manifests/slave/requisites.pp
@@ -0,0 +1,11 @@
+# == Class: jenkins::slave::requisites
+#
+# Resources commons to all slaves, either in production or in labs
+#
+class jenkins::slave::requisites() {
[MediaWiki-commits] [Gerrit] Use generic Rakefile in nrpe module - change (operations/puppet)
Akosiaris has submitted this change and it was merged.
Change subject: Use generic Rakefile in nrpe module
..
Use generic Rakefile in nrpe module
This makes the Rakefile used to run rspec-puppet tests in nrpe module
fully generic some it can be re-used as is in any other module
Change-Id: I3c97fcc849ba3d38044b6c3c8656f31f08d40f39
---
M modules/nrpe/Rakefile
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Akosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/nrpe/Rakefile b/modules/nrpe/Rakefile
index ed517ca..d9226a8 100644
--- a/modules/nrpe/Rakefile
+++ b/modules/nrpe/Rakefile
@@ -3,14 +3,16 @@
require 'rspec/core/rake_task'
-symlinks = { 'spec/fixtures/modules/nrpe/files' = '../../../../files',
- 'spec/fixtures/modules/nrpe/manifests' = '../../../../manifests',
- 'spec/fixtures/modules/nrpe/templates' = '../../../../templates',
+modulename = File.basename(File.expand_path(File.dirname(__FILE__)))
+
+symlinks = { 'spec/fixtures/modules/%s/files' % modulename =
'../../../../files',
+ 'spec/fixtures/modules/%s/manifests' % modulename = '../../../../manifests',
+ 'spec/fixtures/modules/%s/templates' % modulename = '../../../../templates',
}
task :setup do
- FileUtils.mkdir_p('spec/fixtures/modules/nrpe')
+ FileUtils.mkdir_p('spec/fixtures/modules/%s' % modulename)
symlinks.each do |x|
if !File.exist?(x[0])
FileUtils.ln_s(x[1], x[0])
@@ -20,7 +22,7 @@
task :teardown do
symlinks.each { |x| FileUtils.rm(x[0], :force = true) }
- FileUtils.rmdir('spec/fixtures/modules/nrpe')
+ FileUtils.rmdir('spec/fixtures/modules/%s' % modulename)
FileUtils.rmdir('spec/fixtures/modules')
end
--
To view, visit https://gerrit.wikimedia.org/r/86852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c97fcc849ba3d38044b6c3c8656f31f08d40f39
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Akosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update EasyRdf for for serialization fix. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86858
Change subject: Update EasyRdf for for serialization fix.
..
Update EasyRdf for for serialization fix.
The EasyRdf submodule was updated to a new version to avoid
a bug with the serialization of integers in turtle format.
This change includes regression tests which will fail if the
submodule is not updated.
IMPORTANT: when merging this, send an email to wikidata-tech
telling people to run `git submodule update` after pulling master.
Otherwise, RDF tests will fail on master.
Change-Id: I6f835fb8d007a0e9c5795b1ff30d969e977b4b37
---
M contrib/easyRdf
M repo/includes/rdf/RdfBuilder.php
M repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/RdfSerializerTest.php
4 files changed, 80 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/58/86858/1
diff --git a/contrib/easyRdf b/contrib/easyRdf
index d32c9ee..025c32d 16
--- a/contrib/easyRdf
+++ b/contrib/easyRdf
-Subproject commit d32c9ee9a0bc8867d758209cc4cf2055409b9bc3
+Subproject commit 025c32da17d82a51950230b80c254be5b3dc20d6
diff --git a/repo/includes/rdf/RdfBuilder.php b/repo/includes/rdf/RdfBuilder.php
index 176c95e..ba750b2 100644
--- a/repo/includes/rdf/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -265,9 +265,10 @@
$dataResource-addResource( self::NS_CC . ':license',
'http://creativecommons.org/publicdomain/zero/1.0/' );
if ( $rev ) {
- $dataResource-addLiteral( self::NS_SCHEMA_ORG .
':version', $rev-getId() );
- $dataResource-addLiteral( self::NS_SCHEMA_ORG .
':dateModified', wfTimestamp( TS_ISO_8601, $rev-getTimestamp() ) );
- //TODO: add support for date types to EasyRDF
+ $timestamp = wfTimestamp( TS_ISO_8601,
$rev-getTimestamp() );
+ $dataResource-addLiteral( self::NS_SCHEMA_ORG .
':version', new \EasyRdf_Literal( $rev-getId(), null, 'xsd:integer' ) );
+ $dataResource-addLiteral( self::NS_SCHEMA_ORG .
':dateModified', new \EasyRdf_Literal( $timestamp, null, 'xsd:dateTime' ) );
+ //TODO: add support for property date types to RDF
output
}
//TODO: revision timestamp, revision id, versioned data URI,
current-version-of
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
index bc5fa1b..fa01214 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Test;
use DataTypes\DataTypeFactory;
+use EasyRdf_Literal;
use EasyRdf_Namespace;
use MediaWikiSite;
use ValueFormatters\FormatterOptions;
@@ -124,7 +125,7 @@
*/
protected static function addProperties( \EasyRdf_Graph $graph,
\EasyRdf_Resource $resource, $properties ) {
foreach ( $properties as $prop = $values ) {
- if ( is_scalar( $values ) ) {
+ if ( !is_array( $values ) ) {
$values = array( $values );
}
@@ -168,6 +169,10 @@
),
array(
'rdf:type' = RdfBuilder::NS_SCHEMA_ORG .
':Dataset',
+ 'schema:about' = $builder-getEntityQName(
RdfBuilder::NS_ENTITY, $entities['empty']-getId() ),
+ //'schema:version' = new \EasyRdf_Literal( 23,
null, 'xsd:integer' ),
+ 'schema:version' = new
\EasyRdf_Literal_Integer( 23 ),
+ 'schema:dateModified' = new \EasyRdf_Literal(
'2013-01-01T00:00:00Z', null, 'xsd:dateTime' ),
)
);
@@ -200,6 +205,8 @@
array(
'rdf:type' = RdfBuilder::NS_SCHEMA_ORG .
':Dataset',
'schema:about' = $builder-getEntityQName(
RdfBuilder::NS_ENTITY, $entities['terms']-getId() ),
+ 'schema:version' = new \EasyRdf_Literal( 23,
null, 'xsd:integer' ),
+ 'schema:dateModified' = new \EasyRdf_Literal(
'2013-01-01T00:00:00Z', null, 'xsd:dateTime' ),
)
);
@@ -222,16 +229,24 @@
);
}
- public static function provideAddEntity() {
+ public function provideAddEntity() {
$entities = self::getTestEntities();
$graphs = self::getTestGraphs();
$cases = array();
+ $revision = $this-getMockBuilder( '\Revision' )
+ -disableOriginalConstructor()-getMock();
+
[MediaWiki-commits] [Gerrit] Moved Cucumber hooks to hooks.rb file - change (mediawiki...UniversalLanguageSelector)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86859
Change subject: Moved Cucumber hooks to hooks.rb file
..
Moved Cucumber hooks to hooks.rb file
Bug: 49812
Change-Id: Ib927b824a8854d1c4257a17db582595a22d70470
---
M tests/browser/features/step_definitions/accept_language_steps.rb
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/support/env.rb
A tests/browser/features/support/hooks.rb
4 files changed, 47 insertions(+), 49 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/59/86859/1
diff --git a/tests/browser/features/step_definitions/accept_language_steps.rb
b/tests/browser/features/step_definitions/accept_language_steps.rb
index 41a6183..b1b7dba 100644
--- a/tests/browser/features/step_definitions/accept_language_steps.rb
+++ b/tests/browser/features/step_definitions/accept_language_steps.rb
@@ -1,5 +1,5 @@
Given(/^that my browser's accept language is (.+)$/) do |language|
- @browser = browser(environment, test_name(@scenario),
ENV['SAUCE_ONDEMAND_USERNAME'], ENV['SAUCE_ONDEMAND_ACCESS_KEY'], language)
+ @browser = browser(environment, test_name(@scenario), language)
$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
end
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index a879835..2660db3 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -56,28 +56,11 @@
get_font('body')
end
-After('@reset-preferences-after') do |scenario|
- visit(ResetPreferencesPage)
- on(ResetPreferencesPage).submit_element.click
-end
-
def uls_position()
if !defined?($uls_position)
visit(PanelPage)
$uls_position = @browser.execute_script( return mw.config.get(
'wgULSPosition' ) );
else
$uls_position
- end
-end
-
-Before('@uls-in-sidebar-only') do |scenario|
- if uls_position() != 'interlanguage'
- scenario.skip_invoke!
- end
-end
-
-Before('@uls-in-personal-only') do |scenario|
- if uls_position() != 'personal'
- scenario.skip_invoke!
end
end
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index ca56ddb..e6c0101 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -80,41 +80,10 @@
browser
end
-
def test_name(scenario)
if scenario.respond_to? :feature
#{scenario.feature.name}: #{scenario.name}
elsif scenario.respond_to? :scenario_outline
#{scenario.scenario_outline.feature.name}:
#{scenario.scenario_outline.name}: #{scenario.name}
end
-end
-
-config = YAML.load_file('config/config.yml')
-mediawiki_username = config['mediawiki_username']
-
-Before('@login') do
- puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
-end
-
-Before('@language') do |scenario|
- @language = true
- @scenario = scenario
-end
-
-Before do |scenario|
- @config = config
- @random_string = Random.new.rand.to_s
- @mediawiki_username = mediawiki_username
- unless @language
-@browser = browser(environment, test_name(scenario), 'default')
-$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
- end
-end
-
-After do |scenario|
- if environment == :saucelabs
-sauce_api(%Q{{passed: #{scenario.passed?}}})
-sauce_api(%Q{{public: true}})
- end
- @browser.close unless ENV['KEEP_BROWSER_OPEN'] == 'true'
end
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
new file mode 100644
index 000..ef42a9c
--- /dev/null
+++ b/tests/browser/features/support/hooks.rb
@@ -0,0 +1,46 @@
+config = YAML.load_file('config/config.yml')
+mediawiki_username = config['mediawiki_username']
+
+Before do |scenario|
+ @config = config
+ @random_string = Random.new.rand.to_s
+ @mediawiki_username = mediawiki_username
+ unless @language
+@browser = browser(environment, test_name(scenario), 'default')
+$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
+ end
+end
+
+Before('@language') do |scenario|
+ @language = true
+ @scenario = scenario
+end
+
+Before('@login') do
+ puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
+end
+
+Before('@uls-in-personal-only') do |scenario|
+ if uls_position() != 'personal'
+scenario.skip_invoke!
+ end
+end
+
+Before('@uls-in-sidebar-only') do |scenario|
+ if uls_position() != 'interlanguage'
+scenario.skip_invoke!
+ end
+end
+
+After do |scenario|
+ if
[MediaWiki-commits] [Gerrit] contint: ruby1.9 - ruby1.9.3 - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86860
Change subject: contint: ruby1.9 - ruby1.9.3
..
contint: ruby1.9 - ruby1.9.3
package ruby1.9 does not exist :( sorry.
Change-Id: I37c9989eae70e843675171d0ca4e78cd3887eaef
---
M modules/contint/manifests/browsertests.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/86860/1
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index ead8eec..b799b1e 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -13,7 +13,7 @@
package { [
'ruby-bundler', # installer for qa/browsertests.git
'rubygems', # dependency of ruby-bundler
-'ruby1.9', # state of the art ruby
+'ruby1.9.3', # state of the art ruby
'phantomjs', # headless browser
]:
ensure = present
--
To view, visit https://gerrit.wikimedia.org/r/86860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37c9989eae70e843675171d0ca4e78cd3887eaef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: fix browsertests dependencies - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: contint: fix browsertests dependencies
..
contint: fix browsertests dependencies
package ruby1.9 does not exist :( sorry. We really want ruby1.9.3 which
is installed on the production slaves:
ruby1.9 - ruby1.9.3
Also since we are going to install MediaWiki, we might want Apache and
other php5 packages installed. That is required before setting up the
vhost.
Change-Id: I37c9989eae70e843675171d0ca4e78cd3887eaef
---
M modules/contint/manifests/browsertests.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index ead8eec..a113b05 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -13,17 +13,21 @@
package { [
'ruby-bundler', # installer for qa/browsertests.git
'rubygems', # dependency of ruby-bundler
-'ruby1.9', # state of the art ruby
+'ruby1.9.3', # state of the art ruby
'phantomjs', # headless browser
]:
ensure = present
}
+
+# Set up all packages required for MediaWiki (includes Apache)
+package { 'wikimedia-task-appserver': ensure = present }
# And we need a vhost :-)
contint::localvhost { 'browsertests':
port = 9413,
docroot= $docroot,
log_prefix = 'browsertests',
+require= Package['wikimedia-task-appserver'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37c9989eae70e843675171d0ca4e78cd3887eaef
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable CirrusSearch extra splitting for mw.org. - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/86862 Change subject: Enable CirrusSearch extra splitting for mw.org. .. Enable CirrusSearch extra splitting for mw.org. This splits words in a number of programmer friendly ways like camelCase, snake_case, and PascalCase. Change-Id: I7bb6793ba581ea0dd7d40f1f51adfe97e8f34968 --- M wmf-config/CirrusSearch-common.php M wmf-config/InitialiseSettings.php 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/62/86862/1 diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index 0b93555..09d6b00 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -39,6 +39,8 @@ ); } +$wgCirrusSearchUseAggressiveSplitting = $wmgUseCirrusAggressiveSplitting; + # Load per realm specific configuration, either: # - CirrusSearch-labs.php # - CirrusSearch-production.php diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index de3764f..e36a6bd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12637,6 +12637,13 @@ 'enwikisource' = true, ), +// Note that changing this on any supported (English) wiki requires an in place +// reindex of that wiki to take effect. +'wmgUseCirrusAggressiveSplitting' = array( + 'default' = false, + 'mediawikiwiki' = true, +), + ### End (roughly) of general extensions // Apply blocks to IPs in XFF (bug 23343) -- To view, visit https://gerrit.wikimedia.org/r/86862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bb6793ba581ea0dd7d40f1f51adfe97e8f34968 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct twnmp-show-more-projects to say all projects - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged. Change subject: Correct twnmp-show-more-projects to say all projects .. Correct twnmp-show-more-projects to say all projects More projects seems to imply they are other/the other projects, while the link opens the full list of projects via the group selector. Change-Id: I1159d75835789cb480646cda5459e185b190b39d --- M MainPage.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/MainPage.i18n.php b/MainPage.i18n.php index 2a130c6..87f9a09 100644 --- a/MainPage.i18n.php +++ b/MainPage.i18n.php @@ -23,7 +23,7 @@ 'twnmp-bannerwho' = 'Image $1', - 'twnmp-show-more-projects' = 'Show more projects...', + 'twnmp-show-more-projects' = 'Show all projects...', 'twnmp-brand-motto' = 'Open source translation community', 'twnmp-login' = 'Log in', 'twnmp-logout' = 'Log out', -- To view, visit https://gerrit.wikimedia.org/r/86755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1159d75835789cb480646cda5459e185b190b39d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Pginer pgi...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tests for places where kstem beats porter stemmer. - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Tests for places where kstem beats porter stemmer.
..
Tests for places where kstem beats porter stemmer.
Bug: 54022
Bug: 54811
Change-Id: Ic853942da54b0fd23da4a5e6cd448c4826100772
---
M tests/browser/features/full_text.feature
M tests/browser/features/support/build_pages.rb
2 files changed, 24 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/full_text.feature
b/tests/browser/features/full_text.feature
index 74bcdaa..591f172 100644
--- a/tests/browser/features/full_text.feature
+++ b/tests/browser/features/full_text.feature
@@ -251,7 +251,7 @@
@exact_quotes
Scenario: Adding a ~ to a phrase stops it from matching stop words
-When I search for doesn't actually Contains A Stop Word~
+When I search for doesn't actually Contain A Stop Words~
Then Doesn't Actually Contain Stop Words is the first search result
@setup_main @exact_quotes
@@ -288,3 +288,16 @@
| pascalCase | PascalCase |
| pascal_case | PascalCase |
| PascalCase | PascalCase |
+
+ @stemmer
+ Scenario Outline: Stemming works as expected
+When I search for StemmerTest term
+Then result is the first search result
+ Examples:
+| term |result|
+| aliases | StemmerTest Aliases |
+| alias| StemmerTest Aliases |
+| used | StemmerTest Used |
+| uses | StemmerTest Used |
+| use | StemmerTest Used |
+| us | none |
diff --git a/tests/browser/features/support/build_pages.rb
b/tests/browser/features/support/build_pages.rb
index 4626eaa..47295e4 100644
--- a/tests/browser/features/support/build_pages.rb
+++ b/tests/browser/features/support/build_pages.rb
@@ -150,3 +150,13 @@
$programmer_friendly = true
end
end
+
+Before('@stemmer') do
+ if !$stemmer
+steps %Q{
+ Given a page named StemmerTest Aliases exists
+ And a page named StemmerTest Used exists
+}
+ end
+ $stemmer = true
+end
--
To view, visit https://gerrit.wikimedia.org/r/86854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic853942da54b0fd23da4a5e6cd448c4826100772
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding ulsfo as valid site for lvs_services:text-varnish, bi... - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Adding ulsfo as valid site for lvs_services:text-varnish, bits,
upload and mobile.
..
Adding ulsfo as valid site for lvs_services:text-varnish, bits, upload and
mobile.
Removing https, ipv6 and text from list of lvs_balancer_ips in ulsfo
Change-Id: Ic03612e1761099f6b9f97c92c53143a5cd4f21d3
---
M manifests/lvs.pp
M manifests/site.pp
2 files changed, 20 insertions(+), 39 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 05881ed..20c85eb 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -145,18 +145,7 @@
'mediawikilb' = 91.198.174.232,
'foundationlb' = 91.198.174.235,
},
- 'ulsfo' = {
- 'textsvc' = 10.2.4.25,
- 'wikipedialb' = 198.35.26.97,
- 'wiktionarylb' = 198.35.26.98,
- 'wikiquotelb' = 198.35.26.99,
- 'wikibookslb' = 198.35.26.100,
- 'wikisourcelb' = 198.35.26.101,
- 'wikinewslb'= 198.35.26.102,
- 'wikiversitylb' = 198.35.26.103,
- 'mediawikilb' = 198.35.26.104,
- 'foundationlb' = 198.35.26.105,
- },
+ 'ulsfo' = {},
},
'text-varnish' = {
'pmtpa' = {
@@ -175,9 +164,19 @@
'wikivoyagelb' = '91.198.174.238',
},
'ulsfo' = {
- 'wikimedialb' = '198.35.26.96',
- 'wikidatalb' = '198.35.26.114',
- 'wikivoyagelb' = '198.35.26.115',
+ 'textsvc' = 10.2.4.25,
+ 'wikimedialb' = '198.35.26.96',
+ 'wikipedialb' = 198.35.26.97,
+ 'wiktionarylb' = 198.35.26.98,
+ 'wikiquotelb' = 198.35.26.99,
+ 'wikibookslb' = 198.35.26.100,
+ 'wikisourcelb' = 198.35.26.101,
+ 'wikinewslb'= 198.35.26.102,
+ 'wikiversitylb' = 198.35.26.103,
+ 'mediawikilb' = 198.35.26.104,
+ 'foundationlb' = 198.35.26.105,
+ 'wikidatalb'= '198.35.26.114',
+ 'wikivoyagelb' = '198.35.26.115',
},
},
'https' = {
@@ -278,6 +277,7 @@
'wikidatalbsecure6' =
2620:0:862:ed1a::12,
'wikivoyagelbsecure6' =
2620:0:862:ed1a::13
},
+ 'ulsfo' = {}
},
'ipv6' = {
'pmtpa' = {
@@ -324,23 +324,7 @@
'wikidatalb6' = 2620:0:862:ed1a::12,
'wikivoyagelb6' = 2620:0:862:ed1a::13
},
- 'ulsfo' = {
- 'wikimedialb6' =
2620:0:863:ed1a::0,
- 'wikipedialb6' =
2620:0:863:ed1a::1,
- 'wiktionarylb6' =
2620:0:863:ed1a::2,
- 'wikiquotelb6' =
2620:0:863:ed1a::3,
- 'wikibookslb6' =
2620:0:863:ed1a::4,
- 'wikisourcelb6' =
2620:0:863:ed1a::5,
- 'wikinewslb6'=
2620:0:863:ed1a::6,
- 'wikiversitylb6' =
2620:0:863:ed1a::7,
- 'mediawikilb6' =
2620:0:863:ed1a::8,
- 'foundationlb6' =
2620:0:863:ed1a::9,
- 'bitslb6'=
2620:0:863:ed1a::a,
- 'uploadlb6' =
2620:0:863:ed1a::b,
- 'mobilelb6' =
2620:0:863:ed1a::c,
-
[MediaWiki-commits] [Gerrit] Enable CirrusSearch extra splitting for mw.org. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable CirrusSearch extra splitting for mw.org. .. Enable CirrusSearch extra splitting for mw.org. This splits words in a number of programmer friendly ways like camelCase, snake_case, and PascalCase. Change-Id: I7bb6793ba581ea0dd7d40f1f51adfe97e8f34968 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index de3764f..e3f7f69 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12637,6 +12637,13 @@ 'enwikisource' = true, ), +// Note that changing this on any supported (English) wiki requires an in place +// reindex of that wiki to take effect. +'wgCirrusSearchUseAggressiveSplitting' = array( + 'default' = false, + 'mediawikiwiki' = true, +), + ### End (roughly) of general extensions // Apply blocks to IPs in XFF (bug 23343) -- To view, visit https://gerrit.wikimedia.org/r/86862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bb6793ba581ea0dd7d40f1f51adfe97e8f34968 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add sqlite tableDefinitaionReader funcionality - change (mediawiki...WikibaseDatabase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: add sqlite tableDefinitaionReader funcionality
..
add sqlite tableDefinitaionReader funcionality
Change-Id: I0dbb119d382981951b2d678393289f1867123911
---
M src/SQLite/SQLiteTableDefinitionReader.php
A tests/phpunit/SQLite/SQLiteTableDefinitionReaderTest.php
2 files changed, 217 insertions(+), 1 deletion(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/SQLite/SQLiteTableDefinitionReader.php
b/src/SQLite/SQLiteTableDefinitionReader.php
index c153a1a..57f9280 100644
--- a/src/SQLite/SQLiteTableDefinitionReader.php
+++ b/src/SQLite/SQLiteTableDefinitionReader.php
@@ -3,6 +3,9 @@
namespace Wikibase\Database\SQLite;
use Wikibase\Database\QueryInterface\QueryInterface;
+use Wikibase\Database\QueryInterface\QueryInterfaceException;
+use Wikibase\Database\Schema\Definitions\FieldDefinition;
+use Wikibase\Database\Schema\Definitions\IndexDefinition;
use Wikibase\Database\Schema\Definitions\TableDefinition;
use Wikibase\Database\Schema\TableDefinitionReader;
@@ -10,11 +13,15 @@
* @since 0.1
* @licence GNU GPL v2+
* @author Jeroen De Dauw jeroended...@gmail.com
+ * @author Adam Shorland
*/
class SQLiteTableDefinitionReader implements TableDefinitionReader {
protected $queryInterface;
+ /**
+* @param QueryInterface $queryInterface
+*/
public function __construct( QueryInterface $queryInterface ) {
$this-queryInterface = $queryInterface;
}
@@ -24,10 +31,121 @@
*
* @param string $tableName
*
+* @throws QueryInterfaceException
* @return TableDefinition
*/
public function readDefinition( $tableName ) {
- // TODO
+ if( !$this-queryInterface-tableExists( $tableName ) ){
+ throw new QueryInterfaceException( Unknown table
{$tableName} );
+ }
+
+ $fields = $this-getFields( $tableName );
+ $indexes = $this-getIndexes( $tableName );
+ $keys = $this-getPrimaryKeys( $tableName );
+ return new TableDefinition( $tableName, $fields, array_merge(
$indexes, $keys ) );
+ }
+
+ private function getFields( $tableName ) {
+ $results = $this-queryInterface-select(
+ 'sqlite_master',
+ array( 'name', 'sql' ),
+ array( 'type' = 'table', 'tbl_name' = $tableName )
+ );
+
+ if( iterator_count( $results ) 1 ){
+ throw new QueryInterfaceException( More than one set
of fields returned for {$tableName} );
+ }
+ $fields = array();
+
+ foreach( $results as $result ){
+ preg_match( '/CREATE TABLE ([^ ]+) \(([^\)]+)\)/',
$result['sql'], $createParts );
+ /** 1 = tableName, 2 = fieldParts (fields, keys,
etc.) */
+
+ foreach( explode( ',', $createParts[2] ) as $fieldSql ){
+ if( preg_match( '/([^ ]+) ([^ ]+)( DEFAULT ([^
]+))?( ((NOT )?NULL))?/', $fieldSql, $fieldParts )
+ $fieldParts[0] !== 'PRIMARY KEY' ){
+ /** 1 = column, 2 = type, 4 =
default, 6 = NotNull */
+
+ $type = $fieldParts[2];
+ switch ( $type ) {
+ case 'BOOL':
+ $type = 'bool';
+ break;
+ case 'BLOB':
+ $type = 'str';
+ break;
+ case 'INT':
+ $type = 'int';
+ break;
+ case 'FLOAT':
+ $type = 'float';
+ break;
+ }
+
+ if( !empty( $fieldParts[4] ) ){
+ $default = $fieldParts[4];
+ } else {
+ $default = null;
+ }
+
+ if( $fieldParts[6] === 'NOT NULL' ){
+ $null = false;
+ } else {
+ $null =
[MediaWiki-commits] [Gerrit] Specifying ulsfo lvs hosts for high-traffic1 and high-traffi... - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86863
Change subject: Specifying ulsfo lvs hosts for high-traffic1 and high-traffic2
in $lvs_class_hosts.
..
Specifying ulsfo lvs hosts for high-traffic1 and high-traffic2 in
$lvs_class_hosts.
Change-Id: Idae558a2c5720f2215ce3abac1f40f59ca00e269
---
M manifests/lvs.pp
1 file changed, 28 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/86863/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 20c85eb..e927ae6 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -13,6 +13,7 @@
'pmtpa' = [ lvs2, lvs6 ],
'eqiad' = [ lvs1001, lvs1004 ],
'esams' = [ amslvs1, amslvs3 ],
+ 'ulsfo' = [ lvs4001, lvs4003 ],
default = undef,
},
'labs' = $::site ? {
@@ -26,6 +27,7 @@
'pmtpa' = [ lvs1, lvs5 ],
'eqiad' = [ lvs1002, lvs1005 ],
'esams' = [ amslvs2, amslvs4 ],
+ 'ulsfo' = [ lvs4002, lvs4004 ],
default = undef,
},
'labs' = $::site ? {
@@ -164,19 +166,32 @@
'wikivoyagelb' = '91.198.174.238',
},
'ulsfo' = {
- 'textsvc' = 10.2.4.25,
- 'wikimedialb' = '198.35.26.96',
- 'wikipedialb' = 198.35.26.97,
- 'wiktionarylb' = 198.35.26.98,
- 'wikiquotelb' = 198.35.26.99,
- 'wikibookslb' = 198.35.26.100,
- 'wikisourcelb' = 198.35.26.101,
- 'wikinewslb'= 198.35.26.102,
- 'wikiversitylb' = 198.35.26.103,
- 'mediawikilb' = 198.35.26.104,
- 'foundationlb' = 198.35.26.105,
- 'wikidatalb'= '198.35.26.114',
- 'wikivoyagelb' = '198.35.26.115',
+ 'textsvc'= '10.2.4.25',
+ 'wikimedialb'= '198.35.26.96',
+ 'wikimedialb6' =
'2620:0:863:ed1a::0',
+ 'wikipedialb'= '198.35.26.97',
+ 'wikipedialb6' =
'2620:0:863:ed1a::1',
+ 'wiktionarylb' = '198.35.26.98',
+ 'wiktionarylb6' =
'2620:0:863:ed1a::2',
+ 'wikiquotelb'= '198.35.26.99',
+ 'wikiquotelb6' =
'2620:0:863:ed1a::3',
+ 'wikibookslb'= '198.35.26.100',
+ 'wikibookslb6' =
'2620:0:863:ed1a::4',
+ 'wikisourcelb' = '198.35.26.101',
+ 'wikisourcelb6' =
'2620:0:863:ed1a::5',
+ 'wikinewslb' = '198.35.26.102',
+ 'wikinewslb6'=
'2620:0:863:ed1a::6',
+ 'wikiversitylb' = '198.35.26.103',
+ 'wikiversitylb6' =
'2620:0:863:ed1a::7',
+ 'mediawikilb'= '198.35.26.104',
+ 'mediawikilb6' =
'2620:0:863:ed1a::8',
+ 'foundationlb' = '198.35.26.105',
+ 'foundationlb6' =
'2620:0:863:ed1a::9',
+ 'wikidatalb' = '198.35.26.114',
+ 'wikidatalb6'=
'2620:0:863:ed1a::d',
+ 'wikivoyagelb' = '198.35.26.115',
+ 'wikivoyagelb6' =
'2620:0:863:ed1a::e',
+
},
},
'https' = {
--
To view, visit https://gerrit.wikimedia.org/r/86863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idae558a2c5720f2215ce3abac1f40f59ca00e269
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
[MediaWiki-commits] [Gerrit] contint: Apache could not start without IPv6 - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86864
Change subject: contint: Apache could not start without IPv6
..
contint: Apache could not start without IPv6
Whenever we are lacking IPv6 (aka in labs), the `Listen [:1]:80`
statement would prevent Apache from starting up.
The has_ipv6 variable in the template would let us skip the IPv6 listen
statement. Disable it for labs realm.
Change-Id: I507dbed356fac0b40f749655ac5d2e55618b875b
---
M modules/contint/manifests/localvhost.pp
M modules/contint/templates/apache/listen.erb
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/86864/1
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
index 9078c92..5aa35c6 100644
--- a/modules/contint/manifests/localvhost.pp
+++ b/modules/contint/manifests/localvhost.pp
@@ -27,6 +27,14 @@
content = template('contint/apache/localvhost.erb'),
}
+# Asking Apache to listen on [:1] without IPv6 ends up causing
+# an error preventing Apache from starting up.
+$has_ipv6 = $::realm ? {
+'labs' = false,
+'production' = true,
+default = true,
+}
+
file { /etc/apache2/conf.d/listen-localhost-${port}:
content = template('contint/apache/listen.erb'),
}
diff --git a/modules/contint/templates/apache/listen.erb
b/modules/contint/templates/apache/listen.erb
index 5317ea1..30926c1 100644
--- a/modules/contint/templates/apache/listen.erb
+++ b/modules/contint/templates/apache/listen.erb
@@ -6,4 +6,6 @@
# Ports Apache is listening to in addition to the default ports:
Listen 127.0.0.1:%= @port % http
+% if @has_ipv6 -%
Listen [::1]:%= @port % http
+% end -%
--
To view, visit https://gerrit.wikimedia.org/r/86864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I507dbed356fac0b40f749655ac5d2e55618b875b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: Apache could not start without IPv6 - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: contint: Apache could not start without IPv6
..
contint: Apache could not start without IPv6
Whenever we are lacking IPv6 (aka in labs), the `Listen [:1]:80`
statement would prevent Apache from starting up.
The has_ipv6 variable in the template would let us skip the IPv6 listen
statement. Disable it for labs realm.
Change-Id: I507dbed356fac0b40f749655ac5d2e55618b875b
---
M modules/contint/manifests/localvhost.pp
M modules/contint/templates/apache/listen.erb
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
index 9078c92..5aa35c6 100644
--- a/modules/contint/manifests/localvhost.pp
+++ b/modules/contint/manifests/localvhost.pp
@@ -27,6 +27,14 @@
content = template('contint/apache/localvhost.erb'),
}
+# Asking Apache to listen on [:1] without IPv6 ends up causing
+# an error preventing Apache from starting up.
+$has_ipv6 = $::realm ? {
+'labs' = false,
+'production' = true,
+default = true,
+}
+
file { /etc/apache2/conf.d/listen-localhost-${port}:
content = template('contint/apache/listen.erb'),
}
diff --git a/modules/contint/templates/apache/listen.erb
b/modules/contint/templates/apache/listen.erb
index 5317ea1..30926c1 100644
--- a/modules/contint/templates/apache/listen.erb
+++ b/modules/contint/templates/apache/listen.erb
@@ -6,4 +6,6 @@
# Ports Apache is listening to in addition to the default ports:
Listen 127.0.0.1:%= @port % http
+% if @has_ipv6 -%
Listen [::1]:%= @port % http
+% end -%
--
To view, visit https://gerrit.wikimedia.org/r/86864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I507dbed356fac0b40f749655ac5d2e55618b875b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .deploy to a system-wide ignore file - change (operations/puppet)
Ryan Lane has submitted this change and it was merged.
Change subject: Add .deploy to a system-wide ignore file
..
Add .deploy to a system-wide ignore file
All repos on the deployment system should ignore .deploy; this
change adds this ignore system-wide.
Change-Id: I0a7ec71786b0105ea4cc278c56fa38bd5dbcf6c1
---
M modules/deployment/manifests/deployment_server.pp
M modules/deployment/templates/git-deploy/gitconfig.erb
A modules/deployment/templates/git-deploy/gitignore.erb
3 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/deployment/manifests/deployment_server.pp
b/modules/deployment/manifests/deployment_server.pp
index 0c957a6..47ce313 100644
--- a/modules/deployment/manifests/deployment_server.pp
+++ b/modules/deployment/manifests/deployment_server.pp
@@ -1,4 +1,4 @@
-class
deployment::deployment_server($deployment_conffile=/etc/git-deploy/git-deploy.conf,
$deployment_restrict_umask=002,
$deployment_block_file=/etc/ROLLOUTS_BLOCKED, $deployment_support_email=,
$deployment_repo_name_detection=dot-git-parent-dir,
$deployment_announce_email=, $deployment_send_mail_on_sync=false,
$deployment_send_mail_on_revert=false,
$deployment_log_directory=/var/log/git-deploy,
$deployment_log_timing_data=false,
$deployment_git_deploy_dir=/var/lib/git-deploy,
$deployment_per_repo_config={}) {
+class
deployment::deployment_server($deployment_conffile=/etc/git-deploy/git-deploy.conf,
$deployment_ignorefile=/etc/git-deploy/gitignore,
$deployment_ignores=['.deploy'], $deployment_restrict_umask=002,
$deployment_block_file=/etc/ROLLOUTS_BLOCKED, $deployment_support_email=,
$deployment_repo_name_detection=dot-git-parent-dir,
$deployment_announce_email=, $deployment_send_mail_on_sync=false,
$deployment_send_mail_on_revert=false,
$deployment_log_directory=/var/log/git-deploy,
$deployment_log_timing_data=false,
$deployment_git_deploy_dir=/var/lib/git-deploy,
$deployment_per_repo_config={}) {
if ! defined(Package[git-deploy]){
package { git-deploy:
ensure = present;
@@ -71,6 +71,11 @@
mode = 0444,
owner = root,
group = root;
+${deployment_ignorefile}:
+ content = template(deployment/git-deploy/gitignore.erb),
+ mode = 0444,
+ owner = root,
+ group = root;
/usr/local/bin/deploy-info:
owner = root,
group = root,
diff --git a/modules/deployment/templates/git-deploy/gitconfig.erb
b/modules/deployment/templates/git-deploy/gitconfig.erb
index f439c6b..48bd6c8 100644
--- a/modules/deployment/templates/git-deploy/gitconfig.erb
+++ b/modules/deployment/templates/git-deploy/gitconfig.erb
@@ -1,2 +1,4 @@
[deploy]
config-file = %= deployment_conffile %
+[core]
+ excludesfile = %= deployment_ignorefile %
diff --git a/modules/deployment/templates/git-deploy/gitignore.erb
b/modules/deployment/templates/git-deploy/gitignore.erb
new file mode 100644
index 000..db6ca81
--- /dev/null
+++ b/modules/deployment/templates/git-deploy/gitignore.erb
@@ -0,0 +1,3 @@
+% deployment_ignores.each do |deployment_ignore| %
+%= deployment_ignore %
+% end %
--
To view, visit https://gerrit.wikimedia.org/r/86749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a7ec71786b0105ea4cc278c56fa38bd5dbcf6c1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing lvs4002, 4 lvs_balancer_ip assignment - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86866
Change subject: Fixing lvs4002,4 lvs_balancer_ip assignment
..
Fixing lvs4002,4 lvs_balancer_ip assignment
Change-Id: I1692b0f9fdcea660f648a4eb9b654d44b1a814ae
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/86866/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 0430e85..0b2ee80 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1677,10 +1677,10 @@
$sip['text-varnish'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
-],
-/^lvs[24]$/ = [
+],
+/^lvs400[24]$/ = [
$sip['upload'][$::site],
-]
+],
}
class { lvs::balancer: service_ips = $lvs_balancer_ips }
--
To view, visit https://gerrit.wikimedia.org/r/86866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1692b0f9fdcea660f648a4eb9b654d44b1a814ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing lvs4002, 4 lvs_balancer_ip assignment - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Fixing lvs4002,4 lvs_balancer_ip assignment
..
Fixing lvs4002,4 lvs_balancer_ip assignment
Change-Id: I1692b0f9fdcea660f648a4eb9b654d44b1a814ae
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 0430e85..0b2ee80 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1677,10 +1677,10 @@
$sip['text-varnish'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
-],
-/^lvs[24]$/ = [
+],
+/^lvs400[24]$/ = [
$sip['upload'][$::site],
-]
+],
}
class { lvs::balancer: service_ips = $lvs_balancer_ips }
--
To view, visit https://gerrit.wikimedia.org/r/86866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1692b0f9fdcea660f648a4eb9b654d44b1a814ae
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cache ResourceLoader modules in localStorage - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86867
Change subject: Cache ResourceLoader modules in localStorage
..
Cache ResourceLoader modules in localStorage
WIP
Change-Id: If2ad2d80db2336fb447817f5c56599667141ec66
---
M resources/mediawiki/mediawiki.js
1 file changed, 68 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/67/86867/1
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 39093e3..649c6b3 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -290,6 +290,35 @@
}
};
+ function Cache( name ) {
+ this.name = name;
+ return this;
+ }
+
+ Cache.prototype = $.extend( {
+ init: function ( version ) {
+ try {
+ this.values = JSON.parse( localStorage.getItem(
this.name ) )
+ || { version: version };
+ // If the cached version identifier is
different than the one
+ // supplied to the constructor, invalidate the
cache.
+ if ( this.get( 'version' ) !== version ) {
+ localStorage.removeItem( this.name );
+ }
+ } catch ( e ) {
+ // Pass.
+ }
+ },
+ update: function () {
+ try {
+ localStorage.setItem( this.name,
JSON.stringify( this.values ) );
+ return true;
+ } catch ( e ) {
+ return false;
+ }
+ }
+ }, Map.prototype );
+
/**
* Base library for MediaWiki.
*
@@ -444,6 +473,8 @@
queue = [],
// List of callback functions waiting for
modules to be ready to be called
jobs = [],
+ // Cache of locally-stored module sources
+ cache = new Cache( 'ResourceLoader' ),
// Selector cache for the marker element. Use
getMarker() to get/use the marker!
$marker = null,
// Buffer for addEmbeddedCSS.
@@ -451,7 +482,16 @@
// Callbacks for addEmbeddedCSS.
cssCallbacks = $.Callbacks();
+ // Do nothing.
+
/* Private methods */
+
+ function makeModuleKey( moduleName ) {
+ if ( !registry[moduleName] ) {
+ return false;
+ }
+ return moduleName + ':' +
registry[moduleName].version;
+ }
function getMarker() {
// Cached ?
@@ -1259,6 +1299,21 @@
}
}
}
+
+ cache.init( mw.config.get( 'wgVersion'
) );
+ window.onload = function () {
+ cache.update();
+ }
+
+ batch = $.grep( batch, function (
module ) {
+ source = cache.get(
makeModuleKey( module ) );
+ if ( source ) {
+ $.globalEval( source );
+ return false;
+ }
+ return true;
+ } );
+
// Early exit if there's nothing to
load...
if ( !batch.length ) {
return;
@@ -1490,6 +1545,19 @@
registry[module].script = script;
registry[module].style = style;
registry[module].messages = msgs;
+
+
+ try {
+ cache.set( makeModuleKey(
module ), 'mw.loader.implement(' + [
+ '' + module + '',
+
[MediaWiki-commits] [Gerrit] WIP WIP browsertests for extension WIP WIP - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86868
Change subject: WIP WIP browsertests for extension WIP WIP
..
WIP WIP browsertests for extension WIP WIP
Change-Id: I4e7da6628395ab8eebb9cbd6a0a60d3f33759b18
---
M mediawiki-extensions.yaml
1 file changed, 36 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/68/86868/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 397cfe3..0b4c044 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -1,3 +1,39 @@
+# Parameters: dependencies
+- job-template:
+name: '{name}-{ext-name}-browsertests'
+node: integration-selenium-driver # has the browsertest vhost
+defaults: use-zuul-for-mw-ext
+triggers:
+ - zuul
+
+builders:
+ # setup mediawiki master + extension dependencies
+ - mw-setup-extension:
+mwbranch: 'master'
+dependencies: '{dependencies}'
+ - shell: |
+#!/bin/bash -x
+TEST_ID=`echo $ZUUL_PROJECT/$ZUUL_COMMIT/$BUILD_NUMBER | tr '/' '-'`
+# Post configure MediaWiki
+echo
+ # Injected by Jenkins
+ \$wgServer = 'http://localhost:9413/';
+ \$wgScriptPath = '/${TEST_ID}';
+ \$wgScript = \$wgStylePath = \$wgLogo = false;
+$WORKSPACE/LocalSettings.php
+
+# On labs:
+DOCROOT=/mnt/localhost-browsertests
+
+# Publish WORKSPACE in Apache
+ln -s $WORKSPACE $DOCROOT/$TEST_ID
+curl --include http://localhost:9413/$TEST_ID/index.php; |head -n42
+
+# Run browser tests?
+# FIXME: got to fetch artifacts from qa/browserstack job
+
+rm $DOCROOT/$TEST_ID
+
- job-template:
# TODO: Use global '{name}-phplint' template instead
name: '{name}-{ext-name}-lint'
--
To view, visit https://gerrit.wikimedia.org/r/86868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e7da6628395ab8eebb9cbd6a0a60d3f33759b18
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add sartoris user with optional secondary groups - change (operations/puppet)
Ryan Lane has submitted this change and it was merged.
Change subject: Add sartoris user with optional secondary groups
..
Add sartoris user with optional secondary groups
For the frontend, we want to be able to specify the deployment
repos via puppet git::clone. The repos should be owned by a common
non-root user, though.
Change-Id: I09a87dbfae8f70c7c823bfb553db55146ad6584c
---
M manifests/role/deployment.pp
M modules/deployment/manifests/deployment_server.pp
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 0dd2f5b..ab7d143 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -164,7 +164,9 @@
# Can't include this while scap is present on tin:
# include misc::deployment::scripts
- class { deployment::deployment_server: }
+ class { deployment::deployment_server:
+deployer_groups = ['wikidev'],
+ }
deployment::deployment_repo_sync_hook_link { private: target =
shared.py }
deployment::deployment_repo_sync_hook_link { common: target = shared.py
}
diff --git a/modules/deployment/manifests/deployment_server.pp
b/modules/deployment/manifests/deployment_server.pp
index 47ce313..d7bf7aa 100644
--- a/modules/deployment/manifests/deployment_server.pp
+++ b/modules/deployment/manifests/deployment_server.pp
@@ -1,4 +1,4 @@
-class
deployment::deployment_server($deployment_conffile=/etc/git-deploy/git-deploy.conf,
$deployment_ignorefile=/etc/git-deploy/gitignore,
$deployment_ignores=['.deploy'], $deployment_restrict_umask=002,
$deployment_block_file=/etc/ROLLOUTS_BLOCKED, $deployment_support_email=,
$deployment_repo_name_detection=dot-git-parent-dir,
$deployment_announce_email=, $deployment_send_mail_on_sync=false,
$deployment_send_mail_on_revert=false,
$deployment_log_directory=/var/log/git-deploy,
$deployment_log_timing_data=false,
$deployment_git_deploy_dir=/var/lib/git-deploy,
$deployment_per_repo_config={}) {
+class
deployment::deployment_server($deployment_conffile=/etc/git-deploy/git-deploy.conf,
$deployment_ignorefile=/etc/git-deploy/gitignore,
$deployment_ignores=['.deploy'], $deployment_restrict_umask=002,
$deployment_block_file=/etc/ROLLOUTS_BLOCKED, $deployment_support_email=,
$deployment_repo_name_detection=dot-git-parent-dir,
$deployment_announce_email=, $deployment_send_mail_on_sync=false,
$deployment_send_mail_on_revert=false,
$deployment_log_directory=/var/log/git-deploy,
$deployment_log_timing_data=false,
$deployment_git_deploy_dir=/var/lib/git-deploy,
$deployment_per_repo_config={}, $deployer_groups=[]) {
if ! defined(Package[git-deploy]){
package { git-deploy:
ensure = present;
@@ -92,4 +92,7 @@
grain = deployment_server,
value = True;
}
+ systemuser {
+sartoris: name = sartoris, shell = /bin/false, home =
/nonexistent, groups = $deployer_groups
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/86756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09a87dbfae8f70c7c823bfb553db55146ad6584c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
