[MediaWiki-commits] [Gerrit] Polish up mathoid jobs - change (integration/config)

2015-07-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Polish up mathoid jobs
..


Polish up mathoid jobs

Debian glue is of no use since we no more deploy Mathoid via a Debian
package but instead use the source/deploy repositories model.

Delete mathoid debian glue job
Make source repo to trigger the standard 'npm' job
Craft a job for deploy

Signed-off-by: Marko Obrovac marko.obro...@gmail.com
Change-Id: Ied9888fa7508fd3406f6f0206c04d04d6d71e639
---
M jjb/mediawiki-misc.yaml
M jjb/mediawiki-services.yaml
M zuul/layout.yaml
3 files changed, 14 insertions(+), 9 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index e57e4cb..aa1a236 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -45,13 +45,6 @@
  - '{name}-bundle-yard-publish'
 
 - project:
-# mediawiki/services/mathoid.git
-name: 'mathoidsvc'
-jobs:
- - '{name}-debian-glue':
- distribution: trusty
-
-- project:
 name: 'mediawiki-vagrant'
 jobs:
  - '{name}-puppetlint-lenient'
diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml
index ae0d741..dde8595 100644
--- a/jjb/mediawiki-services.yaml
+++ b/jjb/mediawiki-services.yaml
@@ -6,3 +6,10 @@
  - deploy  # mediawiki/services/cxserver/deploy
 jobs:
  - '{name}-{repository}-npm'
+
+- project:
+name: 'mathoid'
+repository:
+ - deploy
+jobs:
+ - '{name}-{repository}-npm'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 67c7629..2e083fc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6553,8 +6553,13 @@
   - name: npm
 
   - name: mediawiki/services/mathoid
-test:
-  - mathoidsvc-debian-glue
+template:
+  - name: npm
+
+  - name: mediawiki/services/mathoid/deploy
+experimental:
+  - mathoid-deploy-npm
+
 
   - name: mediawiki/services/parsoid
 check:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied9888fa7508fd3406f6f0206c04d04d6d71e639
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Polish up mathoid jobs - change (integration/config)

2015-07-01 Thread Hashar (Code Review) 
Hello Mobrovac,

I'd like you to do a code review.  Please visit

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

to review the following change.

Change subject: Polish up mathoid jobs
..

Polish up mathoid jobs

Debian glue is of no use since we no more deploy Mathoid via a Debian
package but instead use the source/deploy repositories model.

Delete mathoid debian glue job
Make source repo to trigger the standard 'npm' job
Craft a job for deploy

Signed-off-by: Marko Obrovac marko.obro...@gmail.com
Change-Id: Ied9888fa7508fd3406f6f0206c04d04d6d71e639
---
M jjb/mediawiki-misc.yaml
M jjb/mediawiki-services.yaml
M zuul/layout.yaml
3 files changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/00/222100/1

diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index e57e4cb..aa1a236 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -45,13 +45,6 @@
  - '{name}-bundle-yard-publish'
 
 - project:
-# mediawiki/services/mathoid.git
-name: 'mathoidsvc'
-jobs:
- - '{name}-debian-glue':
- distribution: trusty
-
-- project:
 name: 'mediawiki-vagrant'
 jobs:
  - '{name}-puppetlint-lenient'
diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml
index ae0d741..dde8595 100644
--- a/jjb/mediawiki-services.yaml
+++ b/jjb/mediawiki-services.yaml
@@ -6,3 +6,10 @@
  - deploy  # mediawiki/services/cxserver/deploy
 jobs:
  - '{name}-{repository}-npm'
+
+- project:
+name: 'mathoid'
+repository:
+ - deploy
+jobs:
+ - '{name}-{repository}-npm'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 67c7629..2e083fc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6553,8 +6553,13 @@
   - name: npm
 
   - name: mediawiki/services/mathoid
-test:
-  - mathoidsvc-debian-glue
+template:
+  - name: npm
+
+  - name: mediawiki/services/mathoid/deploy
+experimental:
+  - mathoid-deploy-npm
+
 
   - name: mediawiki/services/parsoid
 check:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied9888fa7508fd3406f6f0206c04d04d6d71e639
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org

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