jenkins-bot has submitted this change and it was merged.
Change subject: mwext-mw-selenium to Nodepool
......................................................................
mwext-mw-selenium to Nodepool
Impact:
Echo
MobileFrontend
MultimediaViewer
Popups
QuickSurveys
Wikibase
Bug: T137112
Change-Id: I82d470fb911e594943d8f881b5480429eb059db0
---
M jjb/mediawiki-extensions.yaml
M tests/test_zuul_ext_dependencies.py
M zuul/layout.yaml
M zuul/parameter_functions.py
4 files changed, 25 insertions(+), 21 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b9bd08e..b8645a9 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -156,20 +156,21 @@
# Generic mw-selenium job for extensions.
- job:
- name: 'mwext-mw-selenium'
- node: contintLabsSlave && UbuntuTrusty
+ name: 'mwext-mw-selenium-jessie'
+ node: ci-jessie-wikimedia
concurrent: true
triggers:
- zuul
+ properties:
+ - zeromq-event
builders:
+ - castor-load
- prepare-mediawiki-zuul-project
- zuul-cloner:
projects: mediawiki/skins/Vector
- mw-selenium
publishers:
- - mw-selenium-cleanup
- - localhost-cleanup
- - mw-teardown-mysql
+ - castor-save
- archive-log-dir
logrotate:
daysToKeep: 15
@@ -177,20 +178,21 @@
# Generic mw-selenium job for extensions.
- job:
- name: 'mwext-mw-selenium-composer'
- node: contintLabsSlave && UbuntuTrusty
+ name: 'mwext-mw-selenium-composer-jessie'
+ node: ci-jessie-wikimedia
concurrent: true
triggers:
- zuul
+ properties:
+ - zeromq-event
builders:
+ - castor-load
- prepare-mediawiki-zuul-project-no-vendor
- zuul-cloner:
projects: mediawiki/skins/Vector
- mw-selenium
publishers:
- - mw-selenium-cleanup
- - localhost-cleanup
- - mw-teardown-mysql
+ - castor-save
- archive-log-dir
logrotate:
daysToKeep: 15
diff --git a/tests/test_zuul_ext_dependencies.py
b/tests/test_zuul_ext_dependencies.py
index 3f046cc..5b648f4 100644
--- a/tests/test_zuul_ext_dependencies.py
+++ b/tests/test_zuul_ext_dependencies.py
@@ -54,7 +54,9 @@
self.assertHasDependencies(self.fetch_dependencies(
job_name='mwext-qunit-jessie'))
self.assertHasDependencies(self.fetch_dependencies(
- job_name='mwext-mw-selenium'))
+ job_name='mwext-mw-selenium-composer-jessie'))
+ self.assertHasDependencies(self.fetch_dependencies(
+ job_name='mwext-mw-selenium-jessie'))
self.assertMissingDependencies(self.fetch_dependencies(
job_name='mediawiki-core-phplint'))
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 78fb3d7..518c5d1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1002,9 +1002,9 @@
# Intentionally not in gate because it's super slow
- name: extension-selenium
test:
- - mwext-mw-selenium
+ - mwext-mw-selenium-jessie
postmerge:
- - mwext-mw-selenium
+ - mwext-mw-selenium-jessie
- name: extension-gate
test:
@@ -2383,7 +2383,7 @@
- jsonlint
- jshint
experimental:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- name: mediawiki/extensions/Arrays
template:
@@ -3097,7 +3097,7 @@
- jshint
- jsonlint
experimental:
- - mwext-mw-selenium
+ - mwext-mw-selenium-jessie
postmerge:
- mwext-jsduck-publish
@@ -6361,7 +6361,7 @@
gate-and-submit:
- composer-package-validate
experimental:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- name: mediawiki/extensions/WikiLabels
template:
@@ -7036,7 +7036,7 @@
- jshint
experimental:
# T120715
- - mwext-mw-selenium
+ - mwext-mw-selenium-jessie
- name: mediawiki/extensions/RelatedSites
template:
@@ -7733,12 +7733,12 @@
- mwext-Wikibase-client-tests-mysql-php55
- mwext-Wikibase-client-tests-sqlite-php55
test:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- mwext-Wikibase-repo-tests-sqlite-hhvm
- mwext-Wikibase-client-tests-mysql-hhvm
- mwext-Wikibase-client-tests-sqlite-hhvm
gate-and-submit:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- mwext-Wikibase-repo-tests-sqlite-php53
- mwext-Wikibase-repo-tests-sqlite-php55
- mwext-Wikibase-repo-tests-sqlite-hhvm
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 8de3e72..7118e6e 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -44,12 +44,12 @@
# T128091: oojs/ui npm job runs on Jessie which only has HHVM
params['PHP_BIN'] = 'hhvm'
- ext_deps_jobs = (
+ ext_deps_jobs_starting_with = (
'mwext-testextension',
'mwext-qunit-jessie',
'mwext-mw-selenium',
)
- if job.name.startswith(ext_deps_jobs):
+ if job.name.startswith(ext_deps_jobs_starting_with):
set_ext_dependencies(item, job, params)
if job.name.endswith('-jessie'):
--
To view, visit https://gerrit.wikimedia.org/r/292927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82d470fb911e594943d8f881b5480429eb059db0
Gerrit-PatchSet: 7
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[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
