jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393493 )
Change subject: puppet4: Update rake tests and fix errors
......................................................................
puppet4: Update rake tests and fix errors
* Update Gemfile to test with Rubocop 0.51
* Update Gemfile to test with Puppet 4.8.2
* Update Gemfile to test with Puppet-lint 2.3.3
* Disable new rubocop errors
* Fix Puppet4 lint errors
* Run cucumber inline with rake process. Fixes a working directory
related error in local testing environment.
Bug: T181354
Change-Id: I753a57d55636c5a398d2b80cfe976946367d3c51
---
M .gitignore
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
M Rakefile
M puppet/manifests/site.pp
M puppet/modules/mediawiki/manifests/wiki.pp
M puppet/modules/role/manifests/articlecreationworkflow.pp
M puppet/modules/role/manifests/articleplaceholder.pp
M puppet/modules/role/manifests/betafeatures.pp
M puppet/modules/role/manifests/cldr.pp
M puppet/modules/role/manifests/commons.pp
M puppet/modules/role/manifests/education.pp
M puppet/modules/role/manifests/eventbus.pp
M puppet/modules/role/manifests/eventlogging.pp
M puppet/modules/role/manifests/flow.pp
M puppet/modules/role/manifests/gadgets2.pp
M puppet/modules/role/manifests/geodata.pp
M puppet/modules/role/manifests/geodata_elastic.pp
M puppet/modules/role/manifests/jsonconfig.pp
M puppet/modules/role/manifests/offline.pp
M puppet/modules/role/manifests/poolcounter.pp
M puppet/modules/role/manifests/questycaptcha.pp
M puppet/modules/role/manifests/restbase.pp
M puppet/modules/role/manifests/semanticmediawiki.pp
M puppet/modules/role/manifests/simple_performant.pp
M puppet/modules/role/manifests/visualeditor.pp
M puppet/modules/role/manifests/wikidata.pp
M puppet/modules/role/manifests/zero.pp
30 files changed, 159 insertions(+), 126 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 4bfa27f..919a88f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/.gem
/.idea
/.rbenv-version
+/.ruby-version
/.settings.yaml
/.yardoc/
/*.gem
diff --git a/.rubocop.yml b/.rubocop.yml
index f7a8364..e8367dd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -30,7 +30,7 @@
# Ignoring for now as many instances of strictly aligned parameters look
# strange
-Style/AlignParameters:
+Layout/AlignParameters:
Enabled: false
Style/NumericLiterals:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 87348c8..784972e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -33,7 +33,7 @@
# Offense count: 7
# Configuration parameters: Exclude.
-Style/FileName:
+Naming/FileName:
Exclude:
- 'lib/labs-vagrant.rb'
- 'lib/mediawiki-vagrant.rb'
@@ -72,9 +72,46 @@
# Offense count: 5
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
+Style/TrailingCommaInArguments:
Exclude:
- 'Vagrantfile'
- 'lib/mediawiki-vagrant/config.rb'
- 'lib/mediawiki-vagrant/hiera.rb'
- 'lib/mediawiki-vagrant/roles/change.rb'
+
+# Checks turned off when updating to rubocop 0.51
+Style/SymbolArray:
+ Enabled: false
+
+Style/TrailingCommaInLiteral:
+ Enabled: false
+
+Naming/HeredocDelimiterNaming:
+ Enabled: false
+
+Style/NumericPredicate:
+ Enabled: false
+
+Performance/HashEachMethods:
+ Enabled: false
+
+Style/PercentLiteralDelimiters:
+ Enabled: false
+
+Naming/HeredocDelimiterCase:
+ Enabled: false
+
+Lint/RescueWithoutErrorClass:
+ Enabled: false
+
+Layout/EmptyLines:
+ Enabled: false
+
+Layout/EmptyLinesAroundMethodBody:
+ Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+ Enabled: false
+
+Style/ClassAndModuleChildren:
+ Enabled: false
diff --git a/Gemfile b/Gemfile
index ac5462f..46d7c7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,20 +4,18 @@
# Upstream no more updates rubygems.org and we need a more recent version
# https://github.com/mitchellh/vagrant/issues/5546
gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
-
- gem 'rubocop', '~> 0.35.1', require: false
- gem 'puppet', '~> 3.7.0'
- gem 'puppet-lint', '1.1.0'
+ gem 'rubocop', '~> 0.51', require: false
+ gem 'puppet', '~> 4.8.2'
+ gem 'puppet-lint', '2.3.3'
gem 'puppetlabs_spec_helper', '< 2.0.0', require: false
gem 'puppet-strings', '~> 1.0.0'
- # Puppet 3.7 fails on ruby 2.2+
- # https://tickets.puppetlabs.com/browse/PUP-3796
gem 'safe_yaml', '~> 1.0.4'
- gem 'rake', '~> 10.4.2'
+ gem 'rake', '~> 12.0.0'
end
group :development, :test do
gem 'fakefs', '~> 0.6.5'
+ gem 'byebug', '~> 9.0.6'
gem 'pry-byebug'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 28f7bc5..db35020 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,13 +31,11 @@
specs:
CFPropertyList (2.2.8)
ast (2.3.0)
- astrolabe (1.3.1)
- parser (~> 2.2)
- builder (3.2.2)
- byebug (9.0.5)
+ builder (3.2.3)
+ byebug (9.0.6)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
- coderay (1.1.1)
+ coderay (1.1.2)
cucumber (2.0.2)
builder (>= 2.1.2)
cucumber-core (~> 1.2.0)
@@ -47,14 +45,14 @@
multi_test (>= 0.1.2)
cucumber-core (1.2.0)
gherkin (~> 2.12.0)
- diff-lcs (1.2.5)
- domain_name (0.5.20160615)
+ diff-lcs (1.3)
+ domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
- facter (2.4.6)
- CFPropertyList (~> 2.2.6)
+ facter (2.5.1)
+ CFPropertyList (~> 2.2)
fakefs (0.6.7)
- ffi (1.9.12)
+ ffi (1.9.18)
gherkin (2.12.2)
multi_json (~> 1.3)
gssapi (1.2.0)
@@ -62,13 +60,12 @@
gyoku (1.3.1)
builder (>= 2.1.2)
hashicorp-checkpoint (0.1.4)
- hiera (1.3.4)
- json_pure
- http-cookie (1.0.2)
+ hiera (3.4.2)
+ http-cookie (1.0.3)
domain_name (~> 0.5)
- httpclient (2.8.0)
- i18n (0.7.0)
- json_pure (2.0.3)
+ httpclient (2.8.3)
+ i18n (0.8.0)
+ json_pure (1.8.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
@@ -78,12 +75,12 @@
little-plugger (>= 1.1.3)
multi_json (>= 1.8.4)
metaclass (0.0.4)
- method_source (0.8.2)
- mime-types (2.99.2)
+ method_source (0.9.0)
+ mime-types (2.99.3)
mini_portile (0.6.0)
- mocha (1.2.1)
+ mocha (1.3.0)
metaclass (~> 0.0.1)
- multi_json (1.12.1)
+ multi_json (1.12.2)
multi_test (0.1.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
@@ -94,73 +91,73 @@
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
nori (2.6.0)
- parser (2.3.1.2)
- ast (~> 2.2)
+ parallel (1.12.0)
+ parser (2.4.0.2)
+ ast (~> 2.3)
powerpack (0.1.1)
- pry (0.10.3)
+ pry (0.11.3)
coderay (~> 1.1.0)
- method_source (~> 0.8.1)
- slop (~> 3.4)
- pry-byebug (3.4.0)
- byebug (~> 9.0)
+ method_source (~> 0.9.0)
+ pry-byebug (3.4.3)
+ byebug (>= 9.0, < 9.1)
pry (~> 0.10)
- puppet (3.7.5)
- facter (> 1.6, < 3)
- hiera (~> 1.0)
- json_pure
- puppet-lint (1.1.0)
+ puppet (4.8.2)
+ CFPropertyList (~> 2.2.6)
+ facter (> 2.0, < 4)
+ hiera (>= 2.0, < 4)
+ json_pure (~> 1.8)
+ puppet-lint (2.3.3)
puppet-strings (1.0.0)
yard (~> 0.9.5)
- puppet-syntax (2.3.0)
+ puppet-syntax (2.4.1)
rake
- puppetlabs_spec_helper (1.1.1)
- mocha
- puppet-lint
- puppet-syntax
+ puppetlabs_spec_helper (1.2.2)
+ mocha (~> 1.0)
+ puppet-lint (~> 2.0)
+ puppet-syntax (~> 2.0)
+ rspec-puppet (~> 2.0)
+ rainbow (2.2.2)
rake
- rspec-puppet
- rainbow (2.1.0)
- rake (10.4.2)
- rb-fsevent (0.9.7)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
- rb-kqueue (0.2.4)
+ rake (12.0.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ rb-kqueue (0.2.5)
ffi (>= 0.5.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
- rspec (3.5.0)
- rspec-core (~> 3.5.0)
- rspec-expectations (~> 3.5.0)
- rspec-mocks (~> 3.5.0)
- rspec-core (3.5.0)
- rspec-support (~> 3.5.0)
- rspec-expectations (3.5.0)
+ rspec (3.7.0)
+ rspec-core (~> 3.7.0)
+ rspec-expectations (~> 3.7.0)
+ rspec-mocks (~> 3.7.0)
+ rspec-core (3.7.0)
+ rspec-support (~> 3.7.0)
+ rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.5.0)
- rspec-mocks (3.5.0)
+ rspec-support (~> 3.7.0)
+ rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.5.0)
- rspec-puppet (2.5.0)
+ rspec-support (~> 3.7.0)
+ rspec-puppet (2.6.9)
rspec
- rspec-support (3.5.0)
- rubocop (0.35.1)
- astrolabe (~> 1.3)
- parser (>= 2.2.3.0, < 3.0)
+ rspec-support (3.7.0)
+ rubocop (0.51.0)
+ parallel (~> 1.10)
+ parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
- rainbow (>= 1.99.1, < 3.0)
+ rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
- tins (<= 1.6.0)
- ruby-progressbar (1.8.1)
+ unicode-display_width (~> 1.0, >= 1.0.1)
+ ruby-progressbar (1.9.0)
rubyntlm (0.4.0)
- rubyzip (1.2.0)
+ rubyzip (1.2.1)
safe_yaml (1.0.4)
- slop (3.6.0)
- tins (1.6.0)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.2)
+ unf_ext (0.0.7.4)
+ unicode-display_width (1.3.0)
uuidtools (2.1.5)
wdm (0.1.1)
winrm (1.3.6)
@@ -177,26 +174,24 @@
logging (~> 1.6, >= 1.6.1)
rubyzip (~> 1.1)
winrm (~> 1.3.0)
- yard (0.9.5)
+ yard (0.9.12)
PLATFORMS
ruby
DEPENDENCIES
+ byebug (~> 9.0.6)
cucumber (~> 2.0.0.rc4)
fakefs (~> 0.6.5)
mediawiki-vagrant!
pry-byebug
- puppet (~> 3.7.0)
- puppet-lint (= 1.1.0)
+ puppet (~> 4.8.2)
+ puppet-lint (= 2.3.3)
puppet-strings (~> 1.0.0)
puppetlabs_spec_helper (< 2.0.0)
- rake (~> 10.4.2)
+ rake (~> 12.0.0)
rspec (~> 3.1, >= 3.1.0)
- rubocop (~> 0.35.1)
+ rubocop (~> 0.51)
safe_yaml (~> 1.0.4)
vagrant!
yard (~> 0.8, >= 0.8.7.6)
-
-BUNDLED WITH
- 1.10.6
diff --git a/Rakefile b/Rakefile
index 2bec87d..95c90bb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -26,9 +26,11 @@
"#{Regexp.last_match(1)}/**/*.pp"
}
config.ignore_paths += ['tmp/**/*.pp']
- config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}'
+ config.log_format = '%{path}:%{line} %{KIND}: %{message}'
end
-Cucumber::Rake::Task.new(:cucumber)
+Cucumber::Rake::Task.new(:cucumber) do |t|
+ t.fork = false
+end
RSpec::Core::RakeTask.new(:spec)
RuboCop::RakeTask.new(:rubocop)
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index e67bd18..a71ba7f 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -17,11 +17,11 @@
# Human-readable constants which may be used in lieu of literal numbers
# for specifying loading priority of resource types which support this
# notion (like mediawiki::extension, mediawiki::settings, and mediawiki::wiki).
-$LOAD_FIRST = 0
-$LOAD_EARLY = 5
-$LOAD_NORMAL = 10
-$LOAD_LATER = 15
-$LOAD_LAST = 20
+$load_first = 0
+$load_early = 5
+$load_normal = 10
+$load_later = 15
+$load_last = 20
# Declares a default search path for executables, allowing the path to
# be omitted from individual resources. Also configures Puppet to log
diff --git a/puppet/modules/mediawiki/manifests/wiki.pp
b/puppet/modules/mediawiki/manifests/wiki.pp
index dc0fab8..ca75d3e 100644
--- a/puppet/modules/mediawiki/manifests/wiki.pp
+++ b/puppet/modules/mediawiki/manifests/wiki.pp
@@ -65,7 +65,7 @@
#
# [*priority*]
# Position of this wiki in foreachwiki. Uses the scale of
-# the LOAD_ constants from site.php. (default: $LOAD_NORMAL)
+# the $::load_* constants from site.php. (default: $::load_normal)
#
# [*wgconf*]
# Hash of extra wgConf settings for this wiki. One use case for this is
@@ -102,7 +102,7 @@
$upload_path = "/${title}images",
$server_url =
"http://${title}${::mediawiki::multiwiki::base_domain}${::port_fragment}";,
$primary_wiki = false,
- $priority = $::LOAD_NORMAL,
+ $priority = $::load_normal,
$wgconf = {},
) {
include ::mwv
diff --git a/puppet/modules/role/manifests/articlecreationworkflow.pp
b/puppet/modules/role/manifests/articlecreationworkflow.pp
index cd31439..7641e58 100644
--- a/puppet/modules/role/manifests/articlecreationworkflow.pp
+++ b/puppet/modules/role/manifests/articlecreationworkflow.pp
@@ -4,6 +4,6 @@
# [1] https://www.mediawiki.org/wiki/Extension:ArticleCreationWorkflow
class role::articlecreationworkflow {
mediawiki::extension { 'ArticleCreationWorkflow':
- priority => $::LOAD_EARLY, # Must load before VisualEditor
+ priority => $::load_early, # Must load before VisualEditor
}
}
diff --git a/puppet/modules/role/manifests/articleplaceholder.pp
b/puppet/modules/role/manifests/articleplaceholder.pp
index 606b400..58cd876 100644
--- a/puppet/modules/role/manifests/articleplaceholder.pp
+++ b/puppet/modules/role/manifests/articleplaceholder.pp
@@ -14,7 +14,7 @@
values => {
"wgWBRepoSettings['allowEntityImport']" => true,
},
- priority => $::LOAD_LATER,
+ priority => $::load_later,
}
mediawiki::import::dump { 'ImportImageProperty':
diff --git a/puppet/modules/role/manifests/betafeatures.pp
b/puppet/modules/role/manifests/betafeatures.pp
index 3d10cb2..f3fb49f 100644
--- a/puppet/modules/role/manifests/betafeatures.pp
+++ b/puppet/modules/role/manifests/betafeatures.pp
@@ -3,6 +3,6 @@
class role::betafeatures {
mediawiki::extension { 'BetaFeatures':
needs_update => true,
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
}
}
diff --git a/puppet/modules/role/manifests/cldr.pp
b/puppet/modules/role/manifests/cldr.pp
index 039893e..2d7e2db 100644
--- a/puppet/modules/role/manifests/cldr.pp
+++ b/puppet/modules/role/manifests/cldr.pp
@@ -8,6 +8,6 @@
require_package('unzip')
mediawiki::extension { 'cldr':
- priority => $::LOAD_LATER,
+ priority => $::load_later,
}
}
diff --git a/puppet/modules/role/manifests/commons.pp
b/puppet/modules/role/manifests/commons.pp
index 211763d..8f67e6b 100644
--- a/puppet/modules/role/manifests/commons.pp
+++ b/puppet/modules/role/manifests/commons.pp
@@ -14,7 +14,7 @@
mediawiki::wiki { 'commons':
upload_dir => $upload_dir,
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
}
role::thumb_on_404::multiwiki { 'commons': }
diff --git a/puppet/modules/role/manifests/education.pp
b/puppet/modules/role/manifests/education.pp
index a272879..a0e3dd0 100644
--- a/puppet/modules/role/manifests/education.pp
+++ b/puppet/modules/role/manifests/education.pp
@@ -7,6 +7,6 @@
mediawiki::extension { 'EducationProgram':
needs_update => true,
- priority => $::LOAD_LAST, # load *after* CLDR
+ priority => $::load_last, # load *after* CLDR
}
}
diff --git a/puppet/modules/role/manifests/eventbus.pp
b/puppet/modules/role/manifests/eventbus.pp
index 036f545..2de1a39 100644
--- a/puppet/modules/role/manifests/eventbus.pp
+++ b/puppet/modules/role/manifests/eventbus.pp
@@ -12,7 +12,7 @@
include ::changeprop
mediawiki::extension { 'EventBus':
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
settings => {
wgEventServiceUrl => 'http://localhost:8085/v1/events',
},
diff --git a/puppet/modules/role/manifests/eventlogging.pp
b/puppet/modules/role/manifests/eventlogging.pp
index 26b602d..0272765 100644
--- a/puppet/modules/role/manifests/eventlogging.pp
+++ b/puppet/modules/role/manifests/eventlogging.pp
@@ -17,7 +17,7 @@
include ::eventlogging::devserver
mediawiki::extension { 'EventLogging':
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
settings => {
wgEventLoggingBaseUri => '/event.gif',
}
diff --git a/puppet/modules/role/manifests/flow.pp
b/puppet/modules/role/manifests/flow.pp
index 35f45bd..a3281cd 100644
--- a/puppet/modules/role/manifests/flow.pp
+++ b/puppet/modules/role/manifests/flow.pp
@@ -9,7 +9,7 @@
mediawiki::extension { 'Flow':
needs_update => true,
settings => template('role/flow/conf.php.erb'),
- priority => $::LOAD_LAST, # load *after* Echo
+ priority => $::load_last, # load *after* Echo
browser_tests => '.',
}
diff --git a/puppet/modules/role/manifests/gadgets2.pp
b/puppet/modules/role/manifests/gadgets2.pp
index 0c70886..399d49b 100644
--- a/puppet/modules/role/manifests/gadgets2.pp
+++ b/puppet/modules/role/manifests/gadgets2.pp
@@ -16,7 +16,7 @@
}
mediawiki::wiki { 'gadgets':
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
}
mediawiki::wiki { 'gadgetsclient': }
diff --git a/puppet/modules/role/manifests/geodata.pp
b/puppet/modules/role/manifests/geodata.pp
index 20cae91..9359775 100644
--- a/puppet/modules/role/manifests/geodata.pp
+++ b/puppet/modules/role/manifests/geodata.pp
@@ -5,6 +5,6 @@
mediawiki::extension { 'GeoData':
needs_update => true,
# Should come after either CirrusSearch or Solarium.
- priority => $::LOAD_LATER,
+ priority => $::load_later,
}
}
diff --git a/puppet/modules/role/manifests/geodata_elastic.pp
b/puppet/modules/role/manifests/geodata_elastic.pp
index 219f0e2..cadabd7 100644
--- a/puppet/modules/role/manifests/geodata_elastic.pp
+++ b/puppet/modules/role/manifests/geodata_elastic.pp
@@ -6,7 +6,7 @@
include ::role::cirrussearch
mediawiki::settings { 'GeoData-elastic':
- priority => $::LOAD_LAST,
+ priority => $::load_last,
values => {
wgGeoDataBackend => 'elastic',
},
diff --git a/puppet/modules/role/manifests/jsonconfig.pp
b/puppet/modules/role/manifests/jsonconfig.pp
index 72af944..83e0b95 100644
--- a/puppet/modules/role/manifests/jsonconfig.pp
+++ b/puppet/modules/role/manifests/jsonconfig.pp
@@ -6,6 +6,6 @@
mediawiki::extension { 'JsonConfig':
# Ensure that extensions that use JsonConfig will load later.
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
}
}
diff --git a/puppet/modules/role/manifests/offline.pp
b/puppet/modules/role/manifests/offline.pp
index b95d6c0..9437f5c 100644
--- a/puppet/modules/role/manifests/offline.pp
+++ b/puppet/modules/role/manifests/offline.pp
@@ -11,7 +11,7 @@
mediawiki::settings { 'Electron-VRS':
values => template('role/offline/electron-vrs.php.erb'),
- priority => $::LOAD_FIRST,
+ priority => $::load_first,
}
mediawiki::extension { 'Collection':
diff --git a/puppet/modules/role/manifests/poolcounter.pp
b/puppet/modules/role/manifests/poolcounter.pp
index 19b5bdd..401f285 100644
--- a/puppet/modules/role/manifests/poolcounter.pp
+++ b/puppet/modules/role/manifests/poolcounter.pp
@@ -13,7 +13,7 @@
}
mediawiki::extension { 'PoolCounter':
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
settings => [
'$wgPoolCountClientConf["servers"][] = "127.0.0.1";',
'$wgPoolCountClientConf["timeout"] = 0.5;',
diff --git a/puppet/modules/role/manifests/questycaptcha.pp
b/puppet/modules/role/manifests/questycaptcha.pp
index 50831a1..2517b7f 100644
--- a/puppet/modules/role/manifests/questycaptcha.pp
+++ b/puppet/modules/role/manifests/questycaptcha.pp
@@ -8,7 +8,7 @@
mediawiki::settings { 'QuestyCaptcha':
values => template('role/questycaptcha/settings.php.erb'),
- priority => $::LOAD_LATER,
+ priority => $::load_later,
}
mediawiki::import::text { 'VagrantRoleQuestyCaptcha':
diff --git a/puppet/modules/role/manifests/restbase.pp
b/puppet/modules/role/manifests/restbase.pp
index 718c57d..d8318dc 100644
--- a/puppet/modules/role/manifests/restbase.pp
+++ b/puppet/modules/role/manifests/restbase.pp
@@ -35,7 +35,7 @@
# Register the PHP Virtual REST Service connector
mediawiki::settings { 'RESTBase-VRS':
values => template('role/restbase/vrs.php.erb'),
- priority => $::LOAD_FIRST,
+ priority => $::load_first,
wiki => $::mediawiki::wiki_db,
}
@@ -51,7 +51,7 @@
wgVisualEditorFullRestbaseURL => $base_url,
wgVisualEditorRestbaseURL => $ve_url,
},
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
wiki => $::mediawiki::wiki_db,
}
diff --git a/puppet/modules/role/manifests/semanticmediawiki.pp
b/puppet/modules/role/manifests/semanticmediawiki.pp
index 606cdc0..2410266 100644
--- a/puppet/modules/role/manifests/semanticmediawiki.pp
+++ b/puppet/modules/role/manifests/semanticmediawiki.pp
@@ -12,7 +12,7 @@
}
mediawiki::settings { 'Semantic MediaWiki':
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
values => [
'enableSemantics($wgSitename)',
]
diff --git a/puppet/modules/role/manifests/simple_performant.pp
b/puppet/modules/role/manifests/simple_performant.pp
index a7d9852..edda9b5 100644
--- a/puppet/modules/role/manifests/simple_performant.pp
+++ b/puppet/modules/role/manifests/simple_performant.pp
@@ -13,9 +13,9 @@
require_package('unzip')
- $DAY = 24 * 60 * 60
- $CACHE_ACCEL = 3
- $CACHE_DB = 1
+ $day = 24 * 60 * 60
+ $cache_accel = 3
+ $cache_db = 1
php::ini { 'simple_performant':
settings => { realpath_cache_size => '512K' },
@@ -24,19 +24,19 @@
mediawiki::settings { 'simple_performant':
values => {
wgCacheDirectory => '/var/cache/mediawiki',
- wgMainCacheType => $CACHE_ACCEL,
- wgParserCacheType => $CACHE_DB,
+ wgMainCacheType => $cache_accel,
+ wgParserCacheType => $cache_db,
wgJobRunRate => 0,
wgEnableSidebarCache => true,
- wgParserCacheExpireTime => 30 * $DAY,
+ wgParserCacheExpireTime => 30 * $day,
wgResourceLoaderMaxage => {
'unversioned' => {
- 'server' => $DAY,
- 'client' => $DAY,
+ 'server' => $day,
+ 'client' => $day,
},
'versioned' => {
- 'server' => 30 * $DAY,
- 'client' => 30 * $DAY,
+ 'server' => 30 * $day,
+ 'client' => 30 * $day,
},
},
},
diff --git a/puppet/modules/role/manifests/visualeditor.pp
b/puppet/modules/role/manifests/visualeditor.pp
index 2e25455..8ae9547 100644
--- a/puppet/modules/role/manifests/visualeditor.pp
+++ b/puppet/modules/role/manifests/visualeditor.pp
@@ -17,7 +17,7 @@
mediawiki::extension { 'VisualEditor':
settings => template('role/visualeditor/conf.php.erb'),
browser_tests => 'modules/ve-mw/tests/browser',
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
wiki => $::mediawiki::wiki_db,
}
}
diff --git a/puppet/modules/role/manifests/wikidata.pp
b/puppet/modules/role/manifests/wikidata.pp
index 5bc267e..9ef3ada 100644
--- a/puppet/modules/role/manifests/wikidata.pp
+++ b/puppet/modules/role/manifests/wikidata.pp
@@ -41,7 +41,7 @@
}
mediawiki::settings { 'WikiData-Init':
- priority => $::LOAD_EARLY,
+ priority => $::load_early,
values => template('role/wikidata/init.php.erb'),
}
diff --git a/puppet/modules/role/manifests/zero.pp
b/puppet/modules/role/manifests/zero.pp
index 217b03b..cf209e0 100644
--- a/puppet/modules/role/manifests/zero.pp
+++ b/puppet/modules/role/manifests/zero.pp
@@ -11,7 +11,7 @@
include ::role::zend
mediawiki::extension { 'ZeroBanner':
- priority => $::LOAD_LATER, # Must be after JsonConfig & MobileFrontEnd
+ priority => $::load_later, # Must be after JsonConfig & MobileFrontEnd
settings => [
'$wgMobileUrlTemplate = "%h0.m.%h1.%h2"',
'$wgZeroSiteOverride = array( "wikipedia", "en" )',
@@ -21,7 +21,7 @@
}
mediawiki::extension { 'ZeroPortal':
- priority => $::LOAD_LAST, # Must be after ZeroBanner
+ priority => $::load_last, # Must be after ZeroBanner
settings => [
'$wgRawHtml = true',
],
--
To view, visit https://gerrit.wikimedia.org/r/393493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I753a57d55636c5a398d2b80cfe976946367d3c51
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
