Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102952
Change subject: parsoidsvc using multigit script
......................................................................
parsoidsvc using multigit script
The parsoidsvc jobs are going to be triggered by changes made against
two projects:
mediawiki/services/parsoid
and
mediawiki/services/parsoid/deploy
The multiple git macro would not let us apply the patch (ZUUL_REF) to
the proper project, so instead we are now using a tiny shell script that
takes care of cloning/refereshing repositories and applying the patch on
the repo that triggered the change (ZUUL_PROJECT).
Change-Id: Iaa90b840f452f4415e7a59d7012c084aa7587e5b
---
M parsoidsvc.yaml
1 file changed, 15 insertions(+), 47 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/52/102952/1
diff --git a/parsoidsvc.yaml b/parsoidsvc.yaml
index 201adce..546cfd7 100644
--- a/parsoidsvc.yaml
+++ b/parsoidsvc.yaml
@@ -1,3 +1,12 @@
+# Builder macro that uses multigit.sh to fetch parsoid and parsoid/deploy
+# applying triggered change patch to the proper repository
+- builder:
+ name: git-parsoid-and-deploy-repos
+ builders:
+ - shell: |
+ /srv/deployment/integration/slave-scripts/bin/multigit.sh \
+ mediawiki/services/parsoid mediawiki/services/parsoid/deploy
+
- job-template:
name: parsoidsvc-php-parsertests
node: hasSlaveScripts
@@ -8,8 +17,6 @@
fail: true
- timestamps
- ansicolor
- defaults:
- use-remote-zuul
triggers:
- zuul
scm:
@@ -38,27 +45,14 @@
fail: true
- timestamps
- ansicolor
- defaults:
- use-remote-zuul
triggers:
- zuul
- scm:
- - git:
- url: 'http://integration.wikimedia.org/zuul/git/$ZUUL_PROJECT'
- reference-repo: '/srv/ssd/gerrit/$ZUUL_PROJECT.git'
- refspec: '$ZUUL_REF'
- name: 'origin'
- disable-submodules: true
- - git:
- url:
'https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid/deploy.git'
- branches:
- - master
- basedir: deploy
builders:
+ - git-parsoid-and-deploy-repos
- shell: |
# If any of these commands fail, something is wrong
set -e
- cd tests
+ cd parsoid/tests
export NODE_PATH="$NODE_PATH:$WORKSPACE/deploy/node_modules"
echo "Foo" | node parse.js --wt2html
echo "Foo" | node parse.js --wt2wt
@@ -75,27 +69,14 @@
fail: true
- timestamps
- ansicolor
- defaults:
- use-remote-zuul
triggers:
- zuul
- scm:
- - git:
- url: 'http://integration.wikimedia.org/zuul/git/$ZUUL_PROJECT'
- reference-repo: '/srv/ssd/gerrit/$ZUUL_PROJECT.git'
- refspec: '$ZUUL_REF'
- name: 'origin'
- disable-submodules: true
- - git:
- url:
'https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid/deploy.git'
- branches:
- - master
- basedir: deploy
builders:
+ - git-parsoid-and-deploy-repos
- shell: |
# If any of these commands fail, something is wrong
set -e
- cd tests
+ cd parsoid/tests
export NODE_PATH="$NODE_PATH:$WORKSPACE/deploy/node_modules"
node roundtrip-test.js "Barack Obama"
node roundtrip-test.js --prefix frwiki "Chope"
@@ -111,27 +92,14 @@
fail: true
- timestamps
- ansicolor
- defaults:
- use-remote-zuul
triggers:
- zuul
- scm:
- - git:
- url: 'http://integration.wikimedia.org/zuul/git/$ZUUL_PROJECT'
- reference-repo: '/srv/ssd/gerrit/$ZUUL_PROJECT.git'
- refspec: '$ZUUL_REF'
- name: 'origin'
- disable-submodules: true
- - git:
- url:
'https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid/deploy.git'
- branches:
- - master
- basedir: deploy
builders:
+ - git-parsoid-and-deploy-repos
- shell: |
# If any of these commands fail, something is wrong
set -e
- cd tests
+ cd parsoid/tests
export NODE_PATH=$NODE_PATH:$WORKSPACE/deploy/node_modules
node parserTests --wt2html --wt2wt --html2wt --html2html --selser
--no-color --quiet --blacklist
--
To view, visit https://gerrit.wikimedia.org/r/102952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa90b840f452f4415e7a59d7012c084aa7587e5b
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
