Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290486
Change subject: Migrate npm legacy test to trusty nodepool
......................................................................
Migrate npm legacy test to trusty nodepool
Change-Id: I4f2048625e9c568180393b636650430f3d8f004b
---
M jjb/job-templates.yaml
M zuul/layout.yaml
2 files changed, 39 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/86/290486/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 2a2266b..85baa78 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -81,17 +81,37 @@
maven:
goals: clean package
-- job:
- name: 'npm'
- node: contintLabsSlave && UbuntuTrusty
+- job: &job_npm-0.10-trusty
+ name: 'npm-trusty'
+ node: ci-trusty-wikimedia
defaults: use-remote-zuul-shallow-clone
concurrent: true
+ properties:
+ - zeromq-event
triggers:
- zuul
builders:
- - npm
+ - assert-node-version-0.10
+ # FIXME: we should save node_modules and run npm prune
+ - castor-load
+ - shell: |
+ # For archiving build artifacts
+ mkdir -p "$WORKSPACE/log"
+
+ node --version
+ npm --version
+ npm install
+ npm test
publishers:
- - global-teardown
+ - archive-log-allow-empty
+ - castor-save
+
+- job-template:
+ !!merge : *job_npm-0.10-trusty
+ name: '{name}-npm-trusty'
+ # Reinject Zuul parameters since JJB strip for some reason
+ triggers:
+ - zuul
- job: &job_npm-node-4_3
name: 'npm-node-4.3'
@@ -163,19 +183,27 @@
- archive-log-allow-empty
- castor-save
-
- job-template:
- name: '{name}-{repository}-npm'
- node: contintLabsSlave && UbuntuTrusty
+ name: '{name}-{repository}-npm-trusty'
+ node: ci-trusty-wikimedia
defaults: use-remoteonly-zuul
concurrent: true
+ properties:
+ - zeromq-event
triggers:
- zuul
builders:
+ - assert-node-version-0.10
+ # FIXME: we should save node_modules and run npm prune
+ - castor-load
+ - shell: |
+ # For archiving build artifacts
+ mkdir -p "$WORKSPACE/log"
- npm-oid:
repository: '{repository}'
publishers:
- - global-teardown
+ - archive-log-allow-empty
+ - castor-save
# Similar to '{name}-{repository}-npm' but:
# - runs on Nodepool instances
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c764b2a..3ed4aeb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1168,9 +1168,9 @@
- name: npm-legacy
test:
- - npm
+ - npm-trusty
gate-and-submit:
- - npm
+ - npm-trusty
experimental:
- npm-node-4.3
--
To view, visit https://gerrit.wikimedia.org/r/290486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f2048625e9c568180393b636650430f3d8f004b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
