Hashar has uploaded a new change for review.

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

Change subject: Make the job template to vary by browser
......................................................................

Make the job template to vary by browser

That will let us easily generate jobs for different browser.

Something to take in mind for later is that all firefox jobs pass
'version' which needs to vary for each browsers :/

Change-Id: I79ed070cc6789d85e109c2113de61c198583be5b
---
M job_template.yaml
M jobs.yaml
2 files changed, 45 insertions(+), 45 deletions(-)


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

diff --git a/job_template.yaml b/job_template.yaml
index 3dab527..2eee2cf 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -1,7 +1,7 @@
 # default
 
 - job-template:
-    name: 'browsertests-{name}'
+    name: 'browsertests-{name}-{browser}'
     defaults: browsertests
 
 - defaults:
diff --git a/jobs.yaml b/jobs.yaml
index f5fdf40..f5407b4 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -24,7 +24,7 @@
 ## test2.wikipedia.org
 
 - project:
-    name: CentralAuth-test2.wikipedia.org-linux-firefox
+    name: CentralAuth-test2.wikipedia.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -36,14 +36,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+        - 'browsertests-{name}-{browser}'
 
 # CirrusSearch
 
 ## en.wikipedia.beta.wmflabs.org
 
 - project:
-    name: CirrusSearch-en.wikipedia.beta.wmflabs.org-linux-firefox
+    name: CirrusSearch-en.wikipedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -55,12 +55,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## test2.wikipedia.org
 
 - project:
-    name: CirrusSearch-test2.wikipedia.org-linux-firefox
+    name: CirrusSearch-test2.wikipedia.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -72,14 +72,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # ContentTranslation
 
 ## language-stage.wmflabs.org
 
 - project:
-    name: ContentTranslation-language-stage.wmflabs.org-linux-firefox
+    name: ContentTranslation-language-stage.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_USER_LANGUAGE_STAGE_WMFLABS_ORG
@@ -91,14 +91,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # Flow
 
 ## en.wikipedia.beta.wmflabs.org
 
 - project:
-    name: Flow-en.wikipedia.beta.wmflabs.org-linux-firefox
+    name: Flow-en.wikipedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -110,12 +110,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## test2.wikipedia.org
 
 - project:
-    name: Flow-test2.wikipedia.org-linux-firefox
+    name: Flow-test2.wikipedia.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -127,14 +127,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # MobileFrontend
 
 ## en.m.wikipedia.beta.wmflabs.org
 
 - project:
-    name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org-linux-firefox
+    name: MobileFrontend-en.m.wikipedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -146,12 +146,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## en.m.wikipedia.org
 
 - project:
-    name: MobileFrontend-en.m.wikipedia.org-linux-firefox
+    name: MobileFrontend-en.m.wikipedia.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -163,12 +163,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## test2.m.wikipedia.org
 
 - project:
-    name: MobileFrontend-test2.m.wikipedia.org-linux-firefox
+    name: MobileFrontend-test2.m.wikipedia.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -180,14 +180,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # MultimediaViewer
 
 ## en.wikipedia.beta.wmflabs.org
 
 - project:
-    name: MultimediaViewer-en.wikipedia.beta.wmflabs.org-linux-firefox
+    name: MultimediaViewer-en.wikipedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -199,14 +199,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # TwnMainPage
 
 ## sandbox.translatewiki.net
 
 - project:
-    name: TwnMainPage-sandbox.translatewiki.net-linux-firefox
+    name: TwnMainPage-sandbox.translatewiki.net-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
@@ -218,14 +218,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # Translate
 
 ## meta.wikimedia.org
 
 - project:
-    name: Translate-meta.wikimedia.org-linux-firefox
+    name: Translate-meta.wikimedia.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
@@ -237,12 +237,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## sandbox.translatewiki.net
 
 - project:
-    name: Translate-sandbox.translatewiki.net-linux-firefox
+    name: Translate-sandbox.translatewiki.net-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET
@@ -254,7 +254,7 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 
 # UniversalLanguageSelector
@@ -262,7 +262,7 @@
 ## commons.wikimedia.beta.wmflabs.org
 
 - project:
-    name: 
UniversalLanguageSelector-commons.wikimedia.beta.wmflabs.org-linux-firefox
+    name: UniversalLanguageSelector-commons.wikimedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
@@ -274,12 +274,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## language-browsertests.wmflabs.org
 
 - project:
-    name: 
UniversalLanguageSelector-language-browsertests.wmflabs.org-linux-firefox
+    name: UniversalLanguageSelector-language-browsertests.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_BTTESTING_WMFLABS_ORG
@@ -291,12 +291,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## sandbox.translatewiki.net
 
 - project:
-    name: UniversalLanguageSelector-sandbox.translatewiki.net-linux-firefox
+    name: UniversalLanguageSelector-sandbox.translatewiki.net-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
@@ -308,7 +308,7 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # UploadWizard-commons.wikimedia.beta.wmflabs.org-linux-chrome
 
@@ -339,7 +339,7 @@
 ## commons.wikimedia.beta.wmflabs.org
 
 - project:
-    name: UploadWizard-commons.wikimedia.beta.wmflabs.org-linux-firefox
+    name: UploadWizard-commons.wikimedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -351,14 +351,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # VisualEditor
 
 ## en.wikipedia.beta.wmflabs.org
 
 - project:
-    name: VisualEditor-en.wikipedia.beta.wmflabs.org-linux-firefox
+    name: VisualEditor-en.wikipedia.beta.wmflabs.org-linux
     browser: firefox
     folder: modules/ve-mw/test
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -370,7 +370,7 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## production
 
@@ -389,7 +389,7 @@
 ## test2.wikipedia.org
 
 - project:
-    name: VisualEditor-test2.wikipedia.org-linux-firefox
+    name: VisualEditor-test2.wikipedia.org-linux
     browser: firefox
     folder: modules/ve-mw/test
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -401,14 +401,14 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # WikiLove
 
 ## en.wikipedia.beta.wmflabs.org
 
 - project:
-    name: WikiLove-en.wikipedia.beta.wmflabs.org-linux-firefox
+    name: WikiLove-en.wikipedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -420,7 +420,7 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 # ZeroRatedMobileAccess
 
@@ -441,7 +441,7 @@
 ## en.wikipedia.beta.wmflabs.org
 
 - project:
-    name: en.wikipedia.beta.wmflabs.org-linux-firefox
+    name: en.wikipedia.beta.wmflabs.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
@@ -453,12 +453,12 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'
 
 ## test2.wikipedia.org
 
 - project:
-    name: test2.wikipedia.org-linux-firefox
+    name: test2.wikipedia.org-linux
     browser: firefox
     folder: tests
     mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
@@ -470,4 +470,4 @@
     version: 27
 
     jobs:
-      - 'browsertests-{name}'
+      - 'browsertests-{name}-{browser}'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79ed070cc6789d85e109c2113de61c198583be5b
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

Reply via email to