jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393246 )
Change subject: Migrate some npm jobs to Docker
......................................................................
Migrate some npm jobs to Docker
Some of the repositories require PhantomJS for testing. Use the
npm-browser container in such cases.
Change-Id: I019fe601e0c9c55885ae2dfc8cfafd25ed1147f4
---
M jjb/analytics.yaml
M jjb/misc.yaml
M jjb/mobile.yaml
M jjb/pywikibot.yaml
M jjb/wikimedia.yaml
M jjb/wm-fundraising.yaml
M zuul/layout.yaml
7 files changed, 25 insertions(+), 25 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/analytics.yaml b/jjb/analytics.yaml
index bc36bf5..a8597cd 100644
--- a/jjb/analytics.yaml
+++ b/jjb/analytics.yaml
@@ -141,4 +141,4 @@
- project:
name: 'analytics-wikistats2'
jobs:
- - '{name}-npm-node-6-jessie'
+ - '{name}-npm-browser-node-6-docker'
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index bf8ff03..054c628 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -108,12 +108,12 @@
- project:
name: mapdata
jobs:
- - '{name}-npm-node-6-jessie'
+ - '{name}-npm-node-6-docker'
- project:
name: marvin
jobs:
- - '{name}-npm-node-6-jessie'
+ - '{name}-npm-node-6-docker'
- project:
name: unicodejs
diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index 39fb485..14de0a6 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -127,7 +127,7 @@
name: 'apps-android-wikipedia'
jobs:
- '{name}-tox-docker'
- - '{name}-npm-node-6-jessie'
+ - '{name}-npm-node-6-docker'
- 'apps-android-wikipedia-test'
- 'apps-android-wikipedia-periodic-test'
- 'apps-android-wikipedia-publish'
diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index 5272da7..49e9eb5 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -43,7 +43,7 @@
- project:
name: pywikibot-i18n
jobs:
- - '{name}-npm-node-6-jessie'
+ - '{name}-npm-node-6-docker'
- job:
name: pywikibot-tests-beta-cluster
diff --git a/jjb/wikimedia.yaml b/jjb/wikimedia.yaml
index 8e829c0..2532bdd 100644
--- a/jjb/wikimedia.yaml
+++ b/jjb/wikimedia.yaml
@@ -89,7 +89,7 @@
- project:
name: wikimedia-portals
jobs:
- - '{name}-npm-node-6-jessie'
+ - '{name}-npm-browser-node-6-docker'
- project:
name: wikimedia-portals-deploy
diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 73de977..1353788 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -149,7 +149,7 @@
- project:
name: fundraising-dash
jobs:
- - '{name}-npm-node-6-jessie'
+ - '{name}-npm-node-6-docker'
# Test suite requires a MySQL server
- job:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3bbf55f..6c6ae02 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1382,15 +1382,15 @@
- name: mapdata
test:
- - mapdata-npm-node-6-jessie
+ - mapdata-npm-node-6-docker
gate-and-submit:
- - mapdata-npm-node-6-jessie
+ - mapdata-npm-node-6-docker
- name: marvin
test:
- - marvin-npm-node-6-jessie
+ - marvin-npm-node-6-docker
gate-and-submit:
- - marvin-npm-node-6-jessie
+ - marvin-npm-node-6-docker
- name: maps/kartotherian
test:
@@ -1398,7 +1398,7 @@
gate-and-submit:
- noop
experimental:
- - npm-node-6-jessie
+ - npm-node-6-docker
- name: maps/kartotherian/deploy
test:
@@ -1414,7 +1414,7 @@
gate-and-submit:
- noop
experimental:
- - npm-node-6-jessie
+ - npm-node-6-docker
- name: maps/tilerator/deploy
test:
@@ -1504,7 +1504,7 @@
- name: analytics/dashiki
experimental:
- - npm-node-6-jessie
+ - npm-node-6-docker
- name: analytics/geowiki
template:
@@ -1558,9 +1558,9 @@
- name: analytics/wikistats2
test:
- - analytics-wikistats2-npm-node-6-jessie
+ - analytics-wikistats2-npm-browser-node-6-docker
gate-and-submit:
- - analytics-wikistats2-npm-node-6-jessie
+ - analytics-wikistats2-npm-browser-node-6-docker
- name: analytics/wikimetrics
template:
@@ -1628,11 +1628,11 @@
- name: apps/android/wikipedia
test:
- - apps-android-wikipedia-npm-node-6-jessie
+ - apps-android-wikipedia-npm-node-6-docker
- apps-android-wikipedia-tox-docker
- apps-android-wikipedia-test
gate-and-submit:
- - apps-android-wikipedia-npm-node-6-jessie
+ - apps-android-wikipedia-npm-node-6-docker
- apps-android-wikipedia-tox-docker
- apps-android-wikipedia-test
postmerge:
@@ -2670,9 +2670,9 @@
- name: wikimedia/fundraising/dash
test:
- - fundraising-dash-npm-node-6-jessie
+ - fundraising-dash-npm-node-6-docker
gate-and-submit:
- - fundraising-dash-npm-node-6-jessie
+ - fundraising-dash-npm-node-6-docker
- name: wikimedia/fundraising/tools/DjangoBannerStats
template:
@@ -7425,9 +7425,9 @@
- name: pywikibot/i18n
test:
- - pywikibot-i18n-npm-node-6-jessie
+ - pywikibot-i18n-npm-node-6-docker
gate-and-submit:
- - pywikibot-i18n-npm-node-6-jessie
+ - pywikibot-i18n-npm-node-6-docker
- name: pywikibot/wikibase
test:
@@ -7627,9 +7627,9 @@
- name: wikimedia/portals
test:
- - wikimedia-portals-npm-node-6-jessie
+ - wikimedia-portals-npm-browser-node-6-docker
gate-and-submit:
- - wikimedia-portals-npm-node-6-jessie
+ - wikimedia-portals-npm-browser-node-6-docker
- name: wikimedia/portals/deploy
experimental:
@@ -7752,7 +7752,7 @@
- name: wikidata/query/gui-deploy
experimental:
- - npm-node-6-jessie
+ - npm-node-6-docker
- name: wikibase/javascript-api
test:
--
To view, visit https://gerrit.wikimedia.org/r/393246
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I019fe601e0c9c55885ae2dfc8cfafd25ed1147f4
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
