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 <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

Reply via email to