jenkins-bot has submitted this change and it was merged.

Change subject: Revert "This is causing "Unable to pick a platform" errors in 
all Jenkins builds"
......................................................................


Revert "This is causing "Unable to pick a platform" errors in all Jenkins 
builds"

This reverts commit 56f4c92d77b68011f6adfd9ce0f79165d6803db5.

Change-Id: I61815cb11be68a80b383b1e72986577928b6f037
---
M docs/jenkins.md
M lib/mediawiki/selenium/hooks.rb
2 files changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Zfilipin: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/jenkins.md b/docs/jenkins.md
index 382956a..f39505e 100644
--- a/docs/jenkins.md
+++ b/docs/jenkins.md
@@ -24,3 +24,7 @@
   - 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 c4a27fa..bfc3b4b 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -12,6 +12,11 @@
 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/92888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I61815cb11be68a80b383b1e72986577928b6f037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to