jenkins-bot has submitted this change and it was merged.
Change subject: Rename npm-node-4.3 to npm-node-4
......................................................................
Rename npm-node-4.3 to npm-node-4
Change-Id: I4a33a4f9f20e78c4c53bce31c253d0e7ea4b2f65
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki-services.yaml
M jjb/mediawiki.yaml
M jjb/oojs.yaml
M jjb/parsoidsvc.yaml
M jjb/wikimedia.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
9 files changed, 61 insertions(+), 61 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index cc08cba..b341989 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -122,8 +122,8 @@
triggers:
- zuul
-- job: &job_npm-node-4_3
- name: 'npm-node-4.3'
+- job: &job_npm-node-4
+ name: 'npm-node-4'
node: ci-jessie-wikimedia
defaults: use-remote-zuul-shallow-clone
concurrent: true
@@ -146,8 +146,8 @@
- castor-save
- job-template:
- !!merge : *job_npm-node-4_3
- name: '{name}-npm-node-4.3'
+ !!merge : *job_npm-node-4
+ name: '{name}-npm-node-4'
# Reinject Zuul parameters since JJB strip for some reason
triggers:
- zuul
@@ -167,7 +167,7 @@
- global-teardown
- job-template:
- name: '{name}-npm-run-{script}-node-4.3'
+ name: '{name}-npm-run-{script}-node-4'
node: ci-jessie-wikimedia
defaults: use-remoteonly-zuul
concurrent: true
@@ -209,7 +209,7 @@
- castor-save
- job-template:
- name: '{name}-{repository}-npm-node-4.3'
+ name: '{name}-{repository}-npm-node-4'
node: ci-jessie-wikimedia
defaults: use-remoteonly-zuul
concurrent: true
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 4a7d7b9..9f601c3 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -3,7 +3,7 @@
# Only VisualEditor uses this as it needs to checkout
# submodules.
- job:
- name: 'mwext-VisualEditor-npm-node-4.3'
+ name: 'mwext-VisualEditor-npm-node-4'
node: ci-jessie-wikimedia
defaults: use-remoteonly-zuul
concurrent: true
@@ -353,4 +353,4 @@
name: 'mwext-VisualEditor'
jobs:
- '{name}-jsduck'
- - 'mwext-VisualEditor-npm-node-4.3'
+ - 'mwext-VisualEditor-npm-node-4'
diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml
index f39807b..c08b9e6 100644
--- a/jjb/mediawiki-services.yaml
+++ b/jjb/mediawiki-services.yaml
@@ -3,7 +3,7 @@
repository:
- deploy
jobs:
- - '{name}-{repository}-npm-node-4.3'
+ - '{name}-{repository}-npm-node-4'
- project:
# mediawiki/services/cxserver.git
@@ -11,25 +11,25 @@
repository:
- deploy # mediawiki/services/cxserver/deploy
jobs:
- - '{name}-{repository}-npm-node-4.3'
+ - '{name}-{repository}-npm-node-4'
- project:
name: 'graphoid'
repository:
- deploy
jobs:
- - '{name}-{repository}-npm-node-4.3'
+ - '{name}-{repository}-npm-node-4'
- project:
name: 'mathoid'
repository:
- deploy
jobs:
- - '{name}-{repository}-npm-node-4.3'
+ - '{name}-{repository}-npm-node-4'
- project:
name: 'mobileapps'
repository:
- deploy
jobs:
- - '{name}-{repository}-npm-node-4.3'
+ - '{name}-{repository}-npm-node-4'
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 05021ca..7b44a20 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -5,7 +5,7 @@
# submodules we do not care about. See bug 42455.
- job-template:
- name: 'mediawiki-core-npm-node-4.3'
+ name: 'mediawiki-core-npm-node-4'
node: ci-jessie-wikimedia
concurrent: true
triggers:
@@ -353,7 +353,7 @@
jobs:
- 'mediawiki-core-qunit-jessie'
- 'mediawiki-core-jsduck'
- - 'mediawiki-core-npm-node-4.3'
+ - 'mediawiki-core-npm-node-4'
- 'mediawiki-core-jsduck-publish'
- 'mediawiki-core-doxygen-publish'
- '{name}-php53lint'
diff --git a/jjb/oojs.yaml b/jjb/oojs.yaml
index 3156e5e..7d1156c 100644
--- a/jjb/oojs.yaml
+++ b/jjb/oojs.yaml
@@ -1,8 +1,8 @@
- project:
name: oojs-ui
jobs:
- - '{name}-npm-node-4.3'
- - '{name}-npm-run-{script}-node-4.3':
+ - '{name}-npm-node-4'
+ - '{name}-npm-run-{script}-node-4':
script:
- doc
- demos
diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 37c2cf2..555b6b9 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -97,7 +97,7 @@
- castor-save
- job-template:
- name: parsoidsvc-{repository}-npm-node-4.3
+ name: parsoidsvc-{repository}-npm-node-4
node: ci-jessie-wikimedia
defaults: use-remoteonly-zuul
concurrent: true
@@ -196,11 +196,11 @@
- source # mediawiki/services/parsoid
- deploy # mediawiki/services/parsoid/deploy
jobs:
- - '{name}-npm-run-{script}-node-4.3':
+ - '{name}-npm-run-{script}-node-4':
script: 'lint'
- 'parsoidsvc-{repository}-parse-tool-check-trusty'
- 'parsoidsvc-{repository}-roundtrip-test-check-trusty'
- - 'parsoidsvc-{repository}-npm-node-4.3'
+ - 'parsoidsvc-{repository}-npm-node-4'
- 'parsoidsvc-{repository}-npm-node-0.10'
- 'parsoidsvc-{repository}-jsduck-publish'
- parsoidsvc-hhvm-parsertests-jessie
diff --git a/jjb/wikimedia.yaml b/jjb/wikimedia.yaml
index f01d5cb..a93ca8f 100644
--- a/jjb/wikimedia.yaml
+++ b/jjb/wikimedia.yaml
@@ -1,4 +1,4 @@
- project:
name: wikimedia-portals
jobs:
- - '{name}-npm-node-4.3'
+ - '{name}-npm-node-4'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 29d5c29..43c9e87 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -746,7 +746,7 @@
- '^.*\.(json|php|php5|phtml|inc|xml)$'
- - name: ^mediawiki-core-npm-node-4.3$
+ - name: ^mediawiki-core-npm-node-4$
files:
- '^(\.js.*|.*\.(js|json|less)$)'
@@ -911,7 +911,7 @@
- composer-validate
experimental:
- mwext-qunit-composer-jessie
- - npm-node-4.3
+ - npm-node-4
- composer-php53
- composer-php55
- composer-hhvm
@@ -965,7 +965,7 @@
- mediawiki-extensions-qunit-jessie
- mwext-testextension-php53-composer
- mwext-testextension-hhvm-composer
- - npm-node-4.3
+ - npm-node-4
- composer-php53
- composer-php55
- composer-hhvm
@@ -993,7 +993,7 @@
- mediawiki-extensions-qunit-jessie
- mwext-testextension-php53-composer
- mwext-testextension-hhvm-composer
- - npm-node-4.3
+ - npm-node-4
- composer-php53
- composer-php55
- composer-hhvm
@@ -1065,7 +1065,7 @@
- mwext-qunit-jessie
- mwext-testextension-hhvm
- mwext-testextension-hhvm-composer
- - npm-node-4.3
+ - npm-node-4
- composer-php53
- composer-php55
- composer-hhvm
@@ -1092,7 +1092,7 @@
- mwext-qunit-jessie
- mwext-testextension-hhvm
- mwext-testextension-hhvm-composer
- - npm-node-4.3
+ - npm-node-4
- composer-php53
- composer-php55
- composer-hhvm
@@ -1177,9 +1177,9 @@
- name: npm
test:
- - npm-node-4.3
+ - npm-node-4
gate-and-submit:
- - npm-node-4.3
+ - npm-node-4
- name: npm-node-0.10
test:
@@ -1187,7 +1187,7 @@
gate-and-submit:
- npm-node-0.10
experimental:
- - npm-node-4.3
+ - npm-node-4
- name: puppet
# FIXME add merge probably
@@ -1303,7 +1303,7 @@
test:
- mediawiki-core-phpcs
- mediawiki-core-jsduck
- - mediawiki-core-npm-node-4.3
+ - mediawiki-core-npm-node-4
- mediawiki-core-php53lint
- mediawiki-core-php55lint
- mediawiki-phpunit-hhvm-trusty
@@ -1318,7 +1318,7 @@
- mediawiki-phpunit-parsertests-php53
gate-and-submit:
- mediawiki-core-jsduck
- - mediawiki-core-npm-node-4.3
+ - mediawiki-core-npm-node-4
- mediawiki-core-php53lint
- mediawiki-core-php55lint
- mediawiki-core-phpcs
@@ -6987,9 +6987,9 @@
- name: mediawiki/services/citoid/deploy
test:
- - citoid-deploy-npm-node-4.3
+ - citoid-deploy-npm-node-4
gate-and-submit:
- - citoid-deploy-npm-node-4.3
+ - citoid-deploy-npm-node-4
- name: mediawiki/services/cxserver
template:
@@ -6999,9 +6999,9 @@
- name: mediawiki/services/cxserver/deploy
test:
- - cxserver-deploy-npm-node-4.3
+ - cxserver-deploy-npm-node-4
gate-and-submit:
- - cxserver-deploy-npm-node-4.3
+ - cxserver-deploy-npm-node-4
postmerge:
- beta-cxserver-update-eqiad
@@ -7011,9 +7011,9 @@
- name: mediawiki/services/graphoid/deploy
test:
- - graphoid-deploy-npm-node-4.3
+ - graphoid-deploy-npm-node-4
gate-and-submit:
- - graphoid-deploy-npm-node-4.3
+ - graphoid-deploy-npm-node-4
- name: mediawiki/services/jobrunner
template:
@@ -7025,9 +7025,9 @@
- name: mediawiki/services/mathoid/deploy
test:
- - mathoid-deploy-npm-node-4.3
+ - mathoid-deploy-npm-node-4
gate-and-submit:
- - mathoid-deploy-npm-node-4.3
+ - mathoid-deploy-npm-node-4
- name: mediawiki/services/mobileapps
template:
@@ -7035,25 +7035,25 @@
- name: mediawiki/services/mobileapps/deploy
test:
- - mobileapps-deploy-npm-node-4.3
+ - mobileapps-deploy-npm-node-4
gate-and-submit:
- - mobileapps-deploy-npm-node-4.3
+ - mobileapps-deploy-npm-node-4
- name: mediawiki/services/parsoid
test:
- - parsoidsvc-npm-run-lint-node-4.3
+ - parsoidsvc-npm-run-lint-node-4
- parsoidsvc-hhvm-parsertests-jessie
- parsoidsvc-source-parse-tool-check-trusty
- parsoidsvc-source-roundtrip-test-check-trusty
- parsoidsvc-source-npm-node-0.10
- - parsoidsvc-source-npm-node-4.3
+ - parsoidsvc-source-npm-node-4
gate-and-submit:
- - parsoidsvc-npm-run-lint-node-4.3
+ - parsoidsvc-npm-run-lint-node-4
- parsoidsvc-hhvm-parsertests-jessie
- parsoidsvc-source-parse-tool-check-trusty
- parsoidsvc-source-roundtrip-test-check-trusty
- parsoidsvc-source-npm-node-0.10
- - parsoidsvc-source-npm-node-4.3
+ - parsoidsvc-source-npm-node-4
postmerge:
- parsoidsvc-source-jsduck-publish
@@ -7063,12 +7063,12 @@
- parsoidsvc-deploy-parse-tool-check-trusty
- parsoidsvc-deploy-roundtrip-test-check-trusty
- parsoidsvc-deploy-npm-node-0.10
- - parsoidsvc-deploy-npm-node-4.3
+ - parsoidsvc-deploy-npm-node-4
gate-and-submit:
- parsoidsvc-deploy-parse-tool-check-trusty
- parsoidsvc-deploy-roundtrip-test-check-trusty
- parsoidsvc-deploy-npm-node-0.10
- - parsoidsvc-deploy-npm-node-4.3
+ - parsoidsvc-deploy-npm-node-4
- name: mediawiki/services/rcstream
template:
@@ -7855,10 +7855,10 @@
- jshint
- jsonlint
test:
- - mwext-VisualEditor-npm-node-4.3
+ - mwext-VisualEditor-npm-node-4
- mwext-VisualEditor-jsduck
gate-and-submit:
- - mwext-VisualEditor-npm-node-4.3
+ - mwext-VisualEditor-npm-node-4
- mwext-VisualEditor-jsduck
postmerge:
- mwext-VisualEditor-publish
@@ -8324,9 +8324,9 @@
- name: wikimedia/portals
test:
- - wikimedia-portals-npm-node-4.3
+ - wikimedia-portals-npm-node-4
gate-and-submit:
- - wikimedia-portals-npm-node-4.3
+ - wikimedia-portals-npm-node-4
- name: search/extra
test:
@@ -8375,15 +8375,15 @@
- oojs-ui-jshint
- oojs-ui-jsonlint
test:
- - oojs-ui-npm-node-4.3
+ - oojs-ui-npm-node-4
- oojs-ui-rake-jessie
- - oojs-ui-npm-run-demos-node-4.3
- - oojs-ui-npm-run-doc-node-4.3
+ - oojs-ui-npm-run-demos-node-4
+ - oojs-ui-npm-run-doc-node-4
gate-and-submit:
- - oojs-ui-npm-node-4.3
+ - oojs-ui-npm-node-4
- oojs-ui-rake-jessie
- - oojs-ui-npm-run-demos-node-4.3
- - oojs-ui-npm-run-doc-node-4.3
+ - oojs-ui-npm-run-demos-node-4
+ - oojs-ui-npm-run-doc-node-4
postmerge:
- oojs-ui-jsduck-publish
- oojs-ui-doxygen-publish
@@ -8435,7 +8435,7 @@
- name: wikidata/query/gui-deploy
experimental:
- - npm-node-4.3
+ - npm-node-4
- name: wikimedia/bots/jouncebot
template:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index d9efae8..6d5cffd 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -40,7 +40,7 @@
elif job.name in php5_jobs:
params['PHP_BIN'] = 'php5'
- if job.name.endswith('node-4.3'):
+ if job.name.endswith('node-4'):
# T128091: oojs/ui npm job runs on Jessie which only has HHVM
params['PHP_BIN'] = 'hhvm'
@@ -56,7 +56,7 @@
nodepool_params(item, job, params)
if job.name.endswith('-trusty'):
nodepool_params(item, job, params)
- elif job.name.endswith('node-4.3'):
+ elif job.name.endswith('node-4'):
nodepool_params(item, job, params)
elif job.name.endswith('node-0.10'):
nodepool_params(item, job, params)
--
To view, visit https://gerrit.wikimedia.org/r/304068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a33a4f9f20e78c4c53bce31c253d0e7ea4b2f65
Gerrit-PatchSet: 6
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
