Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197853
Change subject: Create generic "bundle-{bundlecommand}" jobs, replace most
non-generic ones
......................................................................
Create generic "bundle-{bundlecommand}" jobs, replace most non-generic ones
Change-Id: I28ee847aa9558c9bce152f98859af6b0040e19a0
---
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki-misc.yaml
M jjb/misc.yaml
M jjb/ruby-jobs.yaml
M zuul/layout.yaml
5 files changed, 41 insertions(+), 165 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/53/197853/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 62ba9b7..061292d 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1150,37 +1150,9 @@
- WikiGrok
- project:
- name: 'mwext-ArticleFeedbackv5'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
name: 'mwext-BlameMaps'
jobs:
- python-jobs
-
-- project:
- name: 'mwext-CentralAuth'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-CentralNotice'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-CirrusSearch'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- project:
name: mwext-Collection-OfflineContentGenerator
@@ -1215,9 +1187,6 @@
- project:
name: 'mwext-ContentTranslation'
jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- '{name}-yamllint'
- project:
@@ -1226,51 +1195,9 @@
- python-jobs
- project:
- name: 'mwext-Echo'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
name: 'mwext-EventLogging'
jobs:
- python-jobs
-
-- project:
- name: 'mwext-Flow'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-GettingStarted'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-Math'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-MobileFrontend'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-MultimediaViewer'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- project:
name: 'mwext-Offline'
@@ -1281,20 +1208,6 @@
name: 'mwext-OpenStackManager'
jobs:
- python-jobs
-
-- project:
- name: 'mwext-PageTriage'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-PdfHandler'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- project:
name: 'mwext-PoolCounter'
@@ -1312,40 +1225,13 @@
- python-jobs
- project:
- name: 'mwext-Translate'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-TwnMainPage'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-UniversalLanguageSelector'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
name: 'mwext-UploadWizard'
jobs:
- python-jobs
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- project:
name: 'mwext-VisualEditor'
jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- '{name}-jsduck'
- 'mwext-VisualEditor-sync-gerrit'
- 'mwext-VisualEditor-qunit'
@@ -1355,9 +1241,6 @@
name: 'mwext-WikiLove'
jobs:
- python-jobs
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- project:
name: 'mwext-WikimediaMaintenance'
@@ -1373,13 +1256,3 @@
name: 'mwext-ZeroBanner'
jobs:
- python-jobs
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
-
-- project:
- name: 'mwext-ZeroPortal'
- jobs:
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 048a64c..6bc6bce 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -30,30 +30,12 @@
- yard
jobs:
- '{name}-gembuild'
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rspec
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - yard
- '{name}-bundle-yard-publish'
- project:
name: 'mediawiki-selenium'
jobs:
- '{name}-gembuild'
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rspec
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - yard
- '{name}-bundle-yard-publish'
- project:
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 1fd70b4..2090b3f 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -56,7 +56,4 @@
- hhvm
jobs:
- '{name}-jslint'
- - '{name}-bundle-{bundlecommand}':
- bundlecommand:
- - rubocop
- 'oojs-ui-jsduck-publish'
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index e7e456a..7aa2de1 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -23,6 +23,7 @@
vendor/bin/bundle install --verbose
vendor/bin/bundle exec {command}
+# Deprecated non-generic job. See below.
- job-template:
name: '{name}-bundle-{bundlecommand}'
node: contintLabsSlave && UbuntuTrusty
@@ -35,6 +36,29 @@
command: "{bundlecommand}"
bundler-version: ''
+# Generic bundle job-template.
+- job-template:
+ name: 'bundle-{bundlecommand}'
+ node: contintLabsSlave && UbuntuTrusty
+ defaults: use-remote-zuul-shallow-clone
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - bundle:
+ command: "{bundlecommand}"
+ bundler-version: ''
+
+- project:
+ name: common-bundle-jobs
+ bundlecommand:
+ - rspec
+ - rubocop
+ - yard
+ jobs:
+ - 'bundle-{bundlecommand}'
+
+
- job-template:
name: '{name}-bundle17-{bundlecommand}'
node: contintLabsSlave && UbuntuTrusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 81a8411..dbe66d7 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -492,7 +492,7 @@
- name: '^ruby2.0lint$'
files:
- '^.*\.rb$'
- - name: '^.*-bundle-rubocop$'
+ - name: '^(.*-)?bundle-rubocop$'
files:
# Matches:
# - .rubocop.yml
@@ -1971,10 +1971,10 @@
check:
- 'ruby1.9.3lint'
test:
- - 'mwext-{name}-bundle-rubocop'
+ - 'bundle-rubocop'
- 'ruby1.9.3lint'
gate-and-submit:
- - 'mwext-{name}-bundle-rubocop'
+ - 'bundle-rubocop'
- 'ruby1.9.3lint'
# Register the Gerrit project name, apply them pipelines that in turn trigger
@@ -2300,17 +2300,17 @@
check:
- ruby1.9.3lint
test:
- - mediawiki-ruby-api-bundle-rubocop
+ - bundle-rubocop
- ruby1.9.3lint
- - mediawiki-ruby-api-bundle-rspec
+ - bundle-rspec
- mediawiki-ruby-api-gembuild
- - mediawiki-ruby-api-bundle-yard
+ - bundle-yard
gate-and-submit:
- - mediawiki-ruby-api-bundle-rubocop
+ - bundle-rubocop
- ruby1.9.3lint
- - mediawiki-ruby-api-bundle-rspec
+ - bundle-rspec
- mediawiki-ruby-api-gembuild
- - mediawiki-ruby-api-bundle-yard
+ - bundle-yard
postmerge:
- mediawiki-ruby-api-gembuild
- mediawiki-ruby-api-bundle-yard-publish
@@ -2319,17 +2319,17 @@
check:
- ruby1.9.3lint
test:
- - mediawiki-selenium-bundle-rubocop
+ - bundle-rubocop
- ruby1.9.3lint
- mediawiki-selenium-gembuild
- - mediawiki-selenium-bundle-yard
- - mediawiki-selenium-bundle-rspec
+ - bundle-yard
+ - bundle-rspec
gate-and-submit:
- - mediawiki-selenium-bundle-rubocop
+ - bundle-rubocop
- ruby1.9.3lint
- mediawiki-selenium-gembuild
- - mediawiki-selenium-bundle-yard
- - mediawiki-selenium-bundle-rspec
+ - bundle-yard
+ - bundle-rspec
postmerge:
- mediawiki-selenium-gembuild
- mediawiki-selenium-bundle-yard-publish
@@ -6265,11 +6265,11 @@
- oojs-ui-jslint
- ruby2.0lint
test:
- - oojs-ui-bundle-rubocop
+ - bundle-rubocop
- jsduck
- ruby2.0lint
gate-and-submit:
- - oojs-ui-bundle-rubocop
+ - bundle-rubocop
- jsduck
- ruby2.0lint
postmerge:
--
To view, visit https://gerrit.wikimedia.org/r/197853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28ee847aa9558c9bce152f98859af6b0040e19a0
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
