jenkins-bot has submitted this change and it was merged.
Change subject: Migrate parsoid test jobs to Nodepool
......................................................................
Migrate parsoid test jobs to Nodepool
Keep them on Trusty with NodeJS 0.10 for now.
Bug: T126992
Change-Id: I703c491bd39b9e73b0fd99d3efb3a1e67db8af38
---
M jjb/parsoidsvc.yaml
M zuul/layout.yaml
2 files changed, 22 insertions(+), 18 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 0640be7..81e8679 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -45,12 +45,12 @@
- castor-save
- job-template:
- name: parsoidsvc-{repository}-parse-tool-check
- node: contintLabsSlave && UbuntuTrusty
+ name: parsoidsvc-{repository}-parse-tool-check-trusty
defaults: use-remoteonly-zuul
+ node: ci-trusty-wikimedia
concurrent: true
properties:
- - throttle-one-per-node
+ - zeromq-event
wrappers:
- timeout:
timeout: 5
@@ -60,6 +60,8 @@
triggers:
- zuul
builders:
+ - assert-node-version-0.10
+ - castor-load
- setup-npm-oid:
repository: '{repository}'
- shell: |
@@ -72,15 +74,15 @@
echo "Foo" | node parse.js --html2wt
echo "Foo" | node parse.js --html2html
publishers:
- - global-teardown
+ - castor-save
- job-template:
- name: parsoidsvc-{repository}-roundtrip-test-check
- node: contintLabsSlave && UbuntuTrusty
+ name: parsoidsvc-{repository}-roundtrip-test-check-trusty
defaults: use-remoteonly-zuul
+ node: ci-trusty-wikimedia
concurrent: true
properties:
- - throttle-one-per-node
+ - zeromq-event
wrappers:
- timeout:
timeout: 10
@@ -90,6 +92,8 @@
triggers:
- zuul
builders:
+ - assert-node-version-0.10
+ - castor-load
- setup-npm-oid:
repository: '{repository}'
- shell: |
@@ -101,7 +105,7 @@
node roundtrip-test.js --prefix frwiki "Chope"
node roundtrip-test.js --xml "Parkour"
publishers:
- - global-teardown
+ - castor-save
- job-template:
name: parsoidsvc-{repository}-npm-0.10
@@ -205,8 +209,8 @@
script: 'lint'
- '{name}-debian-glue':
distribution: trusty
- - 'parsoidsvc-{repository}-parse-tool-check'
- - 'parsoidsvc-{repository}-roundtrip-test-check'
+ - 'parsoidsvc-{repository}-parse-tool-check-trusty'
+ - 'parsoidsvc-{repository}-roundtrip-test-check-trusty'
- 'parsoidsvc-{repository}-npm-0.10'
- 'parsoidsvc-{repository}-npm-node-4.3'
- 'parsoidsvc-{repository}-jsduck-publish'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d6e8847..e379b8d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6846,15 +6846,15 @@
test:
- parsoidsvc-npm-run-lint-node-4.3
- parsoidsvc-hhvm-parsertests-jessie
- - parsoidsvc-source-parse-tool-check
- - parsoidsvc-source-roundtrip-test-check
+ - parsoidsvc-source-parse-tool-check-trusty
+ - parsoidsvc-source-roundtrip-test-check-trusty
- parsoidsvc-source-npm-0.10
#- parsoidsvc-source-npm-node-4.3
gate-and-submit:
- parsoidsvc-npm-run-lint-node-4.3
- parsoidsvc-hhvm-parsertests-jessie
- - parsoidsvc-source-parse-tool-check
- - parsoidsvc-source-roundtrip-test-check
+ - parsoidsvc-source-parse-tool-check-trusty
+ - parsoidsvc-source-roundtrip-test-check-trusty
- parsoidsvc-source-npm-0.10
#- parsoidsvc-source-npm-node-4.3
postmerge:
@@ -6866,13 +6866,13 @@
- name: mediawiki/services/parsoid/deploy
test:
- parsoidsvc-debian-glue
- - parsoidsvc-deploy-parse-tool-check
- - parsoidsvc-deploy-roundtrip-test-check
+ - parsoidsvc-deploy-parse-tool-check-trusty
+ - parsoidsvc-deploy-roundtrip-test-check-trusty
- parsoidsvc-deploy-npm-0.10
#- parsoidsvc-deploy-npm-node-4.3
gate-and-submit:
- - parsoidsvc-deploy-parse-tool-check
- - parsoidsvc-deploy-roundtrip-test-check
+ - parsoidsvc-deploy-parse-tool-check-trusty
+ - parsoidsvc-deploy-roundtrip-test-check-trusty
- parsoidsvc-deploy-npm-0.10
#- parsoidsvc-deploy-npm-node-4.3
postmerge:
--
To view, visit https://gerrit.wikimedia.org/r/290675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I703c491bd39b9e73b0fd99d3efb3a1e67db8af38
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
