jenkins-bot has submitted this change and it was merged.
Change subject: Additionally run Wikidata browsertests without saucelabs
......................................................................
Additionally run Wikidata browsertests without saucelabs
Disable saucelabs when using a local headless browser.
Bug: T116166
Change-Id: I6f7a09fbe594dfbd12186c8d78b72f65c2666658
---
M jjb/browsertests.yaml
M jjb/job-templates-browsertests.yaml
M jjb/macro-browsertests.yaml
3 files changed, 37 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index 069aa4b..ede7688 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -401,7 +401,7 @@
# Wikidata
- project:
- name: WikidataTests
+ name: WikidataTestsSauce
defaults: browsertests
browser: firefox
folder: tests
@@ -424,11 +424,35 @@
browser_timeout: 360
cucumber_tags: '@performance_testing'
recipients: *emails-Wikidata-devs
-
- 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
name: SmokeTests
cucumber_tags: '@smoke'
recipients: *emails-Wikidata-devs
+- project:
+ name: WikidataTestsHeadless
+ defaults: browsertests
+ browser: firefox
+ folder: tests
+ headless: 'true'
+ mediawiki_credentials_id: WikidataTester-at-beta.wmflabs.org
+ mediawiki_url: wikidata.beta.wmflabs.org
+ platform: linux
+ recipients: *emails-Wikidata-qa
+ repository: WikidataBrowserTests.git
+ repository_host: github.com/wmde
+
+ jobs:
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}':
+ browsertest_job_timeout: '240'
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}':
+ name: PerformanceTests
+ browser_timeout: 360
+ cucumber_tags: '@performance_testing'
+ recipients: *emails-Wikidata-devs
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}':
+ name: SmokeTests
+ cucumber_tags: '@smoke'
+ recipients: *emails-Wikidata-devs
# WikiLove
- project:
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index 5d020d0..bc8e506 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -56,7 +56,12 @@
- job-template:
name: 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce'
defaults: browsertests
+ triggers:
+ - timed: "H 01 * * *"
+- job-template:
+ name: 'browsertests-Wikidata-{name}-{platform}-{browser}'
+ defaults: browsertests
triggers:
- timed: "H 01 * * *"
diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 317c615..f05c91b 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -17,6 +17,12 @@
export SCREENSHOT_FAILURES=true
export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
+ # headless means local headless browser, thus disable saucelabs
+ if [ $HEADLESS = 'true' ]; then
+ unset SAUCE_ONDEMAND_ACCESS_KEY
+ unset SAUCE_ONDEMAND_USERNAME
+ fi
+
# Log results to Raita
export RAITA_URL=http://integration-raita.eqiad.wmflabs:9200/raita
--
To view, visit https://gerrit.wikimedia.org/r/247901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f7a09fbe594dfbd12186c8d78b72f65c2666658
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[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
