jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404422 )
Change subject: docker: pass args to 'rake'
......................................................................
docker: pass args to 'rake'
Lets one override the default 'bundle exec rake test' by passing 'docker
run' arguements to rake. Still defaults to 'test'.
Migrate rake jobs to the new images.
Change-Id: I32bae97eda249aa2308fb9b5bd322eb34a31faf5
---
M dockerfiles/rake-vagrant/changelog
M dockerfiles/rake/changelog
M dockerfiles/rake/run.sh
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
5 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/rake-vagrant/changelog
b/dockerfiles/rake-vagrant/changelog
index 1111daf..d15244f 100644
--- a/dockerfiles/rake-vagrant/changelog
+++ b/dockerfiles/rake-vagrant/changelog
@@ -1,3 +1,10 @@
+rake-vagrant (0.2.1) wikimedia; urgency=medium
+
+ * Rebuild based on releng/rake/0.2.1:
+ > Pass docker run arguments to rake, default to test.
+
+ -- Antoine Musso <has...@free.fr> Tue, 16 Jan 2018 09:54:29 +0100
+
rake-vagrant (0.2.0) wikimedia; urgency=medium
* Rebuild based on rake:0.1.1:
diff --git a/dockerfiles/rake/changelog b/dockerfiles/rake/changelog
index 627706c..87c546f 100644
--- a/dockerfiles/rake/changelog
+++ b/dockerfiles/rake/changelog
@@ -1,3 +1,9 @@
+rake (0.2.1) wikimedia; urgency=medium
+
+ * Pass docker run arguments to rake, default to test.
+
+ -- Antoine Musso <has...@free.fr> Tue, 16 Jan 2018 09:54:29 +0100
+
rake (0.2.0) wikimedia; urgency=medium
* bundle install to $XDG_CACHE_HOME so the material can be cached between
diff --git a/dockerfiles/rake/run.sh b/dockerfiles/rake/run.sh
index 4d8e852..0140e67 100755
--- a/dockerfiles/rake/run.sh
+++ b/dockerfiles/rake/run.sh
@@ -12,4 +12,4 @@
git submodule --quiet update --init --recursive
bundle install --clean --path "${XDG_CACHE_HOME}/bundle"
-exec bundle exec rake test
+exec bundle exec rake "${@:-test}"
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index b555975..8460489 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -49,7 +49,7 @@
name: 'mediawiki-vagrant'
jobs:
- '{name}-rake-docker':
- docker_image_var:
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.0
+ docker_image_var:
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1
build_timeout: 10 # minutes
- 'mediawiki-vagrant-puppet-doc-publish'
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 7af5fa4..91eed20 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -11,7 +11,7 @@
name: 'rake-docker'
node: DebianJessieDocker
concurrent: true
- docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.2.0'
+ docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.2.1'
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/404422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32bae97eda249aa2308fb9b5bd322eb34a31faf5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
