Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327177 )
Change subject: Properly inject SKIN_DEPENDENCIES
......................................................................
Properly inject SKIN_DEPENDENCIES
For mediawiki-core-selenium-jessie, we need to inject the Vector skin as
a dependency via SKIN_DEPENDENCIES. I thought about adding it directly
in the Jenkins job definition, however the Gearman plugin does not merge
Zuul parameters with the one from the job.
Remove the paramter from the job level (from 3a5661d0a) and move the
logic to the zuul parameter function.
Add a lame test to assert SKIN_DEPENDENCIES is injected.
Bug: T139740
Change-Id: I82db52a5c0205cf846f3945a696004fa5f19d4d0
---
M jjb/mediawiki.yaml
M tests/test_zuul_mw_dependencies.py
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/77/327177/1
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index f0bd6eb..de1e3c0 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -59,12 +59,6 @@
name: 'mediawiki-core-selenium-jessie'
node: ci-jessie-wikimedia
concurrent: true
- parameters:
- # Inject Vector. Not done in zuul/parameters_function.py since it does not
- # process when the triggering project is mediawiki/core.
- - string:
- name: 'SKIN_DEPENDENCIES'
- default: 'mediawiki/skins/Vector'
triggers:
- zuul
properties:
diff --git a/tests/test_zuul_mw_dependencies.py
b/tests/test_zuul_mw_dependencies.py
index de6098a..99f0972 100644
--- a/tests/test_zuul_mw_dependencies.py
+++ b/tests/test_zuul_mw_dependencies.py
@@ -101,6 +101,14 @@
self.assertMissingDependencies(self.fetch_dependencies(
project='foo/bar/baz'))
+ def test_vector_skin_added_to_selenium_job(self):
+ deps = self.fetch_dependencies(
+ job_name='mediawiki-core-selenium-jessie')
+ self.assertDictContainsSubset(
+ {'SKIN_DEPENDENCIES': 'mediawiki/skins/Vector'},
+ deps
+ )
+
def test_resolve_skin_on_extension(self):
mapping = {'Foo': ['skins/Vector']}
self.assertEqual(
--
To view, visit https://gerrit.wikimedia.org/r/327177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82db52a5c0205cf846f3945a696004fa5f19d4d0
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
