[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate vagrant doc publish job to Docker

2018-01-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404421 )

Change subject: Migrate vagrant doc publish job to Docker
..


Migrate vagrant doc publish job to Docker

Update mediawiki-vagrant-puppet-doc-publish

Tested on https://gerrit.wikimedia.org/r/#/c/404414/

Change-Id: Ib10cec437a123c5590c3218877349b71e4b84fcb
---
M jjb/mediawiki-misc.yaml
M zuul/parameter_functions.py
2 files changed, 11 insertions(+), 10 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 8460489..23dc0b8 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -1,20 +1,23 @@
 - job-template:
 name: 'mediawiki-vagrant-puppet-doc-publish'
-node: ci-jessie-wikimedia
-defaults: use-remoteonly-zuul
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- # BUNDLE_PATH is injected by Zuul
- - bundle-nodepool:
- command: 'rake doc'
+ - docker-castor-load
+ - docker-log-dir
+ - docker-src-dir
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1'
+ logdir: '/log'
+ run_args: ' doc'
  - doc-publish:
-docsrc: 'doc'
+docsrc: 'src/doc'
 docdest: 'mediawiki-vagrant'
 publishers:
- - castor-save
+ - archive-log-allow-empty
+ - castor-save-workspace-cache
 
 - project:
 name: 'mediawiki-ruby-api'
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 2247bf6..ecac95b 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -101,8 +101,6 @@
 # Needs BUNDLE_PATH
 if job.name.endswith('yard-publish'):
 nodepool_params(item, job, params)
-if job.name == 'mediawiki-vagrant-puppet-doc-publish':
-nodepool_params(item, job, params)
 
 if 'debian-glue' in job.name:
 

-- 
To view, visit https://gerrit.wikimedia.org/r/404421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib10cec437a123c5590c3218877349b71e4b84fcb
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate vagrant doc publish job to Docker

2018-01-16 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404421 )

Change subject: Migrate vagrant doc publish job to Docker
..

Migrate vagrant doc publish job to Docker

Change-Id: Ib10cec437a123c5590c3218877349b71e4b84fcb
---
M dockerfiles/rake-vagrant/changelog
M dockerfiles/rake/changelog
M dockerfiles/rake/run.sh
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
M zuul/parameter_functions.py
6 files changed, 25 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/21/404421/1

diff --git a/dockerfiles/rake-vagrant/changelog 
b/dockerfiles/rake-vagrant/changelog
index daf..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   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   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..289cf24 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -1,20 +1,22 @@
 - job-template:
 name: 'mediawiki-vagrant-puppet-doc-publish'
-node: ci-jessie-wikimedia
-defaults: use-remoteonly-zuul
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- # BUNDLE_PATH is injected by Zuul
- - bundle-nodepool:
- command: 'rake doc'
+ - docker-castor-load
+ - docker-log-dir
+ - docker-run-with-log-and-workspace-cache:
+ image: 'docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1'
+ logdir: '/log'
+ run_args: 'doc'
  - doc-publish:
 docsrc: 'doc'
 docdest: 'mediawiki-vagrant'
 publishers:
- - castor-save
+ - archive-log-allow-empty
+ - castor-save-workspace-cache
 
 - project:
 name: 'mediawiki-ruby-api'
@@ -49,7 +51,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:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 2247bf6..ecac95b 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -101,8 +101,6 @@
 # Needs BUNDLE_PATH
 if job.name.endswith('yard-publish'):
 nodepool_params(item, job, params)
-if job.name == 'mediawiki-vagrant-puppet-doc-publish':
-nodepool_params(item, job, params)
 
 if 'debian-glue' in job.name:
 

-- 
To view, visit https://gerrit.wikimedia.org/r/404421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib10cec437a123c5590c3218877349b71e4b84fcb
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits