Anomie has uploaded a new change for review.

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


Change subject: Add tests for the Collection OCG
......................................................................

Add tests for the Collection OCG

* Test the OCG branch of Collection.
* Add the ability to have Jenkins run "npm test".
* Add jshint and npmtest for the OCG nodejs repos.

Change-Id: I3043f827c57c72799eb5c5a5abf291c825e1addf
---
M job-templates.yaml
M macro.yaml
M mediawiki-extensions.yaml
3 files changed, 56 insertions(+), 0 deletions(-)


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

diff --git a/job-templates.yaml b/job-templates.yaml
index d0c37ed..1b07116 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -22,6 +22,17 @@
      - jshint
 
 - job-template:
+    name: '{name}-npmtest'
+    node: hasSlaveScripts
+    defaults: use-remote-zuul-no-submodules
+    triggers:
+     - zuul
+    scm:
+     - git-remote-zuul-no-submodules
+    builders:
+     - npmtest
+
+- job-template:
     name: '{name}-pplint-HEAD'
     node: hasSlaveScripts
     defaults: use-remote-zuul-no-submodules
diff --git a/macro.yaml b/macro.yaml
index fb69608..54029ab 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -73,6 +73,20 @@
         dir: '$WORKSPACE'
 
 - builder:
+    name: npmtest-in
+    builders:
+     - shell: |
+        #!/bin/bash -xe
+        cd "{dir}"
+        npm test
+
+- builder:
+    name: npmtest
+    builders:
+     - npmtest-in:
+        dir: '$WORKSPACE'
+
+- builder:
     name: jsduck
     builders:
     # Zuul uses Python str.format(obj) for {config} substitutions
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index d15dd5a..0281cd8 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -11,6 +11,15 @@
      - jshint
 
 - job-template:
+    name: '{name}-{ext-name}-npmtest'
+    node: hasSlaveScripts
+    defaults: use-remote-zuul
+    triggers:
+     - zuul
+    builders:
+     - npmtest
+
+- job-template:
     # TODO: Use global '{name}-phplint' template instead
     name: '{name}-{ext-name}-lint'
     node: hasSlaveScripts
@@ -422,6 +431,10 @@
 
      - '{name}-{ext-name}-testextensions-{mwbranch}':
         name: mwext
+        ext-name: Collection
+        mwbranch: OCG
+     - '{name}-{ext-name}-testextensions-{mwbranch}':
+        name: mwext
         ext-name: DataTypes
         dependencies: 'DataValues'
      - '{name}-{ext-name}-testextensions-{mwbranch}':
@@ -545,6 +558,24 @@
      - '{name}-ruby1.9.3lint'
 
 - project:
+    name: mwext-Collection-OnlineContentGenerator-node_modules
+    jobs:
+        - '{name}-jslint'
+        - '{name}-npmtest'
+
+- project:
+    name: mwext-Collection-OnlineContentGenerator-bundler
+    jobs:
+        - '{name}-jslint'
+        - '{name}-npmtest'
+
+- project:
+    name: mwext-Collection-OnlineContentGenerator-latex_renderer
+    jobs:
+        - '{name}-jslint'
+        - '{name}-npmtest'
+
+- project:
     name: 'mwext-ConfirmEdit'
     jobs:
      - python-jobs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3043f827c57c72799eb5c5a5abf291c825e1addf
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to