Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276228
Change subject: Add new qunit tests that use npm 4.3
......................................................................
Add new qunit tests that use npm 4.3
Adds new qunit tests for mediawiki/core and mediawiki extensions.
It is in experimental: so we can test to see weather it works.
Now that firefox and chrome binarys are abalible on nodepool we can switch
qunit tests to npm 4.3.
Change-Id: Id505c82e52429179007d6baa905f8abc4d570182
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
M zuul/layout.yaml
4 files changed, 115 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/28/276228/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index fbc4fcd..07e2e18 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -334,7 +334,6 @@
- builder:
name: qunit-karma
builders:
- builders:
- prepare-localhost
- shell: |
. /srv/deployment/integration/slave-scripts/bin/mw-set-env-localhost.sh
@@ -344,6 +343,16 @@
npm install
grunt karma:main
+- builder:
+ name: qunit-karma-4.3
+ builders:
+ - prepare-localhost
+ - shell: |
+ . /srv/deployment/integration/slave-scripts/bin/mw-set-env-localhost.sh
+ cd $MW_INSTALL_PATH
+ npm install
+ grunt karma:main
+
- publisher:
name: localhost-cleanup
publishers:
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 3de43ff..7d399d9 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -130,6 +130,25 @@
- mw-teardown-mysql
- archive-log-dir
+- job:
+ name: 'mwext-qunit-4.3'
+ node: ci-jessie-wikimedia
+ defaults: use-remote-zuul-shallow-clone
+ concurrent: true
+ properties:
+ - zeromq-event
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ triggers:
+ - prepare-mediawiki-zuul-project
+ - qunit-karma-4.3
+ publishers:
+ - localhost-cleanup
+ - mw-teardown-mysql
+ - castor-save
+
# Generic qunit job for extensions with composer update.
- job:
name: 'mwext-qunit-composer'
@@ -145,6 +164,24 @@
- mw-teardown-mysql
- archive-log-dir
+- job:
+ name: 'mwext-qunit-composer-4.3'
+ node: ci-jessie-wikimedia
+ concurrent: true
+ properties:
+ - zeromq-event
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ triggers:
+ - prepare-mediawiki-zuul-project-no-vendor
+ - qunit-karma-4.3
+ publishers:
+ - localhost-cleanup
+ - mw-teardown-mysql
+ - castor-save
+
# Generic mw-selenium job for extensions.
- job:
name: 'mwext-mw-selenium'
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 7c339d4..e6077cb 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -32,7 +32,6 @@
publishers:
- castor-save
-
- job-template:
name: 'mediawiki-core-qunit'
node: contintLabsSlave && UbuntuTrusty
@@ -55,6 +54,34 @@
- localhost-cleanup
- mw-teardown-mysql
- archive-log-dir
+
+- job-template:
+ name: 'mediawiki-core-qunit-4.3'
+ node: ci-jessie-wikimedia
+ concurrent: true
+ properties:
+ - zeromq-event
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - shell: |
+ zuul-cloner --version
+ zuul-cloner --color \
+ --verbose \
+ --workspace src \
+ --map
/srv/deployment/integration/slave-scripts/etc/zuul-clonemap.yaml \
+ --cache-dir /srv/git \
+ https://gerrit.wikimedia.org/r/p \
+ mediawiki/core \
+ mediawiki/vendor
+ - mw-install-mysql
+ - mw-apply-settings
+ - qunit-karma-4.3
+ publishers:
+ - localhost-cleanup
+ - mw-teardown-mysql
+ - castor-save
- job-template:
name: 'mediawiki-core-jsduck'
@@ -336,6 +363,32 @@
- mw-teardown-mysql
- archive-log-dir
+- job-template:
+ name: 'mediawiki-extensions-qunit-4.3'
+ node: ci-jessie-wikimedia
+ concurrent: true
+ properties:
+ - zeromq-event
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - zuul-cloner-extdeps:
+ ext-name: ''
+ dependencies: '{dependencies}'
+ additional-repositories: 'mediawiki/vendor'
+ - inject-experimental-extension
+ - sort-deps-txt
+ - mw-install-mysql
+ - shell: "cp deps.txt src/extensions_load.txt"
+ - mw-apply-settings
+ - mw-run-update-script
+ - qunit-karma-4.3
+ publishers:
+ - localhost-cleanup
+ - mw-teardown-mysql
+ - castor-save
+
# Test out our PHPUnit against various MediaWiki branches
#
# Essentially a copy paste of mediawiki-phpunit-{phpflavor}
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a8c2792..4e980e8 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -938,6 +938,7 @@
- composer-php53
- composer-php55
- composer-hhvm
+ - mediawiki-extensions-qunit-4.3
- name: extension-unittests-composer
check:
@@ -966,6 +967,7 @@
- composer-php53
- composer-php55
- composer-hhvm
+ - mediawiki-extensions-qunit-4.3
- name: extension-unittests-generic
check:
@@ -999,6 +1001,7 @@
- composer-php53
- composer-php55
- composer-hhvm
+ - mediawiki-extensions-qunit-4.3
- name: extension-unittests-non-voting
check:
@@ -1028,6 +1031,7 @@
- composer-php53
- composer-php55
- composer-hhvm
+ - mediawiki-extensions-qunit-4.3
# Template to run per-patch selenium browser test
# Intentionally not in gate because it's super slow
@@ -1057,6 +1061,9 @@
- 'mwext-{name}-qunit'
gate-and-submit:
- 'mwext-{name}-qunit'
+ experimental:
+ - mwext-qunit-4.3
+ - mwext-qunit-composer-4.3
# Triggers the generic mwext-qunit job
- name: extension-qunit-generic
@@ -1065,13 +1072,17 @@
gate-and-submit:
- mwext-qunit
experimental:
- - mwext-qunit-composer
+ - mwext-qunit-4.3
+ - mwext-qunit-composer-4.3
- name: extension-qunit-composer
test:
- mwext-qunit-composer
gate-and-submit:
- mwext-qunit-composer
+ experimental:
+ - mwext-qunit-composer-4.3
+ - mwext-qunit-4.3
- name: jsduck
test:
@@ -1359,6 +1370,8 @@
- mediawiki-phpunit-hhvm-composer
# will replace mediawiki-phpunit-php53 for branches not using vendor,
currently not used as the composer part is covered by the hhvm variant
- mediawiki-phpunit-php53-composer
+ - mediawiki-core-qunit-4.3
+ - mediawiki-extensions-qunit-4.3
- name: mediawiki/debian
experimental:
--
To view, visit https://gerrit.wikimedia.org/r/276228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id505c82e52429179007d6baa905f8abc4d570182
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
