jenkins-bot has submitted this change and it was merged.
Change subject: zuul-cloner-extdeps drop 'ext-name' parameter
......................................................................
zuul-cloner-extdeps drop 'ext-name' parameter
The only use was to inject Wikibase for the Wikibase jobs. Hardcode it
directly in the 'dependencies' parameter and phase out 'ext-name'
entirely.
Drop the shell logic for ext-name from:
mediawiki-extensions-hhvm
mediawiki-extensions-php53
mediawiki-extensions-php55
mediawiki-extensions-qunit-jessie
Same + list of dependencies prefixed with 'Wikibase'.
mwext-Wikibase-client-tests-mysql-hhvm
mwext-Wikibase-client-tests-mysql-php53
mwext-Wikibase-client-tests-mysql-php55
mwext-Wikibase-client-tests-sqlite-hhvm
mwext-Wikibase-client-tests-sqlite-php53
mwext-Wikibase-client-tests-sqlite-php55
mwext-Wikibase-repo-tests-sqlite-hhvm
mwext-Wikibase-repo-tests-sqlite-php53
mwext-Wikibase-repo-tests-sqlite-php55
Change-Id: Ia8cc1d53916077adc7f2a2897d74922165031720
---
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
M jjb/wikidata.yaml
3 files changed, 1 insertion(+), 9 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 476ebaf..5b77cc6 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -27,7 +27,6 @@
# Parameters:
#
-# ext-name: extension basename. Set to '' to ignore
# dependencies: comma or spaces/newlines separated list of extensions to clone
#
- builder:
@@ -39,10 +38,6 @@
rm -f deps.txt
touch deps.txt
echo "mediawiki/core" >> deps.txt
- if [ "{ext-name}" != "" ]; then
- echo "> extension: mediawiki/extensions/{ext-name}"
- echo "mediawiki/extensions/{ext-name}" >> deps.txt
- fi
if [ "{dependencies}" != "" ]; then
echo "> rest of dependencies..."
echo "$(IFS=', '; for dep in `echo {dependencies}`; do echo
mediawiki/extensions/$dep; done;)" >> deps.txt
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 4ddc1d5..1354d17 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -247,7 +247,6 @@
phpflavor: '{phpflavor}'
- hhvm-clear-hhbc
- zuul-cloner-extdeps:
- ext-name: ''
dependencies: '{dependencies}'
- zuul-cloner:
projects: mediawiki/vendor
@@ -278,7 +277,6 @@
builders:
- castor-load
- zuul-cloner-extdeps:
- ext-name: ''
dependencies: '{dependencies}'
- zuul-cloner:
projects: mediawiki/vendor
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 666b7e3..d603da4 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -37,8 +37,7 @@
phpflavor: '{phpflavor}'
- hhvm-clear-hhbc
- zuul-cloner-extdeps:
- ext-name: Wikibase
- dependencies: '{dependencies}'
+ dependencies: 'Wikibase,{dependencies}'
- wd-mw-composer-merged-install
- 'mw-install-{dbflavor}'
- shell: "cp deps.txt src/extensions_load.txt"
--
To view, visit https://gerrit.wikimedia.org/r/318546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8cc1d53916077adc7f2a2897d74922165031720
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
