jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki-core-qunit: To trusty/hhvm/mysql/chrome from
precise/zend/sqlite/phantomjs
......................................................................
mediawiki-core-qunit: To trusty/hhvm/mysql/chrome from
precise/zend/sqlite/phantomjs
Using Karma and local npm entry point.
Bug: T74063
Change-Id: I5edff10a4f03e01064051b9c31df30380c36efc6
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 0 insertions(+), 35 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 6477265..1089df4 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -21,37 +21,12 @@
- job-template:
name: 'mediawiki-core-qunit'
- node: contintLabsSlave && UbuntuPrecise
- concurrent: true
- logrotate:
- daysToKeep: 15
- triggers:
- - zuul
- builders:
- - zuul-cloner:
- projects: >
- mediawiki/core
- mediawiki/vendor
- - mw-install-sqlite
- - mw-apply-settings
- - qunit
- publishers:
- - qunit-cleanup
- - mw-teardown
- - archive-log-dir
-
-- job-template:
- # Based on 'mediawiki-core-qunit' but:
- # * qunit -> qunit-karma (to run npm-install and karma)
- # * UbuntuPrecise -> UbuntuTrusty (for new local browsers and nodejs
version)
- name: 'mediawiki-core-qunit-karma'
node: contintLabsSlave && UbuntuTrusty
concurrent: true
logrotate:
daysToKeep: 15
triggers:
- zuul
-
builders:
- zuul-cloner:
projects: >
@@ -346,7 +321,6 @@
jobs:
- 'mediawiki-core-jslint'
- 'mediawiki-core-qunit'
- - 'mediawiki-core-qunit-karma'
- 'mediawiki-core-jsduck'
- '{name}-npm'
- 'mediawiki-core-jsduck-publish'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b576438..d2344f0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1761,16 +1761,8 @@
queue-name: mediawiki
- name: mediawiki-core-qunit
- # Doesn't work in MediaWiki REL1_19
- # (times out or doesn't start in the first place).
- branch: (?!REL1_19)
- queue-name: mediawiki
-
- - name: mediawiki-core-qunit-karma
- # @since MediaWiki 1.25-alpha
branch: ^(master)$
queue-name: mediawiki
- voting: false
- name: mwext-VisualEditor-qunit-karma
voting: false
@@ -2056,7 +2048,6 @@
- mediawiki-phpunit-hhvm
#- mediawiki-phpunit-zend (disabled, slow, Icac172b16)
- mediawiki-core-qunit
- - mediawiki-core-qunit-karma
- mediawiki-core-bundle-rubocop
- mediawiki-core-ruby1.9.3lint
- php-composer-package-validate
--
To view, visit https://gerrit.wikimedia.org/r/198210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5edff10a4f03e01064051b9c31df30380c36efc6
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
