Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222223
Change subject: Fix tests directory and "missing skin" errors in MW-Selenium
jobs
......................................................................
Fix tests directory and "missing skin" errors in MW-Selenium jobs
Install Vector skin to avoid "missing skin" errors.
Use the JUnit Cucumber formatter to accommodate screenshots and better
reporting.
Fix the tests-dir parameter so that it points to the correct directory
for the MW extension.
Bug: T103039
Change-Id: I5c835369b6b6a06332a2a066ebae324bee5fbf26
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
2 files changed, 12 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/23/222223/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 109a264..4a9a8a2 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -373,7 +373,7 @@
- prepare-localhost
- bundle-with-options:
initialization:
'/srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh'
- command: 'cucumber --color --tags @integration --tags ~@skip'
+ command: 'cucumber --color --tags @integration --tags ~@skip --format
pretty --format junit --out $WORKSPACE/log/junit'
dir: '{tests-dir}'
bundler-version: ''
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 1cfd720..7dad32a 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -54,19 +54,21 @@
name: 'zuul-cloner-extdeps'
builders:
- shell: |
+ IFS=', ' read -ra REPOS <<< "{additional-repositories}"
+ IFS=', ' read -ra DEPS <<< "{dependencies}"
+
# Build dependencies list
rm -f deps.txt
touch deps.txt
echo "mediawiki/core" >> deps.txt
- if [ "{additional-repositories}" != "" ]; then
- echo -e "{additional-repositories}" >> deps.txt
- fi
+
+ for dep in "${{REPOS[@]}}"; do echo $dep; done >> deps.txt
+
if [ "{ext-name}" != "" ]; then
echo "mediawiki/extensions/{ext-name}" >> deps.txt
fi
- if [ "{dependencies}" != "" ]; then
- echo "$(IFS=', '; for dep in `echo {dependencies}`; do echo
mediawiki/extensions/$dep; done;)" >> deps.txt
- fi
+
+ for dep in "${{DEPS[@]}}"; do echo mediawiki/extensions/$dep; done >>
deps.txt
- zuul-cloner:
projects: >
$(cat deps.txt)
@@ -79,7 +81,7 @@
- zuul-cloner-extdeps:
ext-name: '{ext-name}'
dependencies: '{dependencies}'
- additional-repositories: 'mediawiki/vendor'
+ additional-repositories: 'mediawiki/vendor,mediawiki/skins/Vector'
- mw-install-mysql
- shell: "cp deps.txt src/extensions_load.txt"
- mw-apply-settings
@@ -187,25 +189,7 @@
- mw-teardown-mysql
- archive-log-dir
-# Generic mw-selenium job for extensions. Can only be used by those that
-# currently don't have dependencies or a non-standard tests directory.
-- job:
- name: 'mwext-mw-selenium'
- node: contintLabsSlave && UbuntuTrusty
- concurrent: true
- triggers:
- - zuul
- builders:
- - prepare-mediawiki-zuul-project
- - mw-selenium:
- tests-dir: 'tests/browser'
- publishers:
- - localhost-cleanup
- - mw-teardown-mysql
- - archive-log-dir
-
-# mw-selenium template for extensions that have dependencies or a non-standard
-# test directory.
+# mw-selenium template for MediaWiki extensions.
- job-template:
name: '{name}-{ext-name}-mw-selenium'
node: contintLabsSlave && UbuntuTrusty
@@ -217,7 +201,7 @@
ext-name: '{ext-name}'
dependencies: '{dependencies}'
- mw-selenium:
- tests-dir: 'tests/browser'
+ tests-dir: 'src/extensions/{ext-name}/tests/browser'
publishers:
- localhost-cleanup
- mw-teardown-mysql
--
To view, visit https://gerrit.wikimedia.org/r/222223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c835369b6b6a06332a2a066ebae324bee5fbf26
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
