jenkins-bot has submitted this change and it was merged.
Change subject: This is causing "Unable to pick a platform" errors in all
Jenkins builds
......................................................................
This is causing "Unable to pick a platform" errors in all Jenkins builds
Revert "I could not figure out another way of having passwords in environment
variables but not displayed in Jenkins console log"
This reverts commit 9339a9618c861170abe18221339b532e0361fddb.
Change-Id: Ic2ef02bea1ff90fcbaec08a8c6524dc2b72c1e6c
---
M docs/jenkins.md
M lib/mediawiki/selenium/hooks.rb
2 files changed, 0 insertions(+), 9 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/jenkins.md b/docs/jenkins.md
index f39505e..382956a 100644
--- a/docs/jenkins.md
+++ b/docs/jenkins.md
@@ -24,7 +24,3 @@
- name
- SAUCE_ONDEMAND_ACCESS_KEY
- SAUCE_ONDEMAND_USERNAME
- - 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/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/hooks.rb
index bfc3b4b..c4a27fa 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -12,11 +12,6 @@
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']
-
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/92764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2ef02bea1ff90fcbaec08a8c6524dc2b72c1e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
