Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81491
Change subject: remove 'gerrit-name' variable entirely
......................................................................
remove 'gerrit-name' variable entirely
Passing gerrit-name is no more needed since we fetch the repository
using $ZUUL_PROJECT.
bug: 53470
Change-Id: I91f51fa739ad737084808aef253609a66d14e032
---
M analytics.disabled
M analytics.yaml
M integration.yaml
M labs.yaml
M mediawiki-extensions.yaml
M mediawiki-skins.yaml
M mediawiki-tools.yaml
M mediawiki-vagrant.yaml
M mediawiki.yaml
M operations-apache-config.yaml
M operations-debs.yaml
M operations-misc.yaml
M operations-mw-config.yaml
M operations-puppet.yaml
M parsoid.yaml
M php-extensions.yaml
M pywikibot.yaml
M qa.yaml
M sartoris.yaml
M translatewiki.yaml
M wm-bugzilla-wikibugs.yaml
M wm-fundraising.yaml
22 files changed, 6 insertions(+), 69 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/91/81491/1
diff --git a/analytics.disabled b/analytics.disabled
index 4065c6e..e1ea8bf 100644
--- a/analytics.disabled
+++ b/analytics.disabled
@@ -44,7 +44,6 @@
- project:
name: 'analytics-libanon'
- gerrit-name: 'analytics/libanon'
jobs:
- analytics-libanon
@@ -57,8 +56,7 @@
- zuul
scm:
- - git-zuul-no-submodules:
- gerrit-name: '{gerrit-name}'
+ - git-zuul-no-submodules
builders:
- shell: "git submodule sync"
@@ -85,7 +83,6 @@
- project:
name: 'analytics-udp-filters'
- gerrit-name: 'analytics/udp-filters'
jobs:
- 'analytics-udp-filters'
@@ -98,8 +95,7 @@
- zuul
scm:
- - git-zuul-no-submodules:
- gerrit-name: '{gerrit-name}'
+ - git-zuul-no-submodules
builders:
- shell: "git submodule sync"
@@ -110,7 +106,6 @@
- project:
name: 'analytics-webstatscollector'
- gerrit-name: 'analytics/webstatscollector'
jobs:
- 'analytics-webstatscollector'
@@ -129,7 +124,6 @@
- project:
name: 'analytics-wikistats'
- gerrit-name: 'analytics/wikistats'
jobs:
- 'analytics-wikistats'
diff --git a/analytics.yaml b/analytics.yaml
index 232cc7e..6c364fc 100644
--- a/analytics.yaml
+++ b/analytics.yaml
@@ -2,7 +2,6 @@
- project:
name: 'analytics-asana-stats'
- gerrit-name: 'analytics/asana-stats'
jobs:
- '{name}-pep8'
@@ -10,7 +9,6 @@
- project:
name: 'analytics-check-stats'
- gerrit-name: 'analytics/check-stats'
jobs:
- '{name}-pep8'
@@ -18,7 +16,6 @@
- project:
name: 'analytics-editor-geocoding'
- gerrit-name: 'analytics/editor-geocoding'
jobs:
- '{name}-pep8'
@@ -26,7 +23,6 @@
- project:
name: 'analytics-gerrit-stats'
- gerrit-name: 'analytics/gerrit-stats'
jobs:
- '{name}-pep8'
@@ -34,7 +30,6 @@
- project:
name: 'analytics-glass'
- gerrit-name: 'analytics/glass'
jobs:
- '{name}-pep8'
@@ -42,7 +37,6 @@
- project:
name: 'analytics-reportcard'
- gerrit-name: 'analytics/reportcard'
jobs:
- '{name}-pep8'
diff --git a/integration.yaml b/integration.yaml
index 8b8c8d2..1a28fdf 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -52,7 +52,6 @@
- project:
name: 'integration-docroot'
- gerrit-name: 'integration/docroot'
jobs:
- 'integration-docroot-deploy'
- '{name}-phplint'
@@ -60,7 +59,6 @@
- project:
name: 'integration-zuul-config'
- gerrit-name: 'integration/zuul-config'
jobs:
- 'integration-zuul-layoutdiff'
- 'integration-zuul-layoutvalidation'
@@ -68,13 +66,11 @@
- project:
name: 'integration-jjb-config'
- gerrit-name: 'integration/jenkins-job-builder-config'
jobs:
- '{name}-yamllint'
- project:
name: 'integration-jenkins'
- gerrit-name: 'integration/jenkins'
jobs:
- '{name}-pep8'
- '{name}-pyflakes'
diff --git a/labs.yaml b/labs.yaml
index 43d1564..5da1c8d 100644
--- a/labs.yaml
+++ b/labs.yaml
@@ -2,20 +2,17 @@
- project:
name: 'labs-incubator'
- gerrit-name: 'labs/incubator'
jobs:
- '{name}-phplint'
- project:
name: 'labs-nagios-builder'
- gerrit-name: 'labs/nagios-builder'
jobs:
- '{name}-pep8'
- '{name}-pyflakes'
- project:
name: 'labs-tools-grrrit'
- gerrit-name: 'labs/tools/grrrit'
jobs:
- '{name}-jslint'
- '{name}-yamllint'
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 7e80128..e535f66 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -544,13 +544,11 @@
- project:
name: 'mwext-MobileFrontend'
- gerrit-name: mediawiki/extensions/MobileFrontend
jobs:
- '{name}-ruby1.9.3lint'
- project:
name: 'mwext-UniversalLanguageSelector'
- gerrit-name: mediawiki/extensions/UniversalLanguageSelector
jobs:
- '{name}-ruby1.9.3lint'
@@ -566,19 +564,16 @@
- project:
name: 'mwext-PoolCounter'
- gerrit-name: mediawiki/extensions/PoolCounter
jobs:
- 'mwext-PoolCounter-build'
- project:
name: 'mwext-timeline'
- gerrit-name: mediawiki/extensions/timeline
jobs:
- '{name}-perllint'
- project:
name: 'mwext-Translate'
- gerrit-name: mediawiki/extensions/Translate
jobs:
- '{name}-phpcs-lenient'
- '{name}-phpcs-lenient-HEAD'
diff --git a/mediawiki-skins.yaml b/mediawiki-skins.yaml
index dd327b6..ba26252 100644
--- a/mediawiki-skins.yaml
+++ b/mediawiki-skins.yaml
@@ -1,20 +1,17 @@
- project:
name: 'mw-skins-erudite'
- gerrit-name: 'mediawiki/skins/erudite'
jobs:
- '{name}-phplint'
- project:
name: 'mw-skins-mediawiki-strapping'
- gerrit-name: 'mediawiki/skins/mediawiki-strapping'
jobs:
- '{name}-phplint'
- project:
name: 'mw-skins-webplatform'
- gerrit-name: 'mediawiki/skins/webplatform'
jobs:
- '{name}-phplint'
diff --git a/mediawiki-tools.yaml b/mediawiki-tools.yaml
index 36da30f..9f008c3 100644
--- a/mediawiki-tools.yaml
+++ b/mediawiki-tools.yaml
@@ -1,6 +1,5 @@
- project:
name: 'mw-tools-codeutils'
- gerrit-name: 'mediawiki/tools/code-utils'
jobs:
- '{name}-pep8'
@@ -8,13 +7,12 @@
- project:
name: 'mw-tools-dippybird'
- gerrit-name: 'mediawiki/tools/dippybird'
+
jobs:
- '{name}-phplint'
- project:
name: 'mw-tools-fluoride'
- gerrit-name: 'mediawiki/tools/fluoride'
jobs:
- '{name}-pep8'
@@ -22,7 +20,6 @@
- project:
name: 'mw-tools-release'
- gerrit-name: 'mediawiki/tools/release'
jobs:
- '{name}-pep8'
diff --git a/mediawiki-vagrant.yaml b/mediawiki-vagrant.yaml
index e02196d..bf7a777 100644
--- a/mediawiki-vagrant.yaml
+++ b/mediawiki-vagrant.yaml
@@ -1,6 +1,5 @@
- project:
name: 'mediawiki-vagrant'
- gerrit-name: 'mediawiki/vagrant'
jobs:
- '{name}-puppet-validate'
diff --git a/mediawiki.yaml b/mediawiki.yaml
index c94fafc..bc6fb8f 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -1,8 +1,6 @@
# This file holds the configuration for all MediaWiki core related jobs
# regardless of them being lint, merge check, unit test or regression testing.
-# FIXME: use /srv/ssd/zuul/git/{gerrit-name}
-
# Note that mediawiki/core branches may have a lot of submodules, we thus
# use a specific git macro to prevents Jenkins from updating all the
# submodules we do not care about. See bug 42455.
@@ -87,7 +85,6 @@
#
# @param name Jenkins job prefix to use
# @param phpunit-group suffix for an ant target 'phpunit-{phpunit-group}
-# @param gerrit-name Gerrit project name (ex: mediawiki/core)
- job-template:
name: '{name}-phpunit-{phpunit-group}'
defaults: use-zuul
@@ -139,7 +136,6 @@
- project:
name: mediawiki-core
- gerrit-name: mediawiki/core
phpunit-group:
- api
- databaseless
@@ -190,7 +186,6 @@
- project:
name: mediawiki-core-regression
- gerrit-name: mediawiki/core
branch:
- master
- REL1_19
diff --git a/operations-apache-config.yaml b/operations-apache-config.yaml
index 7deeff5..ad6b2ce 100644
--- a/operations-apache-config.yaml
+++ b/operations-apache-config.yaml
@@ -28,7 +28,6 @@
- project:
name: 'operations-apache-config'
- gerrit-name: 'operations/apache-config'
jobs:
- operations-apache-config-lint
diff --git a/operations-debs.yaml b/operations-debs.yaml
index cc914db..2435675 100644
--- a/operations-debs.yaml
+++ b/operations-debs.yaml
@@ -39,26 +39,22 @@
- project:
name: 'operations-debs-python-voluptuous'
- gerrit-name: 'operations/debs/python-voluptuous'
jobs:
- '{name}-debbuild'
- project:
name: 'operations-debs-adminbot'
- gerrit-name: 'operations/debs/adminbot'
jobs:
- '{name}-pep8'
- '{name}-pyflakes'
- project:
name: 'operations-debs-ircecho'
- gerrit-name: 'operations/debs/ircecho'
jobs:
- '{name}-pep8'
- '{name}-pyflakes'
- project:
name: 'lucene-search-2'
- gerrit-name: 'operations/debs/lucene-search-2'
jobs:
- '{name}-antbuild'
diff --git a/operations-misc.yaml b/operations-misc.yaml
index d815293..e610157 100644
--- a/operations-misc.yaml
+++ b/operations-misc.yaml
@@ -1,17 +1,14 @@
- project:
name: 'operations-software'
- gerrit-name: 'operations/software'
jobs:
- '{name}-pep8'
- project:
name: 'operations-software-redactatron'
- gerrit-name: 'operations/software/redactatron'
jobs:
- '{name}-pep8'
- project:
name: 'operations-dumps'
- gerrit-name: 'operations/dumps'
jobs:
- '{name}-pep8'
diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml
index 05ba05f..cdfe31f 100644
--- a/operations-mw-config.yaml
+++ b/operations-mw-config.yaml
@@ -10,7 +10,7 @@
- project:
name: 'operations-mw-config'
- gerrit-name: 'operations/mediawiki-config'
+
jobs:
- '{name}-phplint'
- operations-mw-config-tests
diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index ffeab62..c339b61 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -95,7 +95,6 @@
- project:
name: 'operations-puppet'
- gerrit-name: 'operations/puppet'
jobs:
- '{name}-erblint-HEAD'
@@ -108,10 +107,9 @@
# puppet modules
#
# To add a new puppet module, simply copy paste an existing one
-# and tweak the `name` and `gerrit-name` parameters.
+# and tweak the `name` parameter.
- project:
name: 'operations-puppet-cdh4'
- gerrit-name: 'operations/puppet/cdh4'
jobs:
- '{name}-erblint-HEAD'
@@ -119,7 +117,6 @@
- project:
name: 'operations-puppet-jmxtrans'
- gerrit-name: 'operations/puppet/jmxtrans'
jobs:
- '{name}-erblint-HEAD'
@@ -127,7 +124,6 @@
- project:
name: 'operations-puppet-kafka'
- gerrit-name: 'operations/puppet/kafka'
jobs:
- '{name}-erblint-HEAD'
@@ -135,7 +131,6 @@
- project:
name: 'operations-puppet-zookeeper'
- gerrit-name: 'operations/puppet/zookeeper'
jobs:
- '{name}-erblint-HEAD'
diff --git a/parsoid.yaml b/parsoid.yaml
index 10a7b68..839cb67 100644
--- a/parsoid.yaml
+++ b/parsoid.yaml
@@ -296,7 +296,6 @@
- project:
name: parsoid
- gerrit-name: mediawiki/extensions/Parsoid
jobs:
- parsoid-parsertests
- parsoid-parsertests-run
diff --git a/php-extensions.yaml b/php-extensions.yaml
index 57c876c..44b3a2a 100644
--- a/php-extensions.yaml
+++ b/php-extensions.yaml
@@ -10,41 +10,35 @@
# FastStringSearch PHP extension
- project:
name: 'FastStringSearch'
- gerrit-name: 'mediawiki/php/FastStringSearch'
jobs:
- 'php-{name}-build'
# NativePreprocessor PHP extension
- project:
name: 'NativePreprocessor'
- gerrit-name: 'mediawiki/php/NativePreprocessor'
jobs:
- 'php-{name}-build'
# luasandbox PHP extension
- project:
name: 'luasandbox'
- gerrit-name: 'mediawiki/php/luasandbox'
jobs:
- 'php-{name}-build'
# wikidiff PHP extension
- project:
name: 'wikidiff'
- gerrit-name: 'mediawiki/php/wikidiff'
jobs:
- 'php-{name}-build'
# wikidiff2 PHP extension
- project:
name: 'wikidiff2'
- gerrit-name: 'mediawiki/php/wikidiff2'
jobs:
- 'php-{name}-build'
# wmerrors PHP extension
- project:
name: 'wmerrors'
- gerrit-name: 'mediawiki/php/wmerrors'
jobs:
- 'php-{name}-build'
diff --git a/pywikibot.yaml b/pywikibot.yaml
index 60f94ed..4d6ff9a 100644
--- a/pywikibot.yaml
+++ b/pywikibot.yaml
@@ -1,6 +1,5 @@
- project:
name: pywikibot-compat
- gerrit-name: pywikibot/compat
jobs:
- '{name}-pep8'
@@ -8,7 +7,6 @@
- project:
name: pywikibot-core
- gerrit-name: pywikibot/core
jobs:
- '{name}-pep8'
@@ -16,7 +14,6 @@
- project:
name: pywikibot-i18n
- gerrit-name: pywikibot/i18n
jobs:
- '{name}-pep8'
diff --git a/qa.yaml b/qa.yaml
index 70f6fd3..6858300 100644
--- a/qa.yaml
+++ b/qa.yaml
@@ -1,6 +1,5 @@
- project:
name: 'qa-browsertests'
- gerrit-name: 'qa/browsertests'
jobs:
- '{name}-ruby1.9.3lint'
diff --git a/sartoris.yaml b/sartoris.yaml
index c2298dd..24830f6 100644
--- a/sartoris.yaml
+++ b/sartoris.yaml
@@ -1,6 +1,5 @@
- project:
name: 'sartoris'
- gerrit-name: 'sartoris'
jobs:
- '{name}-pep8'
diff --git a/translatewiki.yaml b/translatewiki.yaml
index cd918b8..a72efde 100644
--- a/translatewiki.yaml
+++ b/translatewiki.yaml
@@ -24,7 +24,7 @@
- project:
name: 'translatewiki'
- gerrit-name: 'translatewiki'
+
jobs:
- translatewiki-puppet-validate
- translatewiki-shelllint
diff --git a/wm-bugzilla-wikibugs.yaml b/wm-bugzilla-wikibugs.yaml
index 1205343..d3ed79e 100644
--- a/wm-bugzilla-wikibugs.yaml
+++ b/wm-bugzilla-wikibugs.yaml
@@ -14,7 +14,6 @@
- project:
name: 'wikimedia-bugzilla-wikibugs'
- gerrit-name: 'wikimedia/bugzilla/wikibugs'
jobs:
- 'wikimedia-bugzilla-wikibugs-perllint'
diff --git a/wm-fundraising.yaml b/wm-fundraising.yaml
index a43060f..c875be4 100644
--- a/wm-fundraising.yaml
+++ b/wm-fundraising.yaml
@@ -1,6 +1,5 @@
- project:
name: 'wikimedia-fundraising-tools'
- gerrit-name: 'wikimedia/fundraising/tools'
jobs:
- '{name}-jslint'
--
To view, visit https://gerrit.wikimedia.org/r/81491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91f51fa739ad737084808aef253609a66d14e032
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
