JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92804
Change subject: Add mwext-MobileFrontend-qunit-mobile with useformat=mobile.
......................................................................
Add mwext-MobileFrontend-qunit-mobile with useformat=mobile.
The useformat=mobile argument is appended to the URL used to run qunit.
Bug: 56019
Change-Id: Ie8e40a79488621b53942ab5cb5ad6a50e8a598a8
---
M macro.yaml
M mediawiki-extensions.yaml
2 files changed, 36 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/04/92804/1
diff --git a/macro.yaml b/macro.yaml
index 0d73884..3d127a3 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -100,6 +100,19 @@
- builder:
name: qunit
builders:
+ - qunit-querystring:
+ querystring: ''
+
+- builder:
+ name: qunit-mobile
+ builders:
+ - qunit-querystring:
+ querystring: '?useformat=mobile'
+
+# - querystring: (with leading questionmark)
+- builder:
+ name: qunit-querystring
+ builders:
- shell: |
#!/bin/bash -x
# Create unique sub directory name
@@ -107,7 +120,7 @@
# Configure MediaWiki
echo -e \
"<?php\n\$wgServer = 'http://localhost:9412';\n"\
- "\$wgScriptPath = '/${TEST_ID}';\n"\
+ "\$wgScriptPath = '/${{TEST_ID}}';\n"\
"\$wgScript = \$wgStylePath = \$wgLogo = false;\n"\
"\$wgEnableJavaScriptTest = true;\n" >> $WORKSPACE/LocalSettings.php
@@ -120,10 +133,10 @@
chmod a+w "$WORKSPACE"/log/mw-debug-www.log
# Make sure to compress MediaWiki log dir after phpunit has ran
- function compress_log_dir() {
+ function compress_log_dir() {{
echo "Compressing logs under $LOG_DIR"
gzip --verbose --force --best "$WORKSPACE"/log/*.log || :
- }
+ }}
trap compress_log_dir EXIT
# The location is free or we make it free
@@ -134,7 +147,7 @@
curl --include
"http://localhost:9412/$TEST_ID/index.php?title=Special:BlankPage"; | head -n42
curl --include
"http://localhost:9412/$TEST_ID/load.php?debug=true&modules=startup&only=scripts";
| head -n42
# Run QUnit tests via PhantomJS
- /srv/slave-scripts/bin/wmfgrunt qunit --verbose
--qunit-url="http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit";
+ /srv/slave-scripts/bin/wmfgrunt qunit --verbose
--qunit-url="http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit{querystring}";
gqec=$?
# Clean up
rm /srv/localhost/qunit/$TEST_ID
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index f834dbf..762a42c 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -46,6 +46,22 @@
publishers:
- archive-log-dir
+- job-template:
+ name: '{name}-{ext-name}-qunit-mobile'
+ node: gallium # it has the qunit virtual host
+ defaults: use-zuul-for-mw-ext
+ triggers:
+ - zuul
+
+ builders:
+ - mw-setup-extension:
+ mwbranch: 'master'
+ dependencies: '{dependencies}'
+ - qunit-querystring:
+ querystring: '?useformat=mobile'
+ publishers:
+ - archive-log-dir
+
# Run all extension tests
- job-template:
name: '{name}-{ext-name}-testextensions-{mwbranch}'
@@ -501,6 +517,9 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: MobileFrontend
+ - '{name}-{ext-name}-qunit-mobile':
+ name: mwext
+ ext-name: MobileFrontend
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: VisualEditor
--
To view, visit https://gerrit.wikimedia.org/r/92804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8e40a79488621b53942ab5cb5ad6a50e8a598a8
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
