Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93443
Change subject: Introduce new variable that points to the variable that holds
the password
......................................................................
Introduce new variable that points to the variable that holds the password
Paired with Nikerabbit <niklas.laxst...@gmail.com>
The existing solution works only if one environment variable is set.
Jenkins machine has all four environment variables set, so we had to
find another solution.
Change-Id: I3bbbb927321f08777196aae2cffcf180d34aa095
---
M docs/jobs.md
M docs/template.md
M lib/mediawiki/selenium/hooks.rb
3 files changed, 10 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/43/93443/1
diff --git a/docs/jobs.md b/docs/jobs.md
index f074c0a..b47fbbd 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -5,9 +5,13 @@
- Branch: master
- MediaWiki URL:
- Folder:
-- MediaWiki user:
-- MediaWiki password:
- Repository URL:
+- MediaWiki user:
+- MediaWiki password variable:
+ MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
+ MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+ MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+ MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
diff --git a/docs/template.md b/docs/template.md
index a592ca9..4b3fcac 100644
--- a/docs/template.md
+++ b/docs/template.md
@@ -131,10 +131,10 @@
- Display Name: MediaWiki user
- Type: Text-field
-## MediaWiki password
+## MediaWiki password variable
-- ID: MEDIAWIKI_PASSWORD
-- Display Name: MediaWiki password
+- ID: MEDIAWIKI_PASSWORD_VARIABLE
+- Display Name: MediaWiki password variable
- Type: Text-field
## Jelly-based transformation
@@ -221,8 +221,6 @@
<hudson.tasks.Shell>
<command>
export MEDIAWIKI_USER=${MEDIAWIKI_USER}
- export MEDIAWIKI_PASSWORD=${MEDIAWIKI_PASSWORD}
-
export BROWSER_LABEL=${BROWSER_LABEL}
export MEDIAWIKI_URL=http://${MEDIAWIKI_URL}/wiki/
diff --git a/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/hooks.rb
index bfc3b4b..3d62ad0 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -12,11 +12,7 @@
config = YAML.load_file('config/config.yml')
Before('@login') do
- ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET']
- ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG']
- ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG']
- ENV['MEDIAWIKI_PASSWORD'] = ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG'] if
ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG']
-
+ ENV['MEDIAWIKI_PASSWORD'] = ENV[ENV['MEDIAWIKI_PASSWORD_VARIABLE']] if
ENV['MEDIAWIKI_PASSWORD_VARIABLE']
puts "MEDIAWIKI_USER environment variable is not defined! Please export a
value for that variable before proceeding." unless ENV['MEDIAWIKI_USER']
puts "MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding." unless ENV['MEDIAWIKI_PASSWORD']
end
--
To view, visit https://gerrit.wikimedia.org/r/93443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bbbb927321f08777196aae2cffcf180d34aa095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
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
