BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154487
Change subject: Revert "Revert "Provision browser tests for CentralAuth""
......................................................................
Revert "Revert "Provision browser tests for CentralAuth""
This reverts commit 37b33c9a6842eb9124d8dd871692d6f0939fa138.
Change-Id: I16bcbf3b3fe19666d47caf2b923189203068ae30
---
M puppet/manifests/roles/centralauth.pp
1 file changed, 40 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/87/154487/1
diff --git a/puppet/manifests/roles/centralauth.pp
b/puppet/manifests/roles/centralauth.pp
index 49ca43b..7452715 100644
--- a/puppet/manifests/roles/centralauth.pp
+++ b/puppet/manifests/roles/centralauth.pp
@@ -9,14 +9,21 @@
include ::role::antispoof
include ::role::renameuser
include ::role::usermerge
+ include ::browsertests
include ::mysql
$shared_db = 'centralauth'
+
$loginwiki = 'login'
+ $alt_testwiki = 'centralauthtest'
+
+ $loginwiki_url =
"http://${loginwiki}.wiki.local.wmftest.net:${::forwarded_port}";
+ $alt_testwiki_url =
"http://${alt_testwiki}.wiki.local.wmftest.net:${::forwarded_port}";
mediawiki::extension { 'CentralAuth':
- needs_update => true,
- settings => {
+ needs_update => true,
+ browser_tests => true,
+ settings => {
wgCentralAuthCookies => true,
wgCentralAuthAutoNew => true,
wgCentralAuthDatabase => $shared_db,
@@ -54,21 +61,42 @@
sql => "USE ${shared_db}; SOURCE
${::role::mediawiki::dir}/extensions/CentralAuth/AntiSpoof/patch-antispoof-global.mysql.sql;",
unless => "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE
table_schema = '${shared_db}' AND table_name = 'spoofuser';",
require => [
- Mysql::Db[$shared_db],
- Mediawiki::Extension['CentralAuth']
+ Mysql::Db[$shared_db],
+ Mediawiki::Extension['CentralAuth']
],
}
exec { 'migrate_admin_user_to_centralauth':
- command => "mwscript
extensions/CentralAuth/maintenance/migrateAccount.php --username Admin",
- refreshonly => true,
- user => 'www-data',
- subscribe => Mysql::Sql['Create CentralAuth tables'],
- require => [
- Mediawiki::Wiki[$loginwiki],
- Mediawiki::Wiki['centralauthtest'],
+ command => "mwscript
extensions/CentralAuth/maintenance/migrateAccount.php --username Admin --auto",
+ unless => "mwscript
extensions/CentralAuth/maintenance/migrateAccount.php --username Admin | grep
-q 'already exists'",
+ user => 'www-data',
+ require => [
+ Mediawiki::Wiki[$loginwiki],
+ Mediawiki::Wiki[$alt_testwiki],
],
}
- mediawiki::wiki{ [ $loginwiki, 'centralauthtest' ]: }
+ $selenium_user = regsubst($::browsertests::selenium_user, '_', ' ')
+
+ exec { 'migrate_selenium_user_to_centralauth':
+ command => "mwscript
extensions/CentralAuth/maintenance/migrateAccount.php --username
'$selenium_user' --auto",
+ unless => "mwscript
extensions/CentralAuth/maintenance/migrateAccount.php --username
'$selenium_user' | grep -q 'already exists'",
+ user => 'www-data',
+ require => [
+ Mediawiki::Wiki[$loginwiki],
+ Mediawiki::Wiki[$alt_testwiki],
+ Mediawiki::User[$::browsertests::selenium_user],
+ ],
+ }
+
+ mediawiki::wiki{ [ $loginwiki, $alt_testwiki ]: }
+
+ # Environment variables used by browser tests
+ env::var { 'MEDIAWIKI_CENTRALAUTH_LOGINWIKI_URL':
+ value => $loginwiki_url,
+ }
+
+ env::var { 'MEDIAWIKI_CENTRALAUTH_ALTWIKI_URL':
+ value => $alt_testwiki_url,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/154487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16bcbf3b3fe19666d47caf2b923189203068ae30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
