Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292950
Change subject: Revert "mwext-mw-selenium to Nodepool"
......................................................................
Revert "mwext-mw-selenium to Nodepool"
This reverts commit d9b9e863b4d0d3bd92b71cfdaa344bd7a1dd8929.
Change-Id: I3456e0c73053c468c6d45cfe28b435774e374f1b
---
M jjb/mediawiki-extensions.yaml
M tests/test_zuul_ext_dependencies.py
M zuul/layout.yaml
M zuul/parameter_functions.py
4 files changed, 21 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/50/292950/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b8645a9..b9bd08e 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -156,21 +156,20 @@
# Generic mw-selenium job for extensions.
- job:
- name: 'mwext-mw-selenium-jessie'
- node: ci-jessie-wikimedia
+ name: 'mwext-mw-selenium'
+ node: contintLabsSlave && UbuntuTrusty
concurrent: true
triggers:
- zuul
- properties:
- - zeromq-event
builders:
- - castor-load
- prepare-mediawiki-zuul-project
- zuul-cloner:
projects: mediawiki/skins/Vector
- mw-selenium
publishers:
- - castor-save
+ - mw-selenium-cleanup
+ - localhost-cleanup
+ - mw-teardown-mysql
- archive-log-dir
logrotate:
daysToKeep: 15
@@ -178,21 +177,20 @@
# Generic mw-selenium job for extensions.
- job:
- name: 'mwext-mw-selenium-composer-jessie'
- node: ci-jessie-wikimedia
+ name: 'mwext-mw-selenium-composer'
+ node: contintLabsSlave && UbuntuTrusty
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:
- - castor-save
+ - mw-selenium-cleanup
+ - localhost-cleanup
+ - mw-teardown-mysql
- archive-log-dir
logrotate:
daysToKeep: 15
diff --git a/tests/test_zuul_ext_dependencies.py
b/tests/test_zuul_ext_dependencies.py
index 5b648f4..3f046cc 100644
--- a/tests/test_zuul_ext_dependencies.py
+++ b/tests/test_zuul_ext_dependencies.py
@@ -54,9 +54,7 @@
self.assertHasDependencies(self.fetch_dependencies(
job_name='mwext-qunit-jessie'))
self.assertHasDependencies(self.fetch_dependencies(
- job_name='mwext-mw-selenium-composer-jessie'))
- self.assertHasDependencies(self.fetch_dependencies(
- job_name='mwext-mw-selenium-jessie'))
+ job_name='mwext-mw-selenium'))
self.assertMissingDependencies(self.fetch_dependencies(
job_name='mediawiki-core-phplint'))
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 518c5d1..78fb3d7 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-jessie
+ - mwext-mw-selenium
postmerge:
- - mwext-mw-selenium-jessie
+ - mwext-mw-selenium
- name: extension-gate
test:
@@ -2383,7 +2383,7 @@
- jsonlint
- jshint
experimental:
- - mwext-mw-selenium-composer-jessie
+ - mwext-mw-selenium-composer
- name: mediawiki/extensions/Arrays
template:
@@ -3097,7 +3097,7 @@
- jshint
- jsonlint
experimental:
- - mwext-mw-selenium-jessie
+ - mwext-mw-selenium
postmerge:
- mwext-jsduck-publish
@@ -6361,7 +6361,7 @@
gate-and-submit:
- composer-package-validate
experimental:
- - mwext-mw-selenium-composer-jessie
+ - mwext-mw-selenium-composer
- name: mediawiki/extensions/WikiLabels
template:
@@ -7036,7 +7036,7 @@
- jshint
experimental:
# T120715
- - mwext-mw-selenium-jessie
+ - mwext-mw-selenium
- 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-jessie
+ - mwext-mw-selenium-composer
- 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-jessie
+ - mwext-mw-selenium-composer
- 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 7118e6e..8de3e72 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_starting_with = (
+ ext_deps_jobs = (
'mwext-testextension',
'mwext-qunit-jessie',
'mwext-mw-selenium',
)
- if job.name.startswith(ext_deps_jobs_starting_with):
+ if job.name.startswith(ext_deps_jobs):
set_ext_dependencies(item, job, params)
if job.name.endswith('-jessie'):
--
To view, visit https://gerrit.wikimedia.org/r/292950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3456e0c73053c468c6d45cfe28b435774e374f1b
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
