Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/237680
Change subject: WIP Run ruby2.0lint instead of ruby1.9.3lint
......................................................................
WIP Run ruby2.0lint instead of ruby1.9.3lint
WIP because I am pretty sure I have been too aggressive in deleting
stuff.
Bug: T112272
Change-Id: Ia3616117e9223901f30c0be2ff08dbf67ed3fe9c
---
M jjb/job-templates.yaml
M jjb/mediawiki.yaml
M zuul/layout.yaml
3 files changed, 13 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/80/237680/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 6e63745..cf6b492 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -338,30 +338,6 @@
- shell: |
find . -type f -name '*.pp' -print0 | xargs -0 puppet parser validate
-# Deprecated non-generic job. Should use the
-# generic "ruby1.9.3lint" job below.
-- job-template:
- name: '{name}-ruby1.9.3lint'
- defaults: use-remote-zuul-no-submodules
- node: contintLabsSlave && UbuntuTrusty
- concurrent: true
- triggers:
- - zuul
- builders:
- - ruby-lint:
- interpreter: 'ruby1.9.3'
-
-- job:
- name: 'ruby1.9.3lint'
- defaults: use-remote-zuul-shallow-clone
- node: contintLabsSlave && UbuntuTrusty
- concurrent: true
- triggers:
- - zuul
- builders:
- - ruby-lint:
- interpreter: 'ruby1.9.3'
-
- job:
name: 'ruby2.0lint'
defaults: use-remote-zuul-shallow-clone
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 81938f7..36958ea 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -354,7 +354,7 @@
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rubocop
- - '{name}-ruby1.9.3lint'
+ - 'ruby2.0lint'
- 'mediawiki-phpunit-{phpflavor}'
- 'mediawiki-phpunit-{phpflavor}-composer'
- 'mediawiki-extensions-{phpflavor}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1eeff2a..48fc1bb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -549,9 +549,6 @@
files:
- '^.*\.pp$'
- - name: '^(.*-)?ruby1.9.3lint$'
- files:
- - '^.*\.rb$'
- name: '^ruby2.0lint$'
files:
- '^.*\.rb$'
@@ -1953,13 +1950,13 @@
# Run Ruby linter.
- name: extension-rubylint
check:
- - 'ruby1.9.3lint'
+ - ruby2.0lint
test:
- 'bundle-rubocop'
- - 'ruby1.9.3lint'
+ - ruby2.0lint
gate-and-submit:
- 'bundle-rubocop'
- - 'ruby1.9.3lint'
+ - ruby2.0lint
- name: archived
check:
@@ -2041,8 +2038,8 @@
- mediawiki-core-phpcs-HEAD
- mediawiki-core-jslint
- mediawiki-core-phplint
- - mediawiki-core-ruby1.9.3lint
- php-composer-package-validate
+ - ruby2.0lint
test:
- mediawiki-core-phpcs-HEAD
- mediawiki-core-jsduck
@@ -2052,8 +2049,8 @@
#- mediawiki-phpunit-zend (disabled, slow, Icac172b16)
- mediawiki-core-qunit
- mediawiki-core-bundle-rubocop
- - mediawiki-core-ruby1.9.3lint
- php-composer-package-validate
+ - ruby2.0lint
zend:
# Comment "check zend" to manually run this
- mediawiki-phpunit-zend
@@ -2066,8 +2063,8 @@
- mediawiki-phpunit-zend
- mediawiki-core-qunit
- mediawiki-core-bundle-rubocop
- - mediawiki-core-ruby1.9.3lint
- php-composer-package-validate
+ - ruby2.0lint
postmerge:
- mediawiki-core-jsduck-publish
- mediawiki-core-doxygen-publish
@@ -2306,16 +2303,16 @@
- name: mediawiki/ruby/api
check:
- - ruby1.9.3lint
+ - ruby2.0lint
test:
- bundle-rubocop
- - ruby1.9.3lint
+ - ruby2.0lint
- bundle-rspec
- mediawiki-ruby-api-gembuild
- bundle-yard
gate-and-submit:
- bundle-rubocop
- - ruby1.9.3lint
+ - ruby2.0lint
- bundle-rspec
- mediawiki-ruby-api-gembuild
- bundle-yard
@@ -2325,17 +2322,17 @@
- name: mediawiki/selenium
check:
- - ruby1.9.3lint
+ - ruby2.0lint
test:
- bundle-rubocop
- - ruby1.9.3lint
+ - ruby2.0lint
- mediawiki-selenium-gembuild
- bundle-yard
- bundle-rspec
- mediawiki-selenium-integration
gate-and-submit:
- bundle-rubocop
- - ruby1.9.3lint
+ - ruby2.0lint
- mediawiki-selenium-gembuild
- bundle-yard
- bundle-rspec
--
To view, visit https://gerrit.wikimedia.org/r/237680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3616117e9223901f30c0be2ff08dbf67ed3fe9c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
