jenkins-bot has submitted this change and it was merged.
Change subject: Fix up parsoidsvc repositories location
......................................................................
Fix up parsoidsvc repositories location
The parsoidsvc-php-parsertests depends on two repositories:
- mediawiki/services/parsoid which is fetched with the Jenkins git
plugin in $WORKSPACE and is instructed to clear it out
- mediawiki/core which is fetched via git-archive in the same location
and hence is cleared out by Jenkins git plugin
To ease debugging, fetch mediawiki/core to a different directory and
manually clean it up using the good old rm -fR
Parsoid is now fetched under /parsoidsvc
mediawiki/core is fetched under src/mediawiki/core. The mw-set-env.sh
env script detects that and set MW_INSTALL_PATH accordingly.
Change-Id: I51771f6900a672bffe397283925a9b2236473d35
---
M parsoidsvc.yaml
1 file changed, 17 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/parsoidsvc.yaml b/parsoidsvc.yaml
index 1a14780..9fa4a7e 100644
--- a/parsoidsvc.yaml
+++ b/parsoidsvc.yaml
@@ -28,15 +28,28 @@
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
disable-submodules: true
+ basedir: parsoidsvc
builders:
- - get-mw-core:
- branch: 'master'
- - mw-install-sqlite
+ # Hack to get mediawiki/core installed in a different directory
+ - shell: |
+ rm -fR src/mediawiki/core
+ mkdir -p src/mediawiki/core
+ export MW_INSTALL_PATH='src/mediawiki/core'
+
+ # mw-core-get.sh only recognize $WORKSPACE so override it to point
+ # to MW_INSTALL_PATH
+ # Support added with https://gerrit.wikimedia.org/r/#/c/130662/
+ # which is pending merge.
+ WORKSPACE=$MW_INSTALL_PATH
/srv/deployment/integration/slave-scripts/bin/mw-core-get.sh master
+
+ /srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh
+
- shell: |
# Now run parserTests
# FIXME should use the phpunit wrapper
+ cd src/mediawiki/core
php tests/parserTests.php --color=no --quiet \
- --file=tests/parserTests.txt
+ --file="$WORKSPACE/parsoidsvc/tests/parserTests.txt"
# Parsoid comes with two repositories:
# mediawiki/services/parsoid : the actual source code
--
To view, visit https://gerrit.wikimedia.org/r/130661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51771f6900a672bffe397283925a9b2236473d35
Gerrit-PatchSet: 4
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
