jenkins-bot has submitted this change and it was merged.
Change subject: Run Node.js Selenium job for mediawiki/core in experimental
pipeline
......................................................................
Run Node.js Selenium job for mediawiki/core in experimental pipeline
Bug: T139740
Change-Id: I008ba7a9c4be9b742de74b19340b74ad853228da
---
M jjb/macro.yaml
M jjb/mediawiki.yaml
M zuul/layout.yaml
3 files changed, 48 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 951bf0a..aac5cbb 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -315,7 +315,6 @@
- builder:
name: qunit-karma
builders:
- builders:
- prepare-localhost
- shell: |
. /srv/deployment/integration/slave-scripts/bin/mw-set-env-localhost.sh
@@ -336,6 +335,23 @@
onsuccess: False
onfailure: False
+# mocha-selenium
+#
+# The same as qunit-karma, but running `grunt mochaTest` instead of `grunt
karma:main`
+# ALWAYS pair with 'localhost-cleanup'
+# ALWAYS pair with 'global-teardown' (for npm-setup)
+- builder:
+ name: mocha-selenium
+ builders:
+ - prepare-localhost
+ - shell: |
+ . /srv/deployment/integration/slave-scripts/bin/mw-set-env-localhost.sh
+ cd $MW_INSTALL_PATH
+ . /srv/deployment/integration/slave-scripts/bin/npm-setup.sh
+ rm -rf node_modules
+ npm install
+ npm run selenium
+
# mw-selenium
#
# Run MW-Selenium tests that are marked with the @integration tag against a
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 95c13f9..affd29f 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -52,6 +52,34 @@
- castor-save
- archive-log-dir
+# The same as mediawiki-core-qunit-jessie but also cloning
+# mediawiki/skins/Vector and running mocha-selenium builder
+# instead of qunit-karma
+- job-template:
+ name: 'mediawiki-core-selenium-jessie'
+ node: ci-jessie-wikimedia
+ concurrent: true
+ triggers:
+ - zuul
+ properties:
+ - build-discarder:
+ days-to-keep: 15
+ builders:
+ - castor-load
+ - zuul-cloner:
+ projects: >
+ mediawiki/core
+ mediawiki/vendor
+ mediawiki/skins/Vector
+ - mw-install-mysql
+ - mw-apply-settings
+ - mocha-selenium
+ publishers:
+ - castor-save
+ - junit:
+ results: 'log/junit*.xml'
+ - archive-log-dir
+
- job-template:
name: 'mediawiki-core-jsduck'
node: contintLabsSlave && UbuntuTrusty
@@ -300,6 +328,7 @@
- 'mediawiki-core-npm-node-4-jessie'
- 'mediawiki-core-jsduck-publish'
- 'mediawiki-core-doxygen-publish'
+ - 'mediawiki-core-selenium-jessie'
- '{name}-php53lint'
- '{name}-php55lint'
- 'mediawiki-phpunit-{phpflavor}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6d7ea0f..03ab1b2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1418,6 +1418,8 @@
- mediawiki-phpunit-php53-composer
# Experimental php version
- composer-php70-jessie
+ # experimental Node.js Selenium job
+ - mediawiki-core-selenium-jessie
- name: mediawiki/debian
test:
--
To view, visit https://gerrit.wikimedia.org/r/324416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I008ba7a9c4be9b742de74b19340b74ad853228da
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
