[MediaWiki-commits] [Gerrit] Vary VisualEditor and ZeroRatedMobileAccess by browser - change (integration/jenkins-job-builder-config)

2014-04-25 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

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

Change subject: Vary VisualEditor and ZeroRatedMobileAccess by browser
..

Vary VisualEditor and ZeroRatedMobileAccess by browser

In fb8e6634 Make the job template to vary by browser I forgot to
update the job templates being used for VisualEditor and
ZeroRatedmobileAccess.  Simply add {browser} to them.

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


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

diff --git a/job_template.yaml b/job_template.yaml
index db8c9bb..677bb85 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -100,7 +100,7 @@
 # VisualEditor
 
 - job-template:
-name: 'browsertests-VisualEditor-{name}'
+name: 'browsertests-VisualEditor-{name}-{browser}'
 defaults: browsertests
 
 triggers:
@@ -164,7 +164,7 @@
 # ZeroRatedMobileAccess
 
 - job-template:
-name: 'browsertests-ZeroRatedMobileAccess-{name}'
+name: 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
 defaults: browsertests
 
 builders:
diff --git a/jobs.yaml b/jobs.yaml
index 1e4be9e..c0a7e94 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -357,7 +357,7 @@
 ## production
 
 - project:
-name: production-linux-firefox
+name: production-linux
 browser: firefox
 folder: modules/ve-mw/test
 platform: Linux
@@ -365,7 +365,7 @@
 repository: mediawiki/extensions/VisualEditor
 
 jobs:
-  - 'browsertests-VisualEditor-{name}'
+ - 'browsertests-VisualEditor-{name}-{browser}'
 
 ## test2.wikipedia.org
 
@@ -406,7 +406,7 @@
 ## en.m.wikipedia.org
 
 - project:
-name: en.m.wikipedia.org-linux-phantomjs
+name: en.m.wikipedia.org-linux
 browser: phantomjs
 folder: tests
 mediawiki_url: en.m.wikipedia.org
@@ -414,7 +414,7 @@
 repository: mediawiki/extensions/ZeroRatedMobileAccess
 
 jobs:
-  - 'browsertests-ZeroRatedMobileAccess-{name}'
+  - 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
 
 # browsertests
 

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

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

[MediaWiki-commits] [Gerrit] Vary VisualEditor and ZeroRatedMobileAccess by browser - change (integration/jenkins-job-builder-config)

2014-04-25 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Vary VisualEditor and ZeroRatedMobileAccess by browser
..


Vary VisualEditor and ZeroRatedMobileAccess by browser

In fb8e6634 Make the job template to vary by browser I forgot to
update the job templates being used for VisualEditor and
ZeroRatedmobileAccess.  Simply add {browser} to them.

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

Approvals:
  Zfilipin: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/job_template.yaml b/job_template.yaml
index db8c9bb..677bb85 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -100,7 +100,7 @@
 # VisualEditor
 
 - job-template:
-name: 'browsertests-VisualEditor-{name}'
+name: 'browsertests-VisualEditor-{name}-{browser}'
 defaults: browsertests
 
 triggers:
@@ -164,7 +164,7 @@
 # ZeroRatedMobileAccess
 
 - job-template:
-name: 'browsertests-ZeroRatedMobileAccess-{name}'
+name: 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
 defaults: browsertests
 
 builders:
diff --git a/jobs.yaml b/jobs.yaml
index 1e4be9e..c0a7e94 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -357,7 +357,7 @@
 ## production
 
 - project:
-name: production-linux-firefox
+name: production-linux
 browser: firefox
 folder: modules/ve-mw/test
 platform: Linux
@@ -365,7 +365,7 @@
 repository: mediawiki/extensions/VisualEditor
 
 jobs:
-  - 'browsertests-VisualEditor-{name}'
+ - 'browsertests-VisualEditor-{name}-{browser}'
 
 ## test2.wikipedia.org
 
@@ -406,7 +406,7 @@
 ## en.m.wikipedia.org
 
 - project:
-name: en.m.wikipedia.org-linux-phantomjs
+name: en.m.wikipedia.org-linux
 browser: phantomjs
 folder: tests
 mediawiki_url: en.m.wikipedia.org
@@ -414,7 +414,7 @@
 repository: mediawiki/extensions/ZeroRatedMobileAccess
 
 jobs:
-  - 'browsertests-ZeroRatedMobileAccess-{name}'
+  - 'browsertests-ZeroRatedMobileAccess-{name}-{browser}'
 
 # browsertests
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58840939c209329551a02e2dd939383f464e3fc5
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits