jenkins-bot has submitted this change and it was merged.
Change subject: tests: mw exts having npm do not need extension-jslint
......................................................................
tests: mw exts having npm do not need extension-jslint
The more specific jobs mwext-*-jslint were introduced so we can make
them non voting until jshint/jsonlint pass. Whenever npm is already
invoked, it should be used to run jshint/jsonlint.
Test MediaWiki extensions in Zuul having 'npm' template no more have the
'extension-jslint' template.
Drop extension-jslint from:
AjaxLogin
ContributionTracking
jshint https://gerrit.wikimedia.org/r/#/c/262703/
jsonlint https://gerrit.wikimedia.org/r/#/c/262704/
DismissableSiteNotice
DynamicSidebar
Quiz
TocTree
ZeroBanner
Corresponding source changes are tracked via change id
Ibae36050a1d8054b7280804513a258bc7cd8960f
Depends-On: Ibae36050a1d8054b7280804513a258bc7cd8960f
Change-Id: Ib4755d66369c44da0282d703d4c260434b50b03b
---
M jjb/mediawiki-extensions.yaml
A tests/test_zuul_layout.py
M zuul/layout.yaml
3 files changed, 54 insertions(+), 18 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 28066e4..0062eb2 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -645,7 +645,6 @@
jobs:
- '{name}-jslint':
name:
- - mwext-AjaxLogin
- mwext-ApiExplorer
- mwext-ArticleCreationWorkflow
- mwext-ArticleFeedback
@@ -669,7 +668,6 @@
- mwext-CongressLookup
- mwext-Contest
- mwext-ContributionReporting
- - mwext-ContributionTracking
- mwext-Contributors
- mwext-Convert2Wiki
- mwext-CopyToClipboard
@@ -686,7 +684,6 @@
- mwext-Dice
- mwext-DidYouKnow
- mwext-DidYouMean
- - mwext-DismissableSiteNotice
- mwext-DisqusTag
- mwext-DjangoAnalytics
- mwext-DownloadCounter
@@ -695,7 +692,6 @@
- mwext-DumpHTML
- mwext-Duplicator
- mwext-DynamicPageList
- - mwext-DynamicSidebar
- mwext-EditSubpages
- mwext-EnhanceContactForm
- mwext-ErrorHandler
@@ -835,7 +831,6 @@
- mwext-PushToWatch
- mwext-Quantcast
- mwext-QuickResponse
- - mwext-Quiz
- mwext-QuizGame
- mwext-QuizTabulate
- mwext-RandomFeaturedUser
@@ -919,7 +914,6 @@
- mwext-TimeMachine
- mwext-TimezoneSelector
- mwext-TitleIcon
- - mwext-TocTree
- mwext-TranslateSvg
- mwext-TweetANew
- mwext-UIFeedback
@@ -938,7 +932,6 @@
- mwext-WikivoteMapsYandex
- mwext-WYSIWYG
- mwext-XMLContentExtension
- - mwext-ZeroBanner
- project:
name: 'mwext-CirrusSearch'
diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
new file mode 100644
index 0000000..767de0f
--- /dev/null
+++ b/tests/test_zuul_layout.py
@@ -0,0 +1,37 @@
+# Parse Zuul layout.yaml file
+#
+# Copyright (c) 2016 - Antoine "hashar" Musso
+# Copyright (c) 2016 - Wikimedia Foundation Inc.
+
+import os
+import unittest
+
+import yaml
+
+
+class TestZuulLayout(unittest.TestCase):
+
+ layout = None
+
+ @classmethod
+ def setUpClass(cls):
+ wmf_zuul_layout = os.path.join(
+ os.path.dirname(os.path.abspath(__file__)),
+ '../zuul/layout.yaml')
+ with open(wmf_zuul_layout, 'r') as f:
+ cls.layout = yaml.load(f)
+
+ def test_mwext_legacy_jslint_replaced_by_npm(self):
+ exts = sorted([
+ p['name']
+ for p in self.layout['projects']
+ if p['name'].startswith('mediawiki/extensions/')
+ and {'name': 'npm'} in p.get('template', [])
+ and {'name': 'extension-jslint'} in p.get('template', [])
+ ])
+
+ self.maxDiff = None
+ self.longMessage = True
+ self.assertListEqual(
+ [], exts,
+ 'MediaWiki extensions having npm do not need "extension-jslint"')
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 943e217..5b5cdfa 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -758,8 +758,6 @@
voting: false
- name: mwext-CommunityVoice-jslint # bug 61595
voting: false
- - name: mwext-ContributionTracking-jslint # bug 61599
- voting: false
- name: mwext-CustomUserSignup-jslint # bug 61600
voting: false
- name: mwext-Drafts-jslint # bug 61603
@@ -771,8 +769,6 @@
- name: mwext-JsonData-jslint # bug 61607
voting: false
- name: mwext-LastModified-jslint # bug 61608
- voting: false
- - name: mwext-Quiz-jslint # bug 61620
voting: false
- name: mwext-SVGEdit-jslint # bug 61625
voting: false
@@ -2948,9 +2944,11 @@
- name: mediawiki/extensions/ContributionTracking
template:
- - name: extension-jslint
- name: extension-unittests-generic
- name: npm
+ check:
+ - jsonlint
+ - jshint
- name: mediawiki/extensions/ConventionExtension
template:
@@ -3020,9 +3018,11 @@
- name: mediawiki/extensions/DismissableSiteNotice
template:
- - name: extension-jslint
- name: extension-unittests-generic
- name: npm
+ check:
+ - jsonlint
+ - jshint
- name: mediawiki/extensions/DonationInterface
template:
@@ -3047,9 +3047,11 @@
- name: mediawiki/extensions/DynamicSidebar
template:
- - name: extension-jslint
- name: extension-unittests-generic
- name: npm
+ check:
+ - jsonlint
+ - jshint
- name: mediawiki/extensions/DumpHTML
template:
@@ -4001,9 +4003,11 @@
- name: mediawiki/extensions/AjaxLogin
template:
- name: composer-test
- - name: extension-jslint
- name: extension-unittests-generic
- name: npm
+ check:
+ - jsonlint
+ - jshint
- name: mediawiki/extensions/AJAXPoll
template:
@@ -6500,11 +6504,11 @@
- name: mediawiki/extensions/Quiz
template:
- - name: extension-jslint
- name: extension-unittests-generic
- name: npm
check:
- jsonlint
+ - jshint
- name: mediawiki/extensions/RandomRootPage
template:
@@ -6975,9 +6979,11 @@
- name: mediawiki/extensions/TocTree
template:
- - name: extension-jslint
- name: extension-unittests-generic
- name: npm
+ check:
+ - jsonlint
+ - jshint
- name: mediawiki/extensions/TorBlock
template:
@@ -7334,11 +7340,11 @@
- name: mediawiki/extensions/ZeroBanner
template:
- name: extension-gate
- - name: extension-jslint
- name: extension-unittests
- name: npm
check:
- jsonlint
+ - jshint
- name: mediawiki/extensions/ZeroPortal
template:
--
To view, visit https://gerrit.wikimedia.org/r/262708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4755d66369c44da0282d703d4c260434b50b03b
Gerrit-PatchSet: 8
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
