jenkins-bot has submitted this change and it was merged.
Change subject: Create generic 'bundle17-*' jobs
......................................................................
Create generic 'bundle17-*' jobs
Change-Id: I7aca328b612c1d9ae38d7a7d5b37475ac27debba
---
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
M zuul/layout.yaml
3 files changed, 15 insertions(+), 11 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 6bc6bce..5d3a4ee 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -51,11 +51,6 @@
- '{name}-puppetlint-lenient'
- '{name}-puppetlint-strict'
- '{name}-puppet-validate'
- - '{name}-bundle17-{bundlecommand}':
- bundlecommand:
- - cucumber
- - rubocop
- - rspec
- 'mediawiki-vagrant-puppet-doc'
- project:
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 7aa2de1..18695f2 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -60,7 +60,7 @@
- job-template:
- name: '{name}-bundle17-{bundlecommand}'
+ name: 'bundle17-{bundlecommand}'
node: contintLabsSlave && UbuntuTrusty
defaults: use-remote-zuul-no-submodules
concurrent: true
@@ -71,6 +71,15 @@
command: "{bundlecommand}"
bundler-version: '< 1.8.0'
+- project:
+ name: common-bundle17-jobs
+ bundlecommand:
+ - cucumber
+ - rspec
+ - rubocop
+ jobs:
+ - 'bundle17-{bundlecommand}'
+
# Call bundle 'yard' to generate documentation in labs and publish to
# doc.wikimedia.org using an intermediate rsync repository in labs.
- job-template:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 23e99a2..67d36bb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2513,15 +2513,15 @@
- mediawiki-vagrant-puppetlint-lenient
- mediawiki-vagrant-puppetlint-strict
test:
- - mediawiki-vagrant-bundle17-cucumber
- - mediawiki-vagrant-bundle17-rspec
+ - bundle17-cucumber
+ - bundle17-rspec
- mediawiki-vagrant-puppet-validate
- erblint-HEAD
- mediawiki-vagrant-puppetlint-lenient
- mediawiki-vagrant-puppetlint-strict
gate-and-submit:
- - mediawiki-vagrant-bundle17-cucumber
- - mediawiki-vagrant-bundle17-rspec
+ - bundle17-cucumber
+ - bundle17-rspec
- erblint-HEAD
- mediawiki-vagrant-puppetlint-lenient
- mediawiki-vagrant-puppetlint-strict
@@ -2529,7 +2529,7 @@
postmerge:
- mediawiki-vagrant-puppet-doc
experimental:
- - mediawiki-vagrant-bundle17-rubocop
+ - bundle17-rubocop
- name: operations/debs/adminbot
template:
--
To view, visit https://gerrit.wikimedia.org/r/197858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7aca328b612c1d9ae38d7a7d5b37475ac27debba
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
