Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/89716


Change subject: Update sorting
......................................................................

Update sorting

Change-Id: Idb900783a88ba8386b02a5908264a961bb644fbc
---
M mediawiki-extensions.yaml
1 file changed, 97 insertions(+), 103 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/16/89716/1

diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 9e90fa5..fbb1d59 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -1,13 +1,3 @@
-- job-template:
-    # TODO: Use global '{name}-phplint' template instead
-    name: '{name}-{ext-name}-lint'
-    node: hasSlaveScripts
-    defaults: use-remote-zuul
-    triggers:
-     - zuul
-    builders:
-     - phplint
-
 # jshint is in a separate job from phplint because various extensions
 # don't pass jshint yet but do pass phplint. This way we can opt-in
 # on a project base.
@@ -21,17 +11,14 @@
      - jshint
 
 - job-template:
-    name: '{name}-{ext-name}-qunit'
-    node: gallium  # it has the qunit virtual host
-    defaults: use-zuul-for-mw-ext
+    # TODO: Use global '{name}-phplint' template instead
+    name: '{name}-{ext-name}-lint'
+    node: hasSlaveScripts
+    defaults: use-remote-zuul
     triggers:
      - zuul
-
     builders:
-     - mw-setup-extension:
-        mwbranch: 'master'
-        dependencies: '{dependencies}'
-     - qunit
+     - phplint
 
 - job-template:
     name: '{name}-{ext-name}-phpcs-HEAD'
@@ -43,6 +30,19 @@
      - phpcs-HEAD
     publishers:
      - phpcs
+
+- job-template:
+    name: '{name}-{ext-name}-qunit'
+    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
 
 # Run all extension tests
 - job-template:
@@ -72,39 +72,6 @@
         cd daemon
         make
 
-# Job specific to Wikibase, let us switch between client
-# and server configurations.
-- job-template:
-    name: 'mwext-Wikibase-{kind}-tests'
-    node: hasSlaveScripts
-    defaults: use-zuul-for-mw-ext
-    ext-name: 'Wikibase'
-    triggers:
-     - zuul
-    builders:
-     - mw-setup-extension:
-        mwbranch: 'master'
-        dependencies: '{dependencies}'
-     - mw-phpunit-allexts
-    publishers:
-     - junit:
-        results: 'junit*.xml'
-
-
-# VisualEditor's docgen has a maintenance script, so install mediawiki first
-- job-template:
-    name: 'mwext-VisualEditor-doc-test'
-    defaults: use-zuul-for-mw-ext
-    triggers:
-     - zuul
-    builders:
-     - mw-setup-extension:
-        mwbranch: '{mwbranch}'
-        dependencies: '{dependencies}'
-     - shell: |
-        export TERM=xterm
-        $WORKSPACE/extensions/VisualEditor/.docs/generate.sh
-
 - job-template:
     name: 'mwext-VisualEditor-doc-publish'
     node: gallium
@@ -126,6 +93,38 @@
         # Publish it (trailing slash is important!)
         rsync --recursive --delete-after --force 
$WORKSPACE/extensions/VisualEditor/docs/ "$DEST_DIR/$DEST_VERSIONDIR/"
         rsync --recursive --delete-after --force 
$WORKSPACE/extensions/VisualEditor/modules/ 
"$DEST_DIR/$DEST_VERSIONDIR/modules/"
+
+# VisualEditor's docgen has a maintenance script, so install mediawiki first
+- job-template:
+    name: 'mwext-VisualEditor-doc-test'
+    defaults: use-zuul-for-mw-ext
+    triggers:
+     - zuul
+    builders:
+     - mw-setup-extension:
+        mwbranch: '{mwbranch}'
+        dependencies: '{dependencies}'
+     - shell: |
+        export TERM=xterm
+        $WORKSPACE/extensions/VisualEditor/.docs/generate.sh
+
+# Job specific to Wikibase, let us switch between client
+# and server configurations.
+- job-template:
+    name: 'mwext-Wikibase-{kind}-tests'
+    node: hasSlaveScripts
+    defaults: use-zuul-for-mw-ext
+    ext-name: 'Wikibase'
+    triggers:
+     - zuul
+    builders:
+     - mw-setup-extension:
+        mwbranch: 'master'
+        dependencies: '{dependencies}'
+     - mw-phpunit-allexts
+    publishers:
+     - junit:
+        results: 'junit*.xml'
 
 # These are jobs we create for all of the extensions
 # listed below. If a job should only be created
@@ -403,9 +402,55 @@
 
      - '{name}-{ext-name}-testextensions-{mwbranch}':
         name: mwext
+        ext-name: Ask
+        dependencies: 'Serialization,DataValues'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: DataTypes
+        dependencies: 'DataValues'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: EducationProgram
+        dependencies: 'cldr'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: GuidedTour
+        dependencies: 'EventLogging'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: Maps
+        dependencies: 'DataValues,Validator'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
         ext-name: MassMessage
         dependencies: 'LiquidThreads'
-
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: ParserHooks
+        dependencies: 'DataValues,Validator'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: SemanticMaps
+        dependencies: 'DataValues,Validator,SemanticMediaWiki,Maps'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: SemanticMediaWiki
+        dependencies: 'DataValues,Validator,Scribunto'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: SemanticResultFormats
+        dependencies: 'DataValues,Validator,SemanticMediaWiki'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: Serialization
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: TranslationNotifications
+        dependencies: 'Translate'
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
+        ext-name: Validator
+        dependencies: 'DataValues'
      - '{name}-{ext-name}-testextensions-{mwbranch}':
         name: mwext
         ext-name: Wikibase
@@ -437,69 +482,18 @@
         ext-name: WikibaseQuery
         dependencies: 
'Diff,DataValues,DataTypes,Ask,Serialization,WikibaseDataModel,WikibaseDatabase,WikibaseQueryEngine,Wikibase'
 
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: Ask
-        dependencies: 'Serialization,DataValues'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: EducationProgram
-        dependencies: 'cldr'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: GuidedTour
-        dependencies: 'EventLogging'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: Maps
-        dependencies: 'DataValues,Validator'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: SemanticMaps
-        dependencies: 'DataValues,Validator,SemanticMediaWiki,Maps'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: SemanticResultFormats
-        dependencies: 'DataValues,Validator,SemanticMediaWiki'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: SemanticMediaWiki
-        dependencies: 'DataValues,Validator,Scribunto'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: TranslationNotifications
-        dependencies: 'Translate'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: Validator
-        dependencies: 'DataValues'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: Serialization
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: ParserHooks
-        dependencies: 'DataValues,Validator'
-     - '{name}-{ext-name}-testextensions-{mwbranch}':
-        name: mwext
-        ext-name: DataTypes
-        dependencies: 'DataValues'
-
      # qunit jobs for MediaWiki extensions
 
      - '{name}-{ext-name}-qunit':
         name: mwext
         ext-name: EventLogging
-
      - '{name}-{ext-name}-qunit':
         name: mwext
         ext-name: GuidedTour
         dependencies: 'EventLogging'
-
      - '{name}-{ext-name}-qunit':
         name: mwext
         ext-name: MobileFrontend
-
      - '{name}-{ext-name}-qunit':
         name: mwext
         ext-name: VisualEditor

-- 
To view, visit https://gerrit.wikimedia.org/r/89716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb900783a88ba8386b02a5908264a961bb644fbc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Siebrand <siebr...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to