Cmcmahon has submitted this change and it was merged.
Change subject: Renamed :cloudbees environment to :saucelabs. Removed
ENVIRONMENT environment variable from Jenkins.
......................................................................
Renamed :cloudbees environment to :saucelabs. Removed ENVIRONMENT environment
variable from Jenkins.
Finishing work started in commit 79793.
Bug: 49158
Change-Id: I15ada08ac872e0748b0f64bb2ce0c2fb2c140035
---
M docs/job.md
M docs/template.md
M features/support/env.rb
3 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/job.md b/docs/job.md
index 5d9d7c1..591fd92 100644
--- a/docs/job.md
+++ b/docs/job.md
@@ -12,8 +12,6 @@
--
export BROWSER_LABEL=(label)
- export ENVIRONMENT=(environment)
- export BASE_URL=(url)
export MEDIAWIKI_URL=(url)
curl -s -o use-ruby
https://repository-cloudbees.forge.cloudbees.com/distributions/ci-addons/ruby/use-ruby
diff --git a/docs/template.md b/docs/template.md
index 985377c..21139ca 100644
--- a/docs/template.md
+++ b/docs/template.md
@@ -206,7 +206,6 @@
<command>
export BROWSER_LABEL=${BROWSER_LABEL}
export MEDIAWIKI_URL=https://${MEDIAWIKI_URL}/wiki/
- export ENVIRONMENT=cloudbees
curl -s -o use-ruby
https://repository-cloudbees.forge.cloudbees.com/distributions/ci-addons/ruby/use-ruby
RUBY_VERSION=2.0.0-p247 \
diff --git a/features/support/env.rb b/features/support/env.rb
index 2db1ef8..0b00007 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -8,7 +8,7 @@
World(PageObject::PageFactory)
def browser(environment, test_name, language)
- if environment == :cloudbees
+ if environment == :saucelabs
sauce_browser(test_name, language)
else
local_browser(language)
@@ -16,7 +16,7 @@
end
def environment
if ENV['BROWSER_LABEL'] and ENV['SAUCE_ONDEMAND_USERNAME'] and
ENV['SAUCE_ONDEMAND_ACCESS_KEY']
- :cloudbees
+ :saucelabs
else
:local
end
@@ -121,7 +121,7 @@
end
After do |scenario|
- if environment == :cloudbees
+ if environment == :saucelabs
sauce_api(%Q{{"passed": #{scenario.passed?}}})
sauce_api(%Q{{"public": true}})
end
--
To view, visit https://gerrit.wikimedia.org/r/82046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15ada08ac872e0748b0f64bb2ce0c2fb2c140035
Gerrit-PatchSet: 2
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[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
