jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374996 )
Change subject: RSpec job is not longer RSpec specific, it is a generic Ruby job
......................................................................
RSpec job is not longer RSpec specific, it is a generic Ruby job
Bug: T164479
Change-Id: I4fd76024e149516356a8bc73862a274f75e7600e
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
4 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 0a71e13..cbe79eb 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -357,9 +357,8 @@
./node_modules/.bin/grunt webdriver:test
fi
-# Similar to mw-selenium-nodepool job but runs `bundle exec rake spec` instead
of `bundle exec cucumber` T146916
- builder:
- name: mw-rspec-nodepool
+ name: ruby-nodepool
builders:
- prepare-localhost
- shell: |
@@ -370,7 +369,7 @@
cd "src/extensions/$EXT_NAME"
. '/srv/deployment/integration/slave-scripts/bin/mw-selenium-setup.sh'
bundle install --verbose
- bundle exec rake spec
+ bundle exec rake test
# - src: (without trailing slash)
# - project: (usually repo name or a custom title like "VisualEditor") - will
be escaped
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index a7eb987..4f58166 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -162,7 +162,7 @@
# Same as mwext-mw-selenium-jessie but runs `bundle exec rake spec` instead of
`bundle exec cucumber` T146916
- job:
- name: 'mwext-mw-rspec-jessie'
+ name: 'mwext-ruby-jessie'
node: ci-jessie-wikimedia
concurrent: true
triggers:
@@ -170,7 +170,7 @@
builders:
- castor-load
- prepare-mediawiki-zuul-project
- - mw-rspec-nodepool
+ - ruby-nodepool
publishers:
- castor-save
- archive-log-dir
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 57d41b8..cb668b3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3075,7 +3075,7 @@
- name: extension-selenium
experimental:
- mediawiki-core-qunit-selenium-jessie
- - mwext-mw-rspec-jessie
+ - mwext-ruby-jessie
- name: mediawiki/extensions/EditAccount
template:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index c5b5e25..f975d5e 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -53,7 +53,7 @@
mw_deps_jobs_starting_with = (
'mwext-testextension',
'mwext-qunit',
- 'mwext-mw-rspec',
+ 'mwext-ruby-jessie',
'mwext-mw-selenium',
'mwskin-mw-selenium',
'mw-testskin',
@@ -65,7 +65,7 @@
# FIXME rather hacky for selenium jobs (T139740, T137112)
if job.name.startswith(('mediawiki-core-qunit-selenium',
- 'mwext-mw-rspec',
+ 'mwext-ruby-jessie',
'mwext-mw-selenium')):
set_mw_dependencies(item, job, params)
if 'SKIN_DEPENDENCIES' in params and params['SKIN_DEPENDENCIES']:
--
To view, visit https://gerrit.wikimedia.org/r/374996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fd76024e149516356a8bc73862a274f75e7600e
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
