Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/138351

Change subject: WIP Running tests at Sauce Labs
......................................................................

WIP Running tests at Sauce Labs

Needs to be refactored.

Created one job:

https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests-
VisualEditor-en.wikipedia.beta.wmflabs.org-linux-firefox-sauce_labs/

Paired with: Chris McMahon

Change-Id: Ibae49badb58292cb339daf495ffdc746f3c95dbf
---
M job_template.yaml
M jobs.yaml
M macro.yaml
3 files changed, 75 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/51/138351/1

diff --git a/job_template.yaml b/job_template.yaml
index 275fc05..678449b 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -23,6 +23,7 @@
       - browsertest-website:
           browser: '{browser}'
           folder: '{folder}'
+          headless: '{headless}'
           mediawiki_password_variable: '{mediawiki_password_variable}'
           mediawiki_url: '{mediawiki_url}'
           mediawiki_user: '{mediawiki_user}'
@@ -50,6 +51,60 @@
       - ansicolor
       - timestamps
 
+# Sauce Labs
+
+- job-template:
+    name: 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce_labs'
+    defaults: browsertests
+
+- defaults:
+    name: browsertests
+    node: contintLabsSlave
+
+    scm:
+      - git:
+          url: https://gerrit.wikimedia.org/r/{repository}
+          branches:
+            - master
+          wipe-workspace: false  # keep the workspace...
+          clean: true            # ... and use git clean instead
+          prune: true            # prune remote obsoletes branches
+          recursive-submodules: true
+
+    builders:
+      - shell: mkdir -p "$WORKSPACE/log/junit"
+      - browsertest-website:
+          browser: '{browser}'
+          folder: '{folder}'
+          headless: '{headless}'
+          mediawiki_password_variable: '{mediawiki_password_variable}'
+          mediawiki_url: '{mediawiki_url}'
+          mediawiki_user: '{mediawiki_user}'
+          platform: '{platform}'
+
+    publishers:
+      - junit:
+          results: 'log/junit/*.xml'
+
+      - email-ext:
+          recipients: '{recipients}'
+          body: '${{SCRIPT, template="wikimedia.template"}}'
+
+      - browsertests-irc
+
+      - claim-build
+
+      - archive:
+          artifacts: 'log/*.log, log/junit/*.xml, log/report.html, log/*.png'
+
+    triggers:
+      - timed: 'H 3,18 * * *'
+
+    wrappers:
+      - ansicolor
+      - timestamps
+
+
 # UploadWizard
 
 - job-template:
diff --git a/jobs.yaml b/jobs.yaml
index 8dc5700..357d18d 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -24,6 +24,7 @@
     name: CentralAuth
     browser: firefox
     folder: tests
+    headless: 'true'
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
     mediawiki_url: test2.wikipedia.org
     mediawiki_user: Selenium_user
@@ -39,6 +40,7 @@
     name: CirrusSearch
     browser: firefox
     folder: tests
+    headless: 'true'
     platform: linux
     recipients: *emails-CirrusSearch
     repository: mediawiki/extensions/CirrusSearch
@@ -58,6 +60,7 @@
     name: ContentTranslation
     browser: firefox
     folder: tests
+    headless: 'true'
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
     mediawiki_url: language-stage.wmflabs.org
     mediawiki_user: Selenium_user
@@ -73,6 +76,7 @@
     name: Flow
     browser: firefox
     folder: tests
+    headless: 'true'
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
     mediawiki_url: en.wikipedia.beta.wmflabs.org
     mediawiki_user: Selenium_user
@@ -95,6 +99,7 @@
     name: MobileFrontend
     browser: firefox
     folder: tests
+    headless: 'true'
     platform: linux
     recipients: *emails-mobile
     repository: mediawiki/extensions/MobileFrontend
@@ -119,6 +124,7 @@
     name: MultimediaViewer
     browser: firefox
     folder: tests
+    headless: 'true'
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
     mediawiki_url: en.wikipedia.beta.wmflabs.org
     mediawiki_user: Selenium_user
@@ -137,6 +143,7 @@
     name: TwnMainPage
     browser: firefox
     folder: tests
+    headless: 'true'
     mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
     mediawiki_url: sandbox.translatewiki.net
     mediawiki_user: Selenium
@@ -152,6 +159,7 @@
     name: Translate
     browser: firefox
     folder: tests
+    headless: 'true'
     platform: linux
     recipients: *emails-i18n
     repository: mediawiki/extensions/Translate
@@ -171,6 +179,7 @@
     name: UniversalLanguageSelector
     browser: firefox
     folder: tests
+    headless: 'true'
     platform: linux
     recipients: *emails-ULS
     repository: mediawiki/extensions/UniversalLanguageSelector
@@ -210,6 +219,7 @@
     name: UploadWizard
     browser: firefox
     folder: tests
+    headless: 'true'
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
     mediawiki_url: commons.wikimedia.beta.wmflabs.org
     mediawiki_user: Selenium_user
@@ -225,6 +235,7 @@
     name: VisualEditor
     browser: firefox
     folder: modules/ve-mw/test
+    headless: 'true'
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
     mediawiki_url: en.wikipedia.beta.wmflabs.org
     mediawiki_user: Selenium_user
@@ -233,6 +244,10 @@
     repository: mediawiki/extensions/VisualEditor
 
     jobs:
+     - 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce_labs':
+        headless: 'false'
+        mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+        mediawiki_url: en.wikipedia.beta.wmflabs.org
      - 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}':
         mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
         mediawiki_url: en.wikipedia.beta.wmflabs.org
@@ -244,6 +259,7 @@
     name: production
     browser: firefox
     folder: modules/ve-mw/test
+    headless: 'true'
     platform: linux
     recipients: *emails-VisualEditor
     repository: mediawiki/extensions/VisualEditor
@@ -257,6 +273,7 @@
     name: WikiLove
     browser: firefox
     folder: tests
+    headless: 'true'
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
     mediawiki_url: en.wikipedia.beta.wmflabs.org
     mediawiki_user: Selenium_user
@@ -272,6 +289,7 @@
     name: en.m.wikipedia.org
     browser: phantomjs
     folder: tests
+    headless: 'true'
     mediawiki_url: en.m.wikipedia.org
     platform: linux
     recipients: *emails-qa
@@ -285,6 +303,7 @@
     name: qa
     browser: firefox
     folder: tests
+    headless: 'true'
     platform: linux
     recipients: *emails-qa
     repository: qa/browsertests
diff --git a/macro.yaml b/macro.yaml
index 92d0d26..4870889 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -4,7 +4,7 @@
       - shell: |
           # set up environment variables
           export BROWSER={browser}
-          export HEADLESS=true
+          export HEADLESS={headless}
           export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
           export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
           export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/

-- 
To view, visit https://gerrit.wikimedia.org/r/138351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae49badb58292cb339daf495ffdc746f3c95dbf
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Zfilipin <[email protected]>

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

Reply via email to