Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129651
Change subject: Make the job templates to vary by platform
......................................................................
Make the job templates to vary by platform
Although unused right now, we will have to run similar jobs on different
platforms whenever we start using SauceLabs for Windows host. Add
platform to the job template names.
Change-Id: I329aa5f16c7b94d013531ce36c4ee914fd8944a3
---
M job_template.yaml
M jobs.yaml
2 files changed, 53 insertions(+), 52 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/51/129651/1
diff --git a/job_template.yaml b/job_template.yaml
index 677bb85..a635ee9 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -1,7 +1,7 @@
# default
- job-template:
- name: 'browsertests-{name}-{browser}'
+ name: 'browsertests-{name}-{platform}-{browser}'
defaults: browsertests
- defaults:
@@ -100,7 +100,7 @@
# VisualEditor
- job-template:
- name: 'browsertests-VisualEditor-{name}-{browser}'
+ name: 'browsertests-VisualEditor-{name}-{platform}-{browser}'
defaults: browsertests
triggers:
@@ -164,7 +164,7 @@
# ZeroRatedMobileAccess
- job-template:
- name: 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
+ name: 'browsertests-ZeroRatedMobileAccess-{name}-{platform}-{browser}'
defaults: browsertests
builders:
diff --git a/jobs.yaml b/jobs.yaml
index 7a5047a..65622e5 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -24,7 +24,7 @@
## test2.wikipedia.org
- project:
- name: CentralAuth-test2.wikipedia.org-linux
+ name: CentralAuth-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -35,14 +35,14 @@
repository: mediawiki/extensions/CentralAuth
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# CirrusSearch
## en.wikipedia.beta.wmflabs.org
- project:
- name: CirrusSearch-en.wikipedia.beta.wmflabs.org-linux
+ name: CirrusSearch-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -53,12 +53,12 @@
repository: mediawiki/extensions/CirrusSearch
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
- name: CirrusSearch-test2.wikipedia.org-linux
+ name: CirrusSearch-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -69,14 +69,14 @@
repository: mediawiki/extensions/CirrusSearch
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# ContentTranslation
## language-stage.wmflabs.org
- project:
- name: ContentTranslation-language-stage.wmflabs.org-linux
+ name: ContentTranslation-language-stage.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG
@@ -87,14 +87,14 @@
repository: mediawiki/extensions/ContentTranslation
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# Flow
## en.wikipedia.beta.wmflabs.org
- project:
- name: Flow-en.wikipedia.beta.wmflabs.org-linux
+ name: Flow-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -105,12 +105,12 @@
repository: mediawiki/extensions/Flow
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
- name: Flow-test2.wikipedia.org-linux
+ name: Flow-test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -121,14 +121,14 @@
repository: mediawiki/extensions/Flow
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# MobileFrontend
## en.m.wikipedia.beta.wmflabs.org
- project:
- name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org-linux
+ name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -139,12 +139,12 @@
repository: mediawiki/extensions/MobileFrontend
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## en.m.wikipedia.org
- project:
- name: MobileFrontend-en.m.wikipedia.org-linux
+ name: MobileFrontend-en.m.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -155,12 +155,12 @@
repository: mediawiki/extensions/MobileFrontend
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.m.wikipedia.org
- project:
- name: MobileFrontend-test2.m.wikipedia.org-linux
+ name: MobileFrontend-test2.m.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -171,14 +171,14 @@
repository: mediawiki/extensions/MobileFrontend
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# MultimediaViewer
## en.wikipedia.beta.wmflabs.org
- project:
- name: MultimediaViewer-en.wikipedia.beta.wmflabs.org-linux
+ name: MultimediaViewer-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -189,14 +189,14 @@
repository: mediawiki/extensions/MultimediaViewer
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# TwnMainPage
## sandbox.translatewiki.net
- project:
- name: TwnMainPage-sandbox.translatewiki.net-linux
+ name: TwnMainPage-sandbox.translatewiki.net
browser: firefox
folder: tests
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
@@ -207,14 +207,14 @@
repository: mediawiki/extensions/TwnMainPage
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# Translate
## meta.wikimedia.org
- project:
- name: Translate-meta.wikimedia.org-linux
+ name: Translate-meta.wikimedia.org
browser: firefox
folder: tests
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
@@ -225,12 +225,12 @@
repository: mediawiki/extensions/Translate
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## sandbox.translatewiki.net
- project:
- name: Translate-sandbox.translatewiki.net-linux
+ name: Translate-sandbox.translatewiki.net
browser: firefox
folder: tests
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET
@@ -241,7 +241,7 @@
repository: mediawiki/extensions/Translate
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# UniversalLanguageSelector
@@ -249,7 +249,7 @@
## commons.wikimedia.beta.wmflabs.org
- project:
- name: UniversalLanguageSelector-commons.wikimedia.beta.wmflabs.org-linux
+ name: UniversalLanguageSelector-commons.wikimedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
@@ -260,12 +260,12 @@
repository: mediawiki/extensions/UniversalLanguageSelector
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## language-browsertests.wmflabs.org
- project:
- name: UniversalLanguageSelector-language-browsertests.wmflabs.org-linux
+ name: UniversalLanguageSelector-language-browsertests.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_BTTESTING_WMFLABS_ORG
@@ -276,12 +276,12 @@
repository: mediawiki/extensions/UniversalLanguageSelector
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## sandbox.translatewiki.net
- project:
- name: UniversalLanguageSelector-sandbox.translatewiki.net-linux
+ name: UniversalLanguageSelector-sandbox.translatewiki.net
browser: firefox
folder: tests
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
@@ -292,9 +292,9 @@
repository: mediawiki/extensions/UniversalLanguageSelector
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
-# UploadWizard-commons.wikimedia.beta.wmflabs.org-linux-chrome
+# UploadWizard-commons.wikimedia.beta.wmflabs.org-chrome
## API
@@ -323,7 +323,7 @@
## commons.wikimedia.beta.wmflabs.org
- project:
- name: UploadWizard-commons.wikimedia.beta.wmflabs.org-linux
+ name: UploadWizard-commons.wikimedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -334,14 +334,14 @@
repository: mediawiki/extensions/UploadWizard
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# VisualEditor
## en.wikipedia.beta.wmflabs.org
- project:
- name: VisualEditor-en.wikipedia.beta.wmflabs.org-linux
+ name: VisualEditor-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: modules/ve-mw/test
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -352,12 +352,12 @@
repository: mediawiki/extensions/VisualEditor
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## production
- project:
- name: production-linux
+ name: production
browser: firefox
folder: modules/ve-mw/test
platform: linux
@@ -365,12 +365,12 @@
repository: mediawiki/extensions/VisualEditor
jobs:
- - 'browsertests-VisualEditor-{name}-{browser}'
+ - 'browsertests-VisualEditor-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
- name: VisualEditor-test2.wikipedia.org-linux
+ name: VisualEditor-test2.wikipedia.org
browser: firefox
folder: modules/ve-mw/test
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -381,14 +381,14 @@
repository: mediawiki/extensions/VisualEditor
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# WikiLove
## en.wikipedia.beta.wmflabs.org
- project:
- name: WikiLove-en.wikipedia.beta.wmflabs.org-linux
+ name: WikiLove-en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -399,29 +399,30 @@
repository: mediawiki/extensions/WikiLove
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
# ZeroRatedMobileAccess
## en.m.wikipedia.org
- project:
- name: en.m.wikipedia.org-linux
+ name: en.m.wikipedia.org
browser: phantomjs
folder: tests
mediawiki_url: en.m.wikipedia.org
+ platform: linux
recipients: *emails-qa
repository: mediawiki/extensions/ZeroRatedMobileAccess
jobs:
- - 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
+ - 'browsertests-ZeroRatedMobileAccess-{name}-{platform}-{browser}'
# browsertests
## en.wikipedia.beta.wmflabs.org
- project:
- name: en.wikipedia.beta.wmflabs.org-linux
+ name: en.wikipedia.beta.wmflabs.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -432,12 +433,12 @@
repository: qa/browsertests
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
## test2.wikipedia.org
- project:
- name: test2.wikipedia.org-linux
+ name: test2.wikipedia.org
browser: firefox
folder: tests
mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -448,4 +449,4 @@
repository: qa/browsertests
jobs:
- - 'browsertests-{name}-{browser}'
+ - 'browsertests-{name}-{platform}-{browser}'
--
To view, visit https://gerrit.wikimedia.org/r/129651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I329aa5f16c7b94d013531ce36c4ee914fd8944a3
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
