jenkins-bot has submitted this change and it was merged.
Change subject: mwext-qunit jobs to Nodepool
......................................................................
mwext-qunit jobs to Nodepool
Bug: T136301
Change-Id: Iafb1f970f5f24579e27761585a1714c3f5022e28
---
M jjb/mediawiki-extensions.yaml
M tests/test_zuul_ext_dependencies.py
M zuul/layout.yaml
M zuul/parameter_functions.py
4 files changed, 31 insertions(+), 21 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b7804e0..b9bd08e 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -122,32 +122,36 @@
# Generic qunit job for extensions.
- job:
- name: 'mwext-qunit'
- node: contintLabsSlave && UbuntuTrusty
+ name: 'mwext-qunit-jessie'
+ node: ci-jessie-wikimedia
concurrent: true
triggers:
- zuul
+ properties:
+ - zeromq-event
builders:
+ - castor-load
- prepare-mediawiki-zuul-project
- qunit-karma
publishers:
- - localhost-cleanup
- - mw-teardown-mysql
+ - castor-save
- archive-log-dir
# Generic qunit job for extensions with composer update.
- job:
- name: 'mwext-qunit-composer'
- node: contintLabsSlave && UbuntuTrusty
+ name: 'mwext-qunit-composer-jessie'
+ node: ci-jessie-wikimedia
concurrent: true
triggers:
- zuul
+ properties:
+ - zeromq-event
builders:
+ - castor-load
- prepare-mediawiki-zuul-project-no-vendor
- qunit-karma
publishers:
- - localhost-cleanup
- - mw-teardown-mysql
+ - castor-save
- archive-log-dir
# Generic mw-selenium job for extensions.
diff --git a/tests/test_zuul_ext_dependencies.py
b/tests/test_zuul_ext_dependencies.py
index 1d747b0..3f046cc 100644
--- a/tests/test_zuul_ext_dependencies.py
+++ b/tests/test_zuul_ext_dependencies.py
@@ -52,7 +52,7 @@
self.assertHasDependencies(self.fetch_dependencies(
job_name='mwext-testextension-hhvm'))
self.assertHasDependencies(self.fetch_dependencies(
- job_name='mwext-qunit'))
+ job_name='mwext-qunit-jessie'))
self.assertHasDependencies(self.fetch_dependencies(
job_name='mwext-mw-selenium'))
self.assertMissingDependencies(self.fetch_dependencies(
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9f63196..b233904 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -910,7 +910,7 @@
- mwext-testextension-hhvm-composer
- composer-validate
experimental:
- - mwext-qunit-composer
+ - mwext-qunit-composer-jessie
- npm-node-4.3
- composer-php53
- composer-php55-trusty
@@ -934,7 +934,7 @@
- php55lint
- composer-validate
experimental:
- - mwext-qunit-composer
+ - mwext-qunit-composer-jessie
- composer-php53
- composer-php55-trusty
- composer-hhvm-trusty
@@ -1030,17 +1030,17 @@
# Triggers the generic mwext-qunit job
- name: extension-qunit-generic
test:
- - mwext-qunit
+ - mwext-qunit-jessie
gate-and-submit:
- - mwext-qunit
+ - mwext-qunit-jessie
experimental:
- - mwext-qunit-composer
+ - mwext-qunit-composer-jessie
- name: extension-qunit-composer
test:
- - mwext-qunit-composer
+ - mwext-qunit-composer-jessie
gate-and-submit:
- - mwext-qunit-composer
+ - mwext-qunit-composer-jessie
- name: jsduck
test:
@@ -1060,8 +1060,8 @@
- jsonlint
- composer-validate
experimental:
- - mwext-qunit-composer
- - mwext-qunit
+ - mwext-qunit-composer-jessie
+ - mwext-qunit-jessie
- mwext-testextension-hhvm
- mwext-testextension-hhvm-composer
- npm-node-4.3
@@ -1087,8 +1087,8 @@
- jsonlint
- composer-validate
experimental:
- - mwext-qunit-composer
- - mwext-qunit
+ - mwext-qunit-composer-jessie
+ - mwext-qunit-jessie
- mwext-testextension-hhvm
- mwext-testextension-hhvm-composer
- npm-node-4.3
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 11c3c1b..893ee99 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -24,6 +24,8 @@
php5_jobs = (
# Qunit localhost uses apache mod_php which is Zend. Lets be consistent
'mediawiki-core-qunit-jessie',
+ 'mwext-qunit-jessie',
+ 'mwext-qunit-composer-jessie',
)
# Sets a $PHP_BIN variable based on the job name
@@ -41,7 +43,11 @@
# T128091: oojs/ui npm job runs on Jessie which only has HHVM
params['PHP_BIN'] = 'hhvm'
- ext_deps_jobs = ('mwext-testextension', 'mwext-qunit', 'mwext-mw-selenium')
+ ext_deps_jobs = (
+ 'mwext-testextension',
+ 'mwext-qunit-jessie',
+ 'mwext-mw-selenium',
+ )
if job.name.startswith(ext_deps_jobs):
set_ext_dependencies(item, job, params)
--
To view, visit https://gerrit.wikimedia.org/r/292910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafb1f970f5f24579e27761585a1714c3f5022e28
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
