Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/293096
Change subject: mwext-mw-selenium to Nodepool
......................................................................
mwext-mw-selenium to Nodepool
Previously sent as d9b9e86
Impact:
Echo
MobileFrontend
MultimediaViewer
Popups
QuickSurveys
Wikibase
Bug: T137112
Change-Id: I699d5be1ad3d57637f49add0dbfbfd94a23ff536
---
M jjb/mediawiki-extensions.yaml
M tests/test_zuul_ext_dependencies.py
M zuul/layout.yaml
3 files changed, 23 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/96/293096/1
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 4c13e6a..d9c798f 100644
--- a/tests/test_zuul_ext_dependencies.py
+++ b/tests/test_zuul_ext_dependencies.py
@@ -56,7 +56,9 @@
self.assertHasDependencies(self.fetch_dependencies(
job_name='mwext-qunit-composer-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 1e02691..5be341e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -998,9 +998,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:
@@ -2379,7 +2379,7 @@
- jsonlint
- jshint
experimental:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- name: mediawiki/extensions/Arrays
template:
@@ -3093,7 +3093,7 @@
- jshint
- jsonlint
experimental:
- - mwext-mw-selenium
+ - mwext-mw-selenium-jessie
postmerge:
- mwext-jsduck-publish
@@ -6357,7 +6357,7 @@
gate-and-submit:
- composer-package-validate
experimental:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- name: mediawiki/extensions/WikiLabels
template:
@@ -7032,7 +7032,7 @@
- jshint
experimental:
# T120715
- - mwext-mw-selenium
+ - mwext-mw-selenium-jessie
- name: mediawiki/extensions/RelatedSites
template:
@@ -7726,12 +7726,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
--
To view, visit https://gerrit.wikimedia.org/r/293096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I699d5be1ad3d57637f49add0dbfbfd94a23ff536
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
